| Message ID | 20180301152515.20940-2-enric.balletbo@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Kishon, Am Donnerstag, 1. März 2018, 16:25:10 CET schrieb Enric Balletbo i Serra: > Right now the rockchip type-c phy does fail probing when no extcon is > detected. Some boards get the cable-state via the extcon interface and > have this supported, other boards seem to use the fusb302 chip or > another but the driver currently does not seem to utilize the extcon > interface to report the cable-state. And, other, just connect the type-c > to a standard USB-A port so use no controller at all. A missing extcon > shouldn't fail to probe, instead, should just fall back to working in > host-mode if it cannot get the extcon. > > Fixes: c301b327aea898af ("arm64: dts: rockchip: add usb3-phy otg-port > support for rk3399") Reported-by: Vicente Bergas <vicencb@gmail.com> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> I did revert the original commit mentioned in the fixes tag for 4.16-rc but it would nevertheless be really cool if these 2 patches (code + binding) could make it into your tree for 4.17 :-) And ideally also with the other 5 patches from Enric starting at [PATCH v3 1/6] phy: rockchip-typec: deprecate some DT properties for various register fields. from 2018-02-16. Thanks Heiko
On Wednesday 14 March 2018 01:44 PM, Heiko Stübner wrote: > Hi Kishon, > > Am Donnerstag, 1. März 2018, 16:25:10 CET schrieb Enric Balletbo i Serra: >> Right now the rockchip type-c phy does fail probing when no extcon is >> detected. Some boards get the cable-state via the extcon interface and >> have this supported, other boards seem to use the fusb302 chip or >> another but the driver currently does not seem to utilize the extcon >> interface to report the cable-state. And, other, just connect the type-c >> to a standard USB-A port so use no controller at all. A missing extcon >> shouldn't fail to probe, instead, should just fall back to working in >> host-mode if it cannot get the extcon. >> >> Fixes: c301b327aea898af ("arm64: dts: rockchip: add usb3-phy otg-port >> support for rk3399") Reported-by: Vicente Bergas <vicencb@gmail.com> >> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > > Reviewed-by: Heiko Stuebner <heiko@sntech.de> > > I did revert the original commit mentioned in the fixes tag for 4.16-rc > but it would nevertheless be really cool if these 2 patches (code + binding) > could make it into your tree for 4.17 :-) > > And ideally also with the other 5 patches from Enric starting at > [PATCH v3 1/6] phy: rockchip-typec: deprecate some DT properties for various register fields. > > from 2018-02-16. merged now, thanks! -Kishon
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c index 7492c8978217..e260067d2c98 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -782,6 +782,9 @@ static int tcphy_get_mode(struct rockchip_typec_phy *tcphy) u8 mode; int ret; + if (!edev) + return MODE_DFP_USB; + ufp = extcon_get_state(edev, EXTCON_USB); dp = extcon_get_state(edev, EXTCON_DISP_DP); @@ -1115,9 +1118,13 @@ static int rockchip_typec_phy_probe(struct platform_device *pdev) tcphy->extcon = extcon_get_edev_by_phandle(dev, 0); if (IS_ERR(tcphy->extcon)) { - if (PTR_ERR(tcphy->extcon) != -EPROBE_DEFER) - dev_err(dev, "Invalid or missing extcon\n"); - return PTR_ERR(tcphy->extcon); + if (PTR_ERR(tcphy->extcon) == -ENODEV) { + tcphy->extcon = NULL; + } else { + if (PTR_ERR(tcphy->extcon) != -EPROBE_DEFER) + dev_err(dev, "Invalid or missing extcon\n"); + return PTR_ERR(tcphy->extcon); + } } pm_runtime_enable(dev);
Right now the rockchip type-c phy does fail probing when no extcon is detected. Some boards get the cable-state via the extcon interface and have this supported, other boards seem to use the fusb302 chip or another but the driver currently does not seem to utilize the extcon interface to report the cable-state. And, other, just connect the type-c to a standard USB-A port so use no controller at all. A missing extcon shouldn't fail to probe, instead, should just fall back to working in host-mode if it cannot get the extcon. Fixes: c301b327aea898af ("arm64: dts: rockchip: add usb3-phy otg-port support for rk3399") Reported-by: Vicente Bergas <vicencb@gmail.com> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> --- Changes in v2: - [1/6] Keep the error handling of extcon (Heiko Stubner) drivers/phy/rockchip/phy-rockchip-typec.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)