| Message ID | 20230324201528.2540564-3-elder@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: dts: qcom: sdx65: support IPA | expand |
On 24.03.2023 21:15, Alex Elder wrote: > Move a few device tree "status" properties so that they are the last > specified property, in "qcom-sdx65-mtp.dts" and "qcom-sdx65.dtsi". > Note that properties must always be specified before sub-nodes. > > Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org> > Signed-off-by: Alex Elder <elder@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm/boot/dts/qcom-sdx65-mtp.dts | 6 +++--- > arch/arm/boot/dts/qcom-sdx65.dtsi | 8 +++++--- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom-sdx65-mtp.dts > index 72e25de0db5fc..57bc3b03d3aac 100644 > --- a/arch/arm/boot/dts/qcom-sdx65-mtp.dts > +++ b/arch/arm/boot/dts/qcom-sdx65-mtp.dts > @@ -270,8 +270,8 @@ nand@0 { > }; > > &remoteproc_mpss { > - status = "okay"; > memory-region = <&mpss_adsp_mem>; > + status = "okay"; > }; > > &usb { > @@ -283,14 +283,14 @@ &usb_dwc3 { > }; > > &usb_hsphy { > - status = "okay"; > vdda-pll-supply = <&vreg_l4b_0p88>; > vdda33-supply = <&vreg_l10b_3p08>; > vdda18-supply = <&vreg_l5b_1p8>; > + status = "okay"; > }; > > &usb_qmpphy { > - status = "okay"; > vdda-phy-supply = <&vreg_l4b_0p88>; > vdda-pll-supply = <&vreg_l1b_1p2>; > + status = "okay"; > }; > diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi > index 360d6dc144811..a7adf28a395a8 100644 > --- a/arch/arm/boot/dts/qcom-sdx65.dtsi > +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi > @@ -224,16 +224,15 @@ usb_hsphy: phy@ff4000 { > "qcom,usb-snps-hs-7nm-phy"; > reg = <0xff4000 0x120>; > #phy-cells = <0>; > - status = "disabled"; > clocks = <&rpmhcc RPMH_CXO_CLK>; > clock-names = "ref"; > resets = <&gcc GCC_QUSB2PHY_BCR>; > + status = "disabled"; > }; > > usb_qmpphy: phy@ff6000 { > compatible = "qcom,sdx65-qmp-usb3-uni-phy"; > reg = <0x00ff6000 0x1c8>; > - status = "disabled"; > #address-cells = <1>; > #size-cells = <1>; > ranges; > @@ -247,6 +246,8 @@ usb_qmpphy: phy@ff6000 { > <&gcc GCC_USB3_PHY_BCR>; > reset-names = "phy", "common"; > > + status = "disabled"; > + > usb_ssphy: phy@ff6200 { > reg = <0x00ff6e00 0x160>, > <0x00ff7000 0x1ec>, > @@ -393,7 +394,6 @@ mem_noc: interconnect@9680000 { > usb: usb@a6f8800 { > compatible = "qcom,sdx65-dwc3", "qcom,dwc3"; > reg = <0x0a6f8800 0x400>; > - status = "disabled"; > #address-cells = <1>; > #size-cells = <1>; > ranges; > @@ -423,6 +423,8 @@ usb: usb@a6f8800 { > > resets = <&gcc GCC_USB30_BCR>; > > + status = "disabled"; > + > usb_dwc3: usb@a600000 { > compatible = "snps,dwc3"; > reg = <0x0a600000 0xcd00>;
diff --git a/arch/arm/boot/dts/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom-sdx65-mtp.dts index 72e25de0db5fc..57bc3b03d3aac 100644 --- a/arch/arm/boot/dts/qcom-sdx65-mtp.dts +++ b/arch/arm/boot/dts/qcom-sdx65-mtp.dts @@ -270,8 +270,8 @@ nand@0 { }; &remoteproc_mpss { - status = "okay"; memory-region = <&mpss_adsp_mem>; + status = "okay"; }; &usb { @@ -283,14 +283,14 @@ &usb_dwc3 { }; &usb_hsphy { - status = "okay"; vdda-pll-supply = <&vreg_l4b_0p88>; vdda33-supply = <&vreg_l10b_3p08>; vdda18-supply = <&vreg_l5b_1p8>; + status = "okay"; }; &usb_qmpphy { - status = "okay"; vdda-phy-supply = <&vreg_l4b_0p88>; vdda-pll-supply = <&vreg_l1b_1p2>; + status = "okay"; }; diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi index 360d6dc144811..a7adf28a395a8 100644 --- a/arch/arm/boot/dts/qcom-sdx65.dtsi +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi @@ -224,16 +224,15 @@ usb_hsphy: phy@ff4000 { "qcom,usb-snps-hs-7nm-phy"; reg = <0xff4000 0x120>; #phy-cells = <0>; - status = "disabled"; clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "ref"; resets = <&gcc GCC_QUSB2PHY_BCR>; + status = "disabled"; }; usb_qmpphy: phy@ff6000 { compatible = "qcom,sdx65-qmp-usb3-uni-phy"; reg = <0x00ff6000 0x1c8>; - status = "disabled"; #address-cells = <1>; #size-cells = <1>; ranges; @@ -247,6 +246,8 @@ usb_qmpphy: phy@ff6000 { <&gcc GCC_USB3_PHY_BCR>; reset-names = "phy", "common"; + status = "disabled"; + usb_ssphy: phy@ff6200 { reg = <0x00ff6e00 0x160>, <0x00ff7000 0x1ec>, @@ -393,7 +394,6 @@ mem_noc: interconnect@9680000 { usb: usb@a6f8800 { compatible = "qcom,sdx65-dwc3", "qcom,dwc3"; reg = <0x0a6f8800 0x400>; - status = "disabled"; #address-cells = <1>; #size-cells = <1>; ranges; @@ -423,6 +423,8 @@ usb: usb@a6f8800 { resets = <&gcc GCC_USB30_BCR>; + status = "disabled"; + usb_dwc3: usb@a600000 { compatible = "snps,dwc3"; reg = <0x0a600000 0xcd00>;
Move a few device tree "status" properties so that they are the last specified property, in "qcom-sdx65-mtp.dts" and "qcom-sdx65.dtsi". Note that properties must always be specified before sub-nodes. Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Alex Elder <elder@linaro.org> --- arch/arm/boot/dts/qcom-sdx65-mtp.dts | 6 +++--- arch/arm/boot/dts/qcom-sdx65.dtsi | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)