From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: Re: [PATCH 3/4] phy: rockchip-typec: support DP phy switch Date: Thu, 9 Mar 2017 10:19:28 +0800 Message-ID: <58C0BBB0.6080204@rock-chips.com> References: <1486712654-15431-1-git-send-email-zyw@rock-chips.com> <1486712654-15431-4-git-send-email-zyw@rock-chips.com> <20170309003921.GA101174@google.com> <11032198.PxydffNNDT@diego> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <11032198.PxydffNNDT@diego> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: =?UTF-8?Q?Heiko_St=c3=bcbner?= , Brian Norris Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, kishon@ti.com, linux-rockchip@lists.infradead.org, groeck@chromium.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org SGkgSGVpa28gYW5kIEJyYWluCgpPbiAwMy8wOS8yMDE3IDA5OjAyIEFNLCBIZWlrbyBTdMO8Ym5l ciB3cm90ZToKPiBBbSBNaXR0d29jaCwgOC4gTcOkcnogMjAxNywgMTY6Mzk6MjMgQ0VUIHNjaHJp ZWIgQnJpYW4gTm9ycmlzOgo+PiBPbiBGcmksIEZlYiAxMCwgMjAxNyBhdCAwMzo0NDoxM1BNICsw ODAwLCBDaHJpcyBaaG9uZyB3cm90ZToKPj4+IFRoZXJlIGFyZSAyIFR5cGUtYyBQSFlzIGluIFJL MzM5OSwgYnV0IG9ubHkgb25lIERQIGNvbnRyb2xsZXIuIEhlbmNlCj4+PiBvbmx5IG9uZSBQSFkg Y2FuIGNvbm5lY3QgdG8gRFAgY29udHJvbGxlciBhdCBvbmUgdGltZSwgdGhlIG90aGVyIHNob3Vs ZAo+Pj4gYmUgZGlzY29ubmVjdGVkLiBUaGUgR1JGX1NPQ19DT04yNiByZWdpc3RlciBoYXMgYSBz d2l0Y2ggYml0IHRvIGRvIGl0LAo+Pj4gc2V0IHRoaXMgYml0IG1lYW5zIGVuYWJsZSBQSFkgMSwg Y2xlYXIgdGhpcyBiaXQgbWVhbnMgZW5hYmxlIFBIWSAwLgo+Pj4KPj4+IFNpZ25lZC1vZmYtYnk6 IENocmlzIFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+Cj4+PiAtLS0KPj4+Cj4+PiAgIGRyaXZl cnMvcGh5L3BoeS1yb2NrY2hpcC10eXBlYy5jIHwgOSArKysrKysrKysKPj4+ICAgMSBmaWxlIGNo YW5nZWQsIDkgaW5zZXJ0aW9ucygrKQo+Pj4KPj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3BoeS9w aHktcm9ja2NoaXAtdHlwZWMuYwo+Pj4gYi9kcml2ZXJzL3BoeS9waHktcm9ja2NoaXAtdHlwZWMu YyBpbmRleCA3Y2ZiMGY4Li4xNjA0YWFhIDEwMDY0NAo+Pj4gLS0tIGEvZHJpdmVycy9waHkvcGh5 LXJvY2tjaGlwLXR5cGVjLmMKPj4+ICsrKyBiL2RyaXZlcnMvcGh5L3BoeS1yb2NrY2hpcC10eXBl Yy5jCj4+PiBAQCAtMjY3LDYgKzI2Nyw3IEBAIHN0cnVjdCByb2NrY2hpcF91c2IzcGh5X3BvcnRf Y2ZnIHsKPj4+Cj4+PiAgIAlzdHJ1Y3QgdXNiM3BoeV9yZWcgdXNiM3RvdXNiMl9lbjsKPj4+ICAg CXN0cnVjdCB1c2IzcGh5X3JlZyBleHRlcm5hbF9wc207Cj4+PiAgIAlzdHJ1Y3QgdXNiM3BoeV9y ZWcgcGlwZV9zdGF0dXM7Cj4+Pgo+Pj4gKwlzdHJ1Y3QgdXNiM3BoeV9yZWcgdXBoeV9kcF9zZWw7 Cj4+Pgo+Pj4gICB9Owo+Pj4gICAKPj4+ICAgc3RydWN0IHJvY2tjaGlwX3R5cGVjX3BoeSB7Cj4+ Pgo+Pj4gQEAgLTczNiw2ICs3MzcsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHBoeV9vcHMgcm9j a2NoaXBfdXNiM19waHlfb3BzID0gewo+Pj4KPj4+ICAgc3RhdGljIGludCByb2NrY2hpcF9kcF9w aHlfcG93ZXJfb24oc3RydWN0IHBoeSAqcGh5KQo+Pj4gICB7Cj4+PiAgIAo+Pj4gICAJc3RydWN0 IHJvY2tjaGlwX3R5cGVjX3BoeSAqdGNwaHkgPSBwaHlfZ2V0X2RydmRhdGEocGh5KTsKPj4+Cj4+ PiArCXN0cnVjdCByb2NrY2hpcF91c2IzcGh5X3BvcnRfY2ZnICpjZmcgPSAmdGNwaHktPnBvcnRf Y2ZnczsKPj4+Cj4+PiAgIAlpbnQgbmV3X21vZGUsIHJldCA9IDA7Cj4+PiAgIAl1MzIgdmFsOwo+ Pj4KPj4+IEBAIC03NjYsNiArNzY4LDggQEAgc3RhdGljIGludCByb2NrY2hpcF9kcF9waHlfcG93 ZXJfb24oc3RydWN0IHBoeSAqcGh5KQo+Pj4KPj4+ICAgCQl0Y3BoeV9waHlfaW5pdCh0Y3BoeSwg bmV3X21vZGUpOwo+Pj4gICAJCj4+PiAgIAl9Cj4+Pgo+Pj4gKwlwcm9wZXJ0eV9lbmFibGUodGNw aHksICZjZmctPnVwaHlfZHBfc2VsLCAxKTsKPj4+ICsKPj4+Cj4+PiAgIAlyZXQgPSByZWFkeF9w b2xsX3RpbWVvdXQocmVhZGwsIHRjcGh5LT5iYXNlICsgRFBfTU9ERV9DVEwsCj4+IElkZWEgZm9y IGZ1dHVyZSB3b3JrOiB0aGlzIHNob3VsZCBqdXN0IGJlIHJlYWRsX3BvbGxfdGltZW91dCgpIGhl cmUsIGFuZAo+PiB0aHJvdWdob3V0IHRoZSBkcml2ZXIuClllcywgdGhlIHJlYWRsX3BvbGxfdGlt ZW91dCBpcyBiZXR0ZXIsIGlmIG5leHQgdmVyc2lvbiBzZXJpZXMgaXMgbmVlZGVkLCAKSSBhbSBn b2luZyB0bwphZGQgaXQgaW4gYSBzZXBhcmF0ZSBwYXRjaCBiZWhpbmQgdGhpcyBwYXRjaC4KPj4+ ICAgCQkJCSB2YWwsIHZhbCAmIERQX01PREVfQTIsIDEwMDAsCj4+PiAgIAkJCQkgUEhZX01PREVf U0VUX1RJTUVPVVQpOwo+Pj4KPj4+IEBAIC04NjksNiArODczLDExIEBAIHN0YXRpYyBpbnQgdGNw aHlfcGFyc2VfZHQoc3RydWN0IHJvY2tjaGlwX3R5cGVjX3BoeQo+Pj4gKnRjcGh5LD4KPj4+ICAg CWlmIChyZXQpCj4+PiAgIAkKPj4+ICAgCQlyZXR1cm4gcmV0Owo+Pj4KPj4+ICsJcmV0ID0gdGNw aHlfZ2V0X3BhcmFtKGRldiwgJmNmZy0+dXBoeV9kcF9zZWwsCj4+PiArCQkJICAgICAgInJvY2tj aGlwLHVwaHktZHAtc2VsIik7Cj4+PiArCWlmIChyZXQpCj4+PiArCQlyZXR1cm4gcmV0Owo+PiBX aGF0IGFib3V0IGV4aXN0aW5nIGRldmljZSB0cmVlcz8gWW91J3JlIGVzc2VudGlhbGx5IGFkZGlu ZyB0aGlzCj4+IG5ldyBwcm9wZXJ0eSBhbmQgcmVxdWlyaW5nIGl0IGF0IHRoZSBzYW1lIHRpbWUu Cj4+Cj4+IE9yIGFyZSB3ZSBjb25zaWRlcmluZyBubyBSSzMzOTkgRFAgc3RhYmxlIGF0IHRoZSBt b21lbnQ/IEkgZ3Vlc3Mgd2UKPj4gaGF2ZW4ndCBhY3R1YWxseSBtZXJnZWQgYW55IGRldmljZSB0 cmVlcyB0aGF0IHN1cHBvcnQgdGhpcyB5ZXQsIG5vPwo+IEFuIGludGVyZXN0aW5nIHNpdHVhdGlv biB3ZSdyZSBpbiBoZXJlLiBPbiB0aGUgb25lIGhhbmQsIHlvdSdyZSByaWdodCB0aGlzCj4gYnJl YWtzICJiYWNrd2FyZHMgY29tcGF0aWJsaXR5Ii4KPgo+IEJ1dCBvbiB0aGUgb3RoZXIgaGFuZCwg dGhlIHR5cGUtYyBwaHkgaXMgY3VycmVudGx5IHZlcnkgbXVjaCB1bnVzZWQuIFRoZSBvbmx5Cj4g Y3VycmVudCBib2FyZCByazMzOTktZXZiLmR0cyBkb2VzIG5vdCBlbmFibGUgdGhlbSAoc28gdGhl eSdyZSBkaXNhYmxlZAo+IGV2ZXJ5d2hlcmUpIGFuZCB3ZSBoYXZlIG5laXRoZXIgZHdjMyBub3Ig ZHAgbm9kZXMgaW4gYW55IHJrMzM5OSBkZXZpY2V0cmVlcyBzbwo+IGZhci4gQWxzbyBSb2Igd2Fz IG9rIHdpdGggdGhlIGJpbmRpbmcgY2hhbmdlIDotKSAuCj4KPiBTbyBmcm9tIG15IHBvdiwgSSdk IHNheSBpdCBfc2hvdWxkXyBiZSBvaywgYXMgbm90aGluZyBpcyB1c2luZyB0aGUgcGh5cyBhdCBh bGwKPiB5ZXQgYW5kIHRodXMgdGhlcmUgaXMgbm90aGluZyB0aGF0IGNvdWxkIGdldCBicm9rZW4u Cj4KPgo+IEhlaWtvClRoYW5rcyBIZWlrby4gT24gdGhlIG90aGVyIGhhbmQsIHRoZXNlIGlzIG5v IGFueSBkaXNwbGF5IG5vZGUgYXQgcmszMzk5IApkdHNpLApzbyBJIGNhbiBub3QgYWRkIHRoZSBE UCBub2RlLCBkbyB5b3Ugb3IgTWFyay5ZYW8gaGF2ZSBwbGFuIHRvIGNvbXBsZXRlIGl0PwoKPgo+ PiBCcmlhbgo+Pgo+Pj4gKwo+Pj4KPj4+ICAgCXRjcGh5LT5ncmZfcmVncyA9IHN5c2Nvbl9yZWdt YXBfbG9va3VwX2J5X3BoYW5kbGUoZGV2LT5vZl9ub2RlLAo+Pj4gICAJCj4+PiAgIAkJCQkJCQkg ICJyb2NrY2hpcCxncmYiKTsKPj4+ICAgCQo+Pj4gICAJaWYgKElTX0VSUih0Y3BoeS0+Z3JmX3Jl Z3MpKSB7Cj4KPgo+Cj4KCi0tIApDaHJpcyBaaG9uZwoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Thu, 9 Mar 2017 10:19:28 +0800 Subject: [PATCH 3/4] phy: rockchip-typec: support DP phy switch In-Reply-To: <11032198.PxydffNNDT@diego> References: <1486712654-15431-1-git-send-email-zyw@rock-chips.com> <1486712654-15431-4-git-send-email-zyw@rock-chips.com> <20170309003921.GA101174@google.com> <11032198.PxydffNNDT@diego> Message-ID: <58C0BBB0.6080204@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Heiko and Brain On 03/09/2017 09:02 AM, Heiko St?bner wrote: > Am Mittwoch, 8. M?rz 2017, 16:39:23 CET schrieb Brian Norris: >> On Fri, Feb 10, 2017 at 03:44:13PM +0800, Chris Zhong wrote: >>> 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 >>> --- >>> >>> 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, >> Idea for future work: this should just be readl_poll_timeout() here, and >> throughout the driver. Yes, the readl_poll_timeout is better, if next version series is needed, I am going to add it in a separate patch behind this patch. >>> 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; >> What about existing device trees? You're essentially adding this >> new property and requiring it at the same time. >> >> Or are we considering no RK3399 DP stable at the moment? I guess we >> haven't actually merged any device trees that support this yet, no? > An interesting situation we're in here. On the one hand, you're right this > breaks "backwards compatiblity". > > But on the other hand, the type-c phy is currently very much unused. The only > current board rk3399-evb.dts does not enable them (so they're disabled > everywhere) and we have neither dwc3 nor dp nodes in any rk3399 devicetrees so > far. Also Rob was ok with the binding change :-) . > > So from my pov, I'd say it _should_ be ok, as nothing is using the phys at all > yet and thus there is nothing that could get broken. > > > Heiko Thanks Heiko. On the other hand, these is no any display node at rk3399 dtsi, so I can not add the DP node, do you or Mark.Yao have plan to complete it? > >> Brian >> >>> + >>> >>> tcphy->grf_regs = syscon_regmap_lookup_by_phandle(dev->of_node, >>> >>> "rockchip,grf"); >>> >>> if (IS_ERR(tcphy->grf_regs)) { > > > > -- Chris Zhong From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751422AbdCICUB (ORCPT ); Wed, 8 Mar 2017 21:20:01 -0500 Received: from regular1.263xmail.com ([211.150.99.133]:34834 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751234AbdCICUA (ORCPT ); Wed, 8 Mar 2017 21:20:00 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: zyw@rock-chips.com X-FST-TO: mark.yao@rock-chips.com X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH 3/4] phy: rockchip-typec: support DP phy switch To: =?UTF-8?Q?Heiko_St=c3=bcbner?= , Brian Norris References: <1486712654-15431-1-git-send-email-zyw@rock-chips.com> <1486712654-15431-4-git-send-email-zyw@rock-chips.com> <20170309003921.GA101174@google.com> <11032198.PxydffNNDT@diego> Cc: dri-devel@lists.freedesktop.org, kishon@ti.com, robh@kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, seanpaul@chromium.org, groeck@chromium.org, linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com From: Chris Zhong Message-ID: <58C0BBB0.6080204@rock-chips.com> Date: Thu, 9 Mar 2017 10:19:28 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <11032198.PxydffNNDT@diego> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Heiko and Brain On 03/09/2017 09:02 AM, Heiko Stübner wrote: > Am Mittwoch, 8. März 2017, 16:39:23 CET schrieb Brian Norris: >> On Fri, Feb 10, 2017 at 03:44:13PM +0800, Chris Zhong wrote: >>> 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 >>> --- >>> >>> 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, >> Idea for future work: this should just be readl_poll_timeout() here, and >> throughout the driver. Yes, the readl_poll_timeout is better, if next version series is needed, I am going to add it in a separate patch behind this patch. >>> 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; >> What about existing device trees? You're essentially adding this >> new property and requiring it at the same time. >> >> Or are we considering no RK3399 DP stable at the moment? I guess we >> haven't actually merged any device trees that support this yet, no? > An interesting situation we're in here. On the one hand, you're right this > breaks "backwards compatiblity". > > But on the other hand, the type-c phy is currently very much unused. The only > current board rk3399-evb.dts does not enable them (so they're disabled > everywhere) and we have neither dwc3 nor dp nodes in any rk3399 devicetrees so > far. Also Rob was ok with the binding change :-) . > > So from my pov, I'd say it _should_ be ok, as nothing is using the phys at all > yet and thus there is nothing that could get broken. > > > Heiko Thanks Heiko. On the other hand, these is no any display node at rk3399 dtsi, so I can not add the DP node, do you or Mark.Yao have plan to complete it? > >> Brian >> >>> + >>> >>> tcphy->grf_regs = syscon_regmap_lookup_by_phandle(dev->of_node, >>> >>> "rockchip,grf"); >>> >>> if (IS_ERR(tcphy->grf_regs)) { > > > > -- Chris Zhong