hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: cdn-dp: remove the DP phy switch 

There are 2 Type-c PHYs in RK3399, but only one DP controller. Hence
only one PHY can connect to DP controller at one time, the other should
be disconnected. The GRF_SOC_CON26 register has a switch bit to do it,
set this bit means enable PHY 1, clear this bit means enable PHY 0.

If the board has 2 Type-C ports, the DP driver get the phy id from
devm_of_phy_get_by_index, and then control this switch according to
this id. But some others board only has one Type-C port, it may be PHY 0
or PHY 1. The dts node id can not tell us the correct PHY id. Hence move
this switch to PHY driver, the PHY driver can distinguish between PHY 0
and PHY 1, and then write the correct register bit.

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
[The phy-changes are in the phy-tree now and the cdn-dp wasn't
 enabled at all so far, so this change can go through drm-misc
 alone without causing issues when testing drm-misc]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180216120956.19034-6-enric.balletbo@collabora.com
This commit is contained in:
Chris Zhong 2018-02-16 13:09:56 +01:00 committed by Heiko Stuebner
parent 99a954874e
commit 0a00ac97d2
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/rockchip/cdn-dp-core.c
View File

@ -43,8 +43,6 @@
#define GRF_SOC_CON9 0x6224 #define GRF_SOC_CON9 0x6224
#define DP_SEL_VOP_LIT BIT(12) #define DP_SEL_VOP_LIT BIT(12)
#define GRF_SOC_CON26 0x6268 #define GRF_SOC_CON26 0x6268
#define UPHY_SEL_BIT 3
#define UPHY_SEL_MASK BIT(19)
#define DPTX_HPD_SEL (3 << 12) #define DPTX_HPD_SEL (3 << 12)
#define DPTX_HPD_DEL (2 << 12) #define DPTX_HPD_DEL (2 << 12)
#define DPTX_HPD_SEL_MASK (3 << 28) #define DPTX_HPD_SEL_MASK (3 << 28)
@ -394,11 +392,6 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
union extcon_property_value property; union extcon_property_value property;
int ret; int ret;
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
(port->id << UPHY_SEL_BIT) | UPHY_SEL_MASK);
if (ret)
return ret;
if (!port->phy_enabled) { if (!port->phy_enabled) {
ret = phy_power_on(port->phy); ret = phy_power_on(port->phy);
if (ret) { if (ret) {