Changes since v3:
-----------------
- v3 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
- Split the series into two - this patchset proposes only 'fixes'.
The USB SS qmp phy change will be sent out separately now that we need
a driver change as well.
- Also fix the recently added sm6115p lenovo dts.
Changes since v2:
-----------------
- v2 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
- Fixed a blank line issue in [PATCH 3/3]
Changes since v1:
-----------------
- v1 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
- Addressed the review comments from Konrad and Krzysztof regarding the
USB HS and SS Phy usage in sm4250 oneplus board dts ([PATCH 3/3]).
- Collected R-B received from Konrad on v1 patches [1/3] and [2/3].
This series performs some USB related cleanups in sm6115 dtsi.
Note that this series is rebased on linux-next/master.
Bhupesh Sharma (2):
arm64: dts: qcom: sm6115: Cleanup USB node's label
arm64: dts: qcom: sm6115: Move USB node's 'maximum-speed' and
'dr_mode' properties to dts
arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 9 +++++++--
arch/arm64/boot/dts/qcom/sm6115.dtsi | 10 ++++------
arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 9 +++++++--
3 files changed, 18 insertions(+), 10 deletions(-)
--
2.38.1
There is only one USB controller present on SM6115 / SM4250
Qualcomm SoC, so drop the numbering used with USB node's label
names in the dtsi and the related sm4250-oneplus-billie2.dts.
Reviewed-by: Konrad Dybcio <[email protected]>
Signed-off-by: Bhupesh Sharma <[email protected]>
---
arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 4 ++--
arch/arm64/boot/dts/qcom/sm6115.dtsi | 8 ++++----
arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
index a3f1c7c41fd73..fa57f4bf58256 100644
--- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
+++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
@@ -225,11 +225,11 @@ &ufs_mem_phy {
status = "okay";
};
-&usb_1 {
+&usb {
status = "okay";
};
-&usb_1_hsphy {
+&usb_hsphy {
vdd-supply = <&vreg_l4a>;
vdda-pll-supply = <&vreg_l12a>;
vdda-phy-dpdm-supply = <&vreg_l15a>;
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index fbd67d2c8d781..f477c7f5ad761 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -642,7 +642,7 @@ gcc: clock-controller@1400000 {
#power-domain-cells = <1>;
};
- usb_1_hsphy: phy@1613000 {
+ usb_hsphy: phy@1613000 {
compatible = "qcom,sm6115-qusb2-phy";
reg = <0x0 0x01613000 0x0 0x180>;
#phy-cells = <0>;
@@ -1082,7 +1082,7 @@ spi5: spi@4a94000 {
};
};
- usb_1: usb@4ef8800 {
+ usb: usb@4ef8800 {
compatible = "qcom,sm6115-dwc3", "qcom,dwc3";
reg = <0x0 0x04ef8800 0x0 0x400>;
#address-cells = <2>;
@@ -1110,11 +1110,11 @@ usb_1: usb@4ef8800 {
qcom,select-utmi-as-pipe-clk;
status = "disabled";
- usb_1_dwc3: usb@4e00000 {
+ usb_dwc3: usb@4e00000 {
compatible = "snps,dwc3";
reg = <0x0 0x04e00000 0x0 0xcd00>;
interrupts = <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
- phys = <&usb_1_hsphy>;
+ phys = <&usb_hsphy>;
phy-names = "usb2-phy";
iommus = <&apps_smmu 0x120 0x0>;
snps,dis_u2_susphy_quirk;
diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index 4ce2d905d70e1..4a7194acb44a6 100644
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -273,11 +273,11 @@ &ufs_mem_phy {
status = "okay";
};
-&usb_1 {
+&usb {
status = "okay";
};
-&usb_1_hsphy {
+&usb_hsphy {
vdd-supply = <&pm6125_l4>;
vdda-pll-supply = <&pm6125_l12>;
vdda-phy-dpdm-supply = <&pm6125_l15>;
--
2.38.1
Normally the 'maximum-speed' and 'dr_mode' properties
of a USB controller + port is dependent on the type of
the ports, regulators and mode change interrupt routing
available on the board(s).
So, move the same from the sm6115 dtsi file to respective
board file(s).
Reviewed-by: Konrad Dybcio <[email protected]>
Signed-off-by: Bhupesh Sharma <[email protected]>
---
arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 5 +++++
arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 --
arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 5 +++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
index fa57f4bf58256..3f39f25e0721e 100644
--- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
+++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
@@ -229,6 +229,11 @@ &usb {
status = "okay";
};
+&usb_dwc3 {
+ maximum-speed = "high-speed";
+ dr_mode = "peripheral";
+};
+
&usb_hsphy {
vdd-supply = <&vreg_l4a>;
vdda-pll-supply = <&vreg_l12a>;
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index f477c7f5ad761..d38d0efceb88c 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -1122,8 +1122,6 @@ usb_dwc3: usb@4e00000 {
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
snps,usb3_lpm_capable;
- maximum-speed = "high-speed";
- dr_mode = "peripheral";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index 4a7194acb44a6..c20266c11fd89 100644
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -277,6 +277,11 @@ &usb {
status = "okay";
};
+&usb_dwc3 {
+ maximum-speed = "high-speed";
+ dr_mode = "peripheral";
+};
+
&usb_hsphy {
vdd-supply = <&pm6125_l4>;
vdda-pll-supply = <&pm6125_l12>;
--
2.38.1
On Tue, 14 Mar 2023 14:06:31 +0530, Bhupesh Sharma wrote:
> Changes since v3:
> -----------------
> - v3 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
> - Split the series into two - this patchset proposes only 'fixes'.
> The USB SS qmp phy change will be sent out separately now that we need
> a driver change as well.
> - Also fix the recently added sm6115p lenovo dts.
>
> [...]
Applied, thanks!
[1/2] arm64: dts: qcom: sm6115: Cleanup USB node's label
commit: 0ea0edc04a04e3e36fa7d0b3c8463b0440764cf1
[2/2] arm64: dts: qcom: sm6115: Move USB node's 'maximum-speed' and 'dr_mode' properties to dts
commit: 1f1e512288edf0ef99d9ceb9af29e2e004341ced
Best regards,
--
Bjorn Andersson <[email protected]>