All sm8650 boards have role switching capabilities, set it in the soc dtsi to deduplicate things. And drop the explicit dr_mode = "otg" since it's the default. Signed-off-by: Caleb Connolly <caleb.connolly@xxxxxxxxxx> --- arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 5 ----- arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 5 ----- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 5 ----- arch/arm64/boot/dts/qcom/sm8650.dtsi | 1 + 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts index eb2f910b4f58..092b78fd8a3b 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts @@ -1300,13 +1300,8 @@ &ufs_mem_phy { &usb_1 { status = "okay"; }; -&usb_1_dwc3 { - dr_mode = "otg"; - usb-role-switch; -}; - &usb_1_dwc3_hs { remote-endpoint = <&pmic_glink_hs_in>; }; diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts index fa6c3b397f2d..d6f91580ba8d 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts @@ -839,13 +839,8 @@ &ufs_mem_phy { &usb_1 { status = "okay"; }; -&usb_1_dwc3 { - dr_mode = "otg"; - usb-role-switch; -}; - &usb_1_dwc3_hs { remote-endpoint = <&pmic_glink_hs_in>; }; diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts index 6e3c4d8dcc19..bd60c2770da2 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -1285,13 +1285,8 @@ &ufs_mem_phy { &usb_1 { status = "okay"; }; -&usb_1_dwc3 { - dr_mode = "otg"; - usb-role-switch; -}; - &usb_1_dwc3_hs { remote-endpoint = <&pmic_glink_hs_in>; }; diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index 8af151d924f9..8647ca314506 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -3857,8 +3857,9 @@ usb_1_dwc3: usb@a600000 { snps,usb3_lpm_capable; snps,usb2-lpm-disable; snps,has-lpm-erratum; tx-fifo-resize; + usb-role-switch; dma-coherent; ports { -- 2.45.0