6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <redacted>
[ Upstream commit 65aedb0b48c09595065c81722d9cca53760f7220 ]
Currently the dts contains a mix of status-as-first-property (old qcom
style) and status-as-last-property (new style).
Move all status properties down to the bottom once and for all so that
the style is consistent between different nodes.
Reviewed-by: Konrad Dybcio <redacted>
Signed-off-by: Luca Weiss <redacted>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230213-fp4-more-i2c-v2-1-1c459c572f80@fairphone.com (local)
Stable-dep-of: a3b3a060b696 ("arm64: dts: qcom: sm7225-fairphone-fp4: Fix swapped USB QMP PHY vdda-phy/vdda-pll supplies")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
.../boot/dts/qcom/sm7225-fairphone-fp4.dts | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index 13b1d484bdeb7..131e6c40a39b9 100644
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -104,8 +104,8 @@ active-config0 {
};
&adsp {
- status = "okay";
firmware-name = "qcom/sm7225/fairphone4/adsp.mdt";
+ status = "okay";
};
&apps_rsc {@@ -323,13 +323,13 @@ vreg_bob: bob {
};
&cdsp {
- status = "okay";
firmware-name = "qcom/sm7225/fairphone4/cdsp.mdt";
+ status = "okay";
};
&i2c10 {
- status = "okay";
clock-frequency = <400000>;
+ status = "okay";
haptics@5a {
compatible = "awinic,aw8695";@@ -357,16 +357,16 @@ haptics@5a {
};
&mpss {
- status = "okay";
firmware-name = "qcom/sm7225/fairphone4/modem.mdt";
+ status = "okay";
};
&pm6150l_wled {
- status = "okay";
-
qcom,switching-freq = <800>;
qcom,current-limit-microamp = <20000>;
qcom,num-strings = <2>;
+
+ status = "okay";
};
&pm6350_gpios {@@ -380,8 +380,8 @@ gpio_keys_pin: gpio-keys-state {
};
&pm6350_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm7250b_adc {@@ -433,21 +433,21 @@ &uart9 {
};
&ufs_mem_hc {
- status = "okay";
-
reset-gpios = <&tlmm 156 GPIO_ACTIVE_LOW>;
vcc-supply = <&vreg_l7e>;
vcc-max-microamp = <800000>;
vccq2-supply = <&vreg_l12a>;
vccq2-max-microamp = <800000>;
-};
-&ufs_mem_phy {
status = "okay";
+};
+&ufs_mem_phy {
vdda-phy-supply = <&vreg_l18a>;
vdda-pll-supply = <&vreg_l22a>;
+
+ status = "okay";
};
&usb_1 {@@ -460,26 +460,26 @@ &usb_1_dwc3 {
};
&usb_1_hsphy {
- status = "okay";
-
vdd-supply = <&vreg_l18a>;
vdda-pll-supply = <&vreg_l2a>;
vdda-phy-dpdm-supply = <&vreg_l3a>;
-};
-&usb_1_qmpphy {
status = "okay";
+};
+&usb_1_qmpphy {
vdda-phy-supply = <&vreg_l22a>;
vdda-pll-supply = <&vreg_l16a>;
-};
-&wifi {
status = "okay";
+};
+&wifi {
vdd-0.8-cx-mx-supply = <&vreg_l4a>;
vdd-1.8-xo-supply = <&vreg_l7a>;
vdd-1.3-rfa-supply = <&vreg_l2e>;
vdd-3.3-ch0-supply = <&vreg_l10e>;
vdd-3.3-ch1-supply = <&vreg_l11e>;
+
+ status = "okay";
};--
2.53.0