| Message ID | 20240220173104.3052778-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | f176168bcb95bd1fdd32f5a794e68b7a36ac8740 |
| Headers | show |
| Series | arm64: dts: qcom: sm6115: fix USB PHY configuration | expand |
On Tue, 20 Feb 2024 19:31:04 +0200, Dmitry Baryshkov wrote: > The patch adding Type-C support for sm6115 was misapplied. All the > orientation switch configuration ended up at the UFS PHY node instead of > the USB PHY node. Move the data bits to the correct place. > > Applied, thanks! [1/1] arm64: dts: qcom: sm6115: fix USB PHY configuration commit: f176168bcb95bd1fdd32f5a794e68b7a36ac8740 Best regards,
On 20/02/2024 22:23, Konrad Dybcio wrote: > On 20.02.2024 18:31, Dmitry Baryshkov wrote: >> The patch adding Type-C support for sm6115 was misapplied. All the >> orientation switch configuration ended up at the UFS PHY node instead of >> the USB PHY node. Move the data bits to the correct place. >> >> Fixes: a06a2f12f9e2 ("arm64: dts: qcom: qrb4210-rb2: enable USB-C port handling") >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- > > So that's why UFS stopped working and I couldn't for the life of > me guess why.. We discussed such cases in the past, because it is not the first (it's 3rd or 4th within last 1 - 1.5 years). I believe Bjorn should reject patches which do not apply cleanly and ask to resubmit. Mis-applied patch might cause issues which are tricky to debug. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index ee65ab073ba6..b344f6f6d556 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -884,10 +884,31 @@ usb_qmpphy: phy@1615000 { clock-output-names = "usb3_phy_pipe_clk_src"; #phy-cells = <0>; + orientation-switch; qcom,tcsr-reg = <&tcsr_regs 0xb244>; status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + usb_qmpphy_out: endpoint { + }; + }; + + port@1 { + reg = <1>; + + usb_qmpphy_usb_ss_in: endpoint { + remote-endpoint = <&usb_dwc3_ss>; + }; + }; + }; }; system_noc: interconnect@1880000 { @@ -1213,29 +1234,8 @@ ufs_mem_phy: phy@4807000 { reset-names = "ufsphy"; #phy-cells = <0>; - orientation-switch; status = "disabled"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - - usb_qmpphy_out: endpoint { - }; - }; - - port@1 { - reg = <1>; - - usb_qmpphy_usb_ss_in: endpoint { - remote-endpoint = <&usb_dwc3_ss>; - }; - }; - }; }; gpi_dma0: dma-controller@4a00000 {
The patch adding Type-C support for sm6115 was misapplied. All the orientation switch configuration ended up at the UFS PHY node instead of the USB PHY node. Move the data bits to the correct place. Fixes: a06a2f12f9e2 ("arm64: dts: qcom: qrb4210-rb2: enable USB-C port handling") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/sm6115.dtsi | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-)