| Message ID | 20241210111444.26240-4-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7db0ba3e6e6c215353c1e58b42dfd77c7ab89256 |
| Headers | show |
| Series | arm64: dts: qcom: x1e80100: fix USB OTG regressions | expand |
On 24-12-10 12:14:44, Johan Hovold wrote: > This reverts commit f042bc234c2e00764b8aa2c9e2f8177cdc63f664. > > A recent change enabling role switching for the x1e80100 USB-C > controllers breaks UCSI and DisplayPort Alternate Mode when the > controllers are in host mode: > > ucsi_glink.pmic_glink_ucsi pmic_glink.ucsi.0: PPM init failed, stop trying > > As enabling OTG mode currently breaks SuperSpeed hotplug and suspend, > and with retimer (and orientation detection) support not even merged > yet, let's revert at least until we have stable host mode in mainline. > > Fixes: f042bc234c2e ("arm64: dts: qcom: x1e80100: enable OTG on USB-C controllers") > Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Link: https://lore.kernel.org/all/hw2pdof4ajadjsjrb44f2q4cz4yh5qcqz5d3l7gjt2koycqs3k@xx5xvd26uyef > Link: https://lore.kernel.org/lkml/Z1gbyXk-SktGjL6-@hovoldconsulting.com/ > Cc: Jonathan Marek <jonathan@marek.ca> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Abel Vesa <abel.vesa@linaro.org> > --- > arch/arm64/boot/dts/qcom/x1e80100.dtsi | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi > index 1740fdf7b1de..4c1e01605e87 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi > +++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi > @@ -4422,8 +4422,6 @@ usb_1_ss2_dwc3: usb@a000000 { > > dma-coherent; > > - usb-role-switch; > - > ports { > #address-cells = <1>; > #size-cells = <0>; > @@ -4677,8 +4675,6 @@ usb_1_ss0_dwc3: usb@a600000 { > > dma-coherent; > > - usb-role-switch; > - > ports { > #address-cells = <1>; > #size-cells = <0>; > @@ -4777,8 +4773,6 @@ usb_1_ss1_dwc3: usb@a800000 { > > dma-coherent; > > - usb-role-switch; > - > ports { > #address-cells = <1>; > #size-cells = <0>; > -- > 2.45.2 >
diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi index 1740fdf7b1de..4c1e01605e87 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi @@ -4422,8 +4422,6 @@ usb_1_ss2_dwc3: usb@a000000 { dma-coherent; - usb-role-switch; - ports { #address-cells = <1>; #size-cells = <0>; @@ -4677,8 +4675,6 @@ usb_1_ss0_dwc3: usb@a600000 { dma-coherent; - usb-role-switch; - ports { #address-cells = <1>; #size-cells = <0>; @@ -4777,8 +4773,6 @@ usb_1_ss1_dwc3: usb@a800000 { dma-coherent; - usb-role-switch; - ports { #address-cells = <1>; #size-cells = <0>;
This reverts commit f042bc234c2e00764b8aa2c9e2f8177cdc63f664. A recent change enabling role switching for the x1e80100 USB-C controllers breaks UCSI and DisplayPort Alternate Mode when the controllers are in host mode: ucsi_glink.pmic_glink_ucsi pmic_glink.ucsi.0: PPM init failed, stop trying As enabling OTG mode currently breaks SuperSpeed hotplug and suspend, and with retimer (and orientation detection) support not even merged yet, let's revert at least until we have stable host mode in mainline. Fixes: f042bc234c2e ("arm64: dts: qcom: x1e80100: enable OTG on USB-C controllers") Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/all/hw2pdof4ajadjsjrb44f2q4cz4yh5qcqz5d3l7gjt2koycqs3k@xx5xvd26uyef Link: https://lore.kernel.org/lkml/Z1gbyXk-SktGjL6-@hovoldconsulting.com/ Cc: Jonathan Marek <jonathan@marek.ca> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- arch/arm64/boot/dts/qcom/x1e80100.dtsi | 6 ------ 1 file changed, 6 deletions(-)