Move usb-role-switch to SoC dtsi, and remove usb default dr_mode.
Signed-off-by: Tengfei Fan <[email protected]>
---
v1 -> v2:
- Splitting a patch into two patches based on functionality
- Remove some changes that have already been mainlined
- Update patch commit message
previous discussion here:
[1] v1: https://lore.kernel.org/linux-arm-msm/[email protected]
Tengfei Fan (2):
arm64: dts: qcom: sm8550: Move usb-role-switch to SoC dtsi
arm64: dts: qcom: sm8550: Remove usb default dr_mode
arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 5 -----
arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 5 -----
arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 5 -----
arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 5 -----
arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 +
5 files changed, 1 insertion(+), 20 deletions(-)
base-commit: 9d99040b1bc8dbf385a8aa535e9efcdf94466e19
--
2.25.1
Otg is default usb dr_mode, so this property can be removed.
Signed-off-by: Tengfei Fan <[email protected]>
---
arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 4 ----
arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 4 ----
arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 4 ----
arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 4 ----
4 files changed, 16 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
index 411de3451db8..e0dc03a97771 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
@@ -1253,10 +1253,6 @@ &usb_1 {
status = "okay";
};
-&usb_1_dwc3 {
- dr_mode = "otg";
-};
-
&usb_1_dwc3_hs {
remote-endpoint = <&pmic_glink_hs_in>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index 84d16227ef80..26dfca0c3e05 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -946,10 +946,6 @@ &usb_1 {
status = "okay";
};
-&usb_1_dwc3 {
- dr_mode = "otg";
-};
-
&usb_1_dwc3_hs {
remote-endpoint = <&pmic_glink_hs_in>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index e20c6240f76d..d27820fb5fc0 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -1115,10 +1115,6 @@ &usb_1 {
status = "okay";
};
-&usb_1_dwc3 {
- dr_mode = "otg";
-};
-
&usb_1_dwc3_hs {
remote-endpoint = <&pmic_glink_hs_in>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
index 6dd5232da9f9..85d487ef80a0 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
@@ -737,10 +737,6 @@ &usb_1 {
status = "okay";
};
-&usb_1_dwc3 {
- dr_mode = "otg";
-};
-
&usb_1_dwc3_hs {
remote-endpoint = <&pmic_glink_hs_in>;
};
--
2.25.1
The usb-role-switch is SA8775p SoC property, so move it from board dts
to SA8775p SoC dtsi.
Signed-off-by: Tengfei Fan <[email protected]>
---
arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 1 -
arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 -
arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 -
arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 1 -
arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 +
5 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
index 31f52df6b67e..411de3451db8 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
@@ -1255,7 +1255,6 @@ &usb_1 {
&usb_1_dwc3 {
dr_mode = "otg";
- usb-role-switch;
};
&usb_1_dwc3_hs {
diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index 42d4d558b7aa..84d16227ef80 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -948,7 +948,6 @@ &usb_1 {
&usb_1_dwc3 {
dr_mode = "otg";
- usb-role-switch;
};
&usb_1_dwc3_hs {
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 2ed1715000c9..e20c6240f76d 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -1117,7 +1117,6 @@ &usb_1 {
&usb_1_dwc3 {
dr_mode = "otg";
- usb-role-switch;
};
&usb_1_dwc3_hs {
diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
index 92a88fb05609..6dd5232da9f9 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
@@ -739,7 +739,6 @@ &usb_1 {
&usb_1_dwc3 {
dr_mode = "otg";
- usb-role-switch;
};
&usb_1_dwc3_hs {
diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index 79311a6bd1ad..8e3ce1152211 100644
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -3264,6 +3264,7 @@ usb_1_dwc3: usb@a600000 {
snps,has-lpm-erratum;
tx-fifo-resize;
dma-coherent;
+ usb-role-switch;
ports {
#address-cells = <1>;
--
2.25.1
On Wed, May 29, 2024 at 06:02:55PM +0800, Tengfei Fan wrote:
> The usb-role-switch is SA8775p SoC property, so move it from board dts
> to SA8775p SoC dtsi.
The commit message doesn't match patch contents. Other than that LGTM
>
> Signed-off-by: Tengfei Fan <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 1 -
> arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 -
> arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 -
> arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 1 -
> arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 +
> 5 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> index 31f52df6b67e..411de3451db8 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> @@ -1255,7 +1255,6 @@ &usb_1 {
>
> &usb_1_dwc3 {
> dr_mode = "otg";
> - usb-role-switch;
> };
>
> &usb_1_dwc3_hs {
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
> index 42d4d558b7aa..84d16227ef80 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
> @@ -948,7 +948,6 @@ &usb_1 {
>
> &usb_1_dwc3 {
> dr_mode = "otg";
> - usb-role-switch;
> };
>
> &usb_1_dwc3_hs {
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
> index 2ed1715000c9..e20c6240f76d 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
> @@ -1117,7 +1117,6 @@ &usb_1 {
>
> &usb_1_dwc3 {
> dr_mode = "otg";
> - usb-role-switch;
> };
>
> &usb_1_dwc3_hs {
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
> index 92a88fb05609..6dd5232da9f9 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
> @@ -739,7 +739,6 @@ &usb_1 {
>
> &usb_1_dwc3 {
> dr_mode = "otg";
> - usb-role-switch;
> };
>
> &usb_1_dwc3_hs {
> diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> index 79311a6bd1ad..8e3ce1152211 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> @@ -3264,6 +3264,7 @@ usb_1_dwc3: usb@a600000 {
> snps,has-lpm-erratum;
> tx-fifo-resize;
> dma-coherent;
> + usb-role-switch;
>
> ports {
> #address-cells = <1>;
> --
> 2.25.1
>
--
With best wishes
Dmitry
On Wed, May 29, 2024 at 06:02:56PM +0800, Tengfei Fan wrote:
> Otg is default usb dr_mode, so this property can be removed.
OTG, not Otg.
With that fixed:
Reviewed-by: Dmitry Baryshkov <[email protected]>
>
> Signed-off-by: Tengfei Fan <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 4 ----
> arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 4 ----
> arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 4 ----
> arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 4 ----
> 4 files changed, 16 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> index 411de3451db8..e0dc03a97771 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> @@ -1253,10 +1253,6 @@ &usb_1 {
> status = "okay";
> };
>
> -&usb_1_dwc3 {
> - dr_mode = "otg";
> -};
> -
> &usb_1_dwc3_hs {
> remote-endpoint = <&pmic_glink_hs_in>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
> index 84d16227ef80..26dfca0c3e05 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
> @@ -946,10 +946,6 @@ &usb_1 {
> status = "okay";
> };
>
> -&usb_1_dwc3 {
> - dr_mode = "otg";
> -};
> -
> &usb_1_dwc3_hs {
> remote-endpoint = <&pmic_glink_hs_in>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
> index e20c6240f76d..d27820fb5fc0 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
> @@ -1115,10 +1115,6 @@ &usb_1 {
> status = "okay";
> };
>
> -&usb_1_dwc3 {
> - dr_mode = "otg";
> -};
> -
> &usb_1_dwc3_hs {
> remote-endpoint = <&pmic_glink_hs_in>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
> index 6dd5232da9f9..85d487ef80a0 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
> @@ -737,10 +737,6 @@ &usb_1 {
> status = "okay";
> };
>
> -&usb_1_dwc3 {
> - dr_mode = "otg";
> -};
> -
> &usb_1_dwc3_hs {
> remote-endpoint = <&pmic_glink_hs_in>;
> };
> --
> 2.25.1
>
--
With best wishes
Dmitry
On 5/29/2024 8:49 PM, Dmitry Baryshkov wrote:
> On Wed, May 29, 2024 at 06:02:56PM +0800, Tengfei Fan wrote:
>> Otg is default usb dr_mode, so this property can be removed.
>
> OTG, not Otg.
I will update Otg to OTG.
>
> With that fixed:
>
> Reviewed-by: Dmitry Baryshkov <[email protected]>
>
>>
>> Signed-off-by: Tengfei Fan <[email protected]>
>> ---
>> arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 4 ----
>> arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 4 ----
>> arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 4 ----
>> arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 4 ----
>> 4 files changed, 16 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
>> index 411de3451db8..e0dc03a97771 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
>> @@ -1253,10 +1253,6 @@ &usb_1 {
>> status = "okay";
>> };
>>
>> -&usb_1_dwc3 {
>> - dr_mode = "otg";
>> -};
>> -
>> &usb_1_dwc3_hs {
>> remote-endpoint = <&pmic_glink_hs_in>;
>> };
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
>> index 84d16227ef80..26dfca0c3e05 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
>> @@ -946,10 +946,6 @@ &usb_1 {
>> status = "okay";
>> };
>>
>> -&usb_1_dwc3 {
>> - dr_mode = "otg";
>> -};
>> -
>> &usb_1_dwc3_hs {
>> remote-endpoint = <&pmic_glink_hs_in>;
>> };
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
>> index e20c6240f76d..d27820fb5fc0 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
>> @@ -1115,10 +1115,6 @@ &usb_1 {
>> status = "okay";
>> };
>>
>> -&usb_1_dwc3 {
>> - dr_mode = "otg";
>> -};
>> -
>> &usb_1_dwc3_hs {
>> remote-endpoint = <&pmic_glink_hs_in>;
>> };
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
>> index 6dd5232da9f9..85d487ef80a0 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
>> @@ -737,10 +737,6 @@ &usb_1 {
>> status = "okay";
>> };
>>
>> -&usb_1_dwc3 {
>> - dr_mode = "otg";
>> -};
>> -
>> &usb_1_dwc3_hs {
>> remote-endpoint = <&pmic_glink_hs_in>;
>> };
>> --
>> 2.25.1
>>
>
--
Thx and BRs,
Tengfei Fan
On 5/29/2024 8:47 PM, Dmitry Baryshkov wrote:
> On Wed, May 29, 2024 at 06:02:55PM +0800, Tengfei Fan wrote:
>> The usb-role-switch is SA8775p SoC property, so move it from board dts
>> to SA8775p SoC dtsi.
>
> The commit message doesn't match patch contents. Other than that LGTM
I will update this commit message. I work on the sa8775p platform
lately, so I wrote this commit message incorrectly.
>
>>
>> Signed-off-by: Tengfei Fan <[email protected]>
>> ---
>> arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 1 -
>> arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 -
>> arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 -
>> arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 1 -
>> arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 +
>> 5 files changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
>> index 31f52df6b67e..411de3451db8 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
>> @@ -1255,7 +1255,6 @@ &usb_1 {
>>
>> &usb_1_dwc3 {
>> dr_mode = "otg";
>> - usb-role-switch;
>> };
>>
>> &usb_1_dwc3_hs {
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
>> index 42d4d558b7aa..84d16227ef80 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
>> @@ -948,7 +948,6 @@ &usb_1 {
>>
>> &usb_1_dwc3 {
>> dr_mode = "otg";
>> - usb-role-switch;
>> };
>>
>> &usb_1_dwc3_hs {
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
>> index 2ed1715000c9..e20c6240f76d 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
>> @@ -1117,7 +1117,6 @@ &usb_1 {
>>
>> &usb_1_dwc3 {
>> dr_mode = "otg";
>> - usb-role-switch;
>> };
>>
>> &usb_1_dwc3_hs {
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
>> index 92a88fb05609..6dd5232da9f9 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
>> @@ -739,7 +739,6 @@ &usb_1 {
>>
>> &usb_1_dwc3 {
>> dr_mode = "otg";
>> - usb-role-switch;
>> };
>>
>> &usb_1_dwc3_hs {
>> diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
>> index 79311a6bd1ad..8e3ce1152211 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
>> @@ -3264,6 +3264,7 @@ usb_1_dwc3: usb@a600000 {
>> snps,has-lpm-erratum;
>> tx-fifo-resize;
>> dma-coherent;
>> + usb-role-switch;
>>
>> ports {
>> #address-cells = <1>;
>> --
>> 2.25.1
>>
>
--
Thx and BRs,
Tengfei Fan