From: Chris Zhong <zyw@rock-chips.com>
To: dri-devel@lists.freedesktop.org, kishon@ti.com, robh@kernel.org,
linux-rockchip@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, mark.yao@rock-chips.com,
groeck@chromium.org, seanpaul@chromium.org, zyw@rock-chips.com,
Heiko Stuebner <heiko@sntech.de>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] phy: rockchip-typec: support DP phy switch
Date: Fri, 10 Feb 2017 15:44:13 +0800 [thread overview]
Message-ID: <1486712654-15431-4-git-send-email-zyw@rock-chips.com> (raw)
In-Reply-To: <1486712654-15431-1-git-send-email-zyw@rock-chips.com>
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.
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
---
drivers/phy/phy-rockchip-typec.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/phy/phy-rockchip-typec.c b/drivers/phy/phy-rockchip-typec.c
index 7cfb0f8..1604aaa 100644
--- a/drivers/phy/phy-rockchip-typec.c
+++ b/drivers/phy/phy-rockchip-typec.c
@@ -267,6 +267,7 @@ struct rockchip_usb3phy_port_cfg {
struct usb3phy_reg usb3tousb2_en;
struct usb3phy_reg external_psm;
struct usb3phy_reg pipe_status;
+ struct usb3phy_reg uphy_dp_sel;
};
struct rockchip_typec_phy {
@@ -736,6 +737,7 @@ static const struct phy_ops rockchip_usb3_phy_ops = {
static int rockchip_dp_phy_power_on(struct phy *phy)
{
struct rockchip_typec_phy *tcphy = phy_get_drvdata(phy);
+ struct rockchip_usb3phy_port_cfg *cfg = &tcphy->port_cfgs;
int new_mode, ret = 0;
u32 val;
@@ -766,6 +768,8 @@ static int rockchip_dp_phy_power_on(struct phy *phy)
tcphy_phy_init(tcphy, new_mode);
}
+ property_enable(tcphy, &cfg->uphy_dp_sel, 1);
+
ret = readx_poll_timeout(readl, tcphy->base + DP_MODE_CTL,
val, val & DP_MODE_A2, 1000,
PHY_MODE_SET_TIMEOUT);
@@ -869,6 +873,11 @@ static int tcphy_parse_dt(struct rockchip_typec_phy *tcphy,
if (ret)
return ret;
+ ret = tcphy_get_param(dev, &cfg->uphy_dp_sel,
+ "rockchip,uphy-dp-sel");
+ if (ret)
+ return ret;
+
tcphy->grf_regs = syscon_regmap_lookup_by_phandle(dev->of_node,
"rockchip,grf");
if (IS_ERR(tcphy->grf_regs)) {
--
2.6.3
next prev parent reply other threads:[~2017-02-10 7:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 7:44 [PATCH 0/4] Move DP phy switch to PHY driver Chris Zhong
2017-02-10 7:44 ` [PATCH 1/4] Documentation: bindings: add uphy-dp-sel for Rockchip USB Type-C PHY Chris Zhong
2017-02-16 2:20 ` Rob Herring
2017-02-16 3:14 ` Chris Zhong
2017-02-10 7:44 ` [PATCH 2/4] arm64: dts: rockchip: add rockchip,uphy-dp-sel for Type-C phy Chris Zhong
2017-02-10 7:44 ` Chris Zhong [this message]
2017-03-09 0:39 ` [PATCH 3/4] phy: rockchip-typec: support DP phy switch Brian Norris
2017-03-09 1:02 ` Heiko Stübner
2017-03-09 2:19 ` Chris Zhong
2017-03-09 3:10 ` Brian Norris
2017-03-09 8:31 ` Heiko Stübner
2017-03-09 23:35 ` Brian Norris
2017-02-10 7:44 ` [PATCH 4/4] drm/rockchip: cdn-dp: remove the " Chris Zhong
2017-11-28 23:32 ` [PATCH 0/4] Move DP phy switch to PHY driver Doug Anderson
2017-11-30 2:27 ` Chris Zhong
2017-12-01 21:42 ` Doug Anderson
2017-12-01 21:58 ` Heiko Stuebner
2017-12-04 2:47 ` Chris Zhong
2017-12-04 7:46 ` Heiko Stübner
2017-12-04 16:08 ` Doug Anderson
2017-12-04 21:53 ` Heiko Stübner
2018-02-16 11:04 ` Kishon Vijay Abraham I
2018-02-16 13:05 ` Heiko Stübner
2018-02-16 13:59 ` Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1486712654-15431-4-git-send-email-zyw@rock-chips.com \
--to=zyw@rock-chips.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=groeck@chromium.org \
--cc=heiko@sntech.de \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.yao@rock-chips.com \
--cc=robh@kernel.org \
--cc=seanpaul@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®