Fix style issues and sort alphabetically
Signed-off-by: Paul Sajna <sajattack@postmarketos.org>
---
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 226 ++++++++++++-------------
1 file changed, 113 insertions(+), 113 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index 1f4427194fddea238c1b97afd8494d08b006a40a..cbdd0c537a591a4c5365b0cb3a85d85e5c1269fa 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -45,8 +45,8 @@ reserved-memory {
#size-cells = <2>;
ranges;
- qseecom_mem: memory@b2000000 {
- reg = <0 0xb2000000 0 0x1800000>;
+ ipa_fw_mem: memory@8c400000 {
+ reg = <0 0x8c400000 0 0x10000>;
no-map;
};
@@ -55,11 +55,6 @@ gpu_mem: memory@8c415000 {
no-map;
};
- ipa_fw_mem: memory@8c400000 {
- reg = <0 0x8c400000 0 0x10000>;
- no-map;
- };
-
adsp_mem: memory@8c500000 {
reg = <0 0x8c500000 0 0x1e00000>;
no-map;
@@ -100,9 +95,8 @@ spss_mem: memory@99000000 {
no-map;
};
- /* Framebuffer region */
- memory@9d400000 {
- reg = <0x0 0x9d400000 0x0 0x2400000>;
+ qseecom_mem: memory@b2000000 {
+ reg = <0 0xb2000000 0 0x1800000>;
no-map;
};
@@ -465,11 +459,11 @@ vreg_s3c_0p6: smps3 {
};
};
-&cdsp_pas {
+&adsp_pas {
status = "okay";
};
-&gmu {
+&cdsp_pas {
status = "okay";
};
@@ -481,6 +475,10 @@ &gcc {
<GCC_LPASS_SWAY_CLK>;
};
+&gmu {
+ status = "okay";
+};
+
&gpu {
status = "okay";
@@ -500,74 +498,88 @@ &mss_pil {
status = "okay";
};
+&pm8998_gpios {
+ vol_up_pin_a: vol-up-active-state {
+ pins = "gpio6";
+ function = "normal";
+ input-enable;
+ bias-pull-up;
+ qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+ };
+};
+
&pm8998_resin {
linux,code = <KEY_VOLUMEDOWN>;
- status = "okay";
-};
-&sdhc_2 {
status = "okay";
+};
- cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data &sd_card_det_n>;
+&pmi8998_flash {
+ status = "okay";
- vmmc-supply = <&vreg_l21a_2p95>;
- vqmmc-supply = <&vddpx_2>;
+ led-0 {
+ label = "flash";
+ function = LED_FUNCTION_FLASH;
+ color = <LED_COLOR_ID_WHITE>;
+ led-sources = <1>;
+ led-max-microamp = <850000>;
+ flash-max-microamp = <850000>;
+ flash-max-timeout-us = <500000>;
+ };
};
-/*
- * UFS works partially and only with clk_ignore_unused.
- * Sometimes it crashes with I/O errors.
- */
-&ufs_mem_hc {
+&pmi8998_wled {
status = "okay";
-
- reset-gpios = <&tlmm 150 GPIO_ACTIVE_LOW>;
-
- vcc-supply = <&vreg_l20a_2p95>;
- vcc-max-microamp = <600000>;
};
-&ufs_mem_phy {
+&pmi8998_lpg {
status = "okay";
- vdda-phy-supply = <&vdda_ufs1_core>;
- vdda-pll-supply = <&vdda_ufs1_1p2>;
+ led@0 {
+ label = "blue";
+ reg = <3>;
+ color = <LED_COLOR_ID_BLUE>;
+ default-state = "off";
+ };
+
+ led@1 {
+ label = "green";
+ reg = <4>;
+ color = <LED_COLOR_ID_GREEN>;
+ default-state = "off";
+ };
+
+ led@2 {
+ label = "red";
+ reg = <5>;
+ color = <LED_COLOR_ID_RED>;
+ default-state = "off";
+ };
};
-&usb_1 {
- status = "okay";
+&qup_uart9_rx {
+ drive-strength = <2>;
+ bias-pull-up;
};
-&usb_1_dwc3 {
- /* TODO: these devices have usb id pin */
- dr_mode = "peripheral";
+&qup_uart9_tx {
+ drive-strength = <2>;
+ bias-disable;
};
-&usb_1_hsphy {
- status = "okay";
+&sdhc_2 {
+ cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
- vdd-supply = <&vdda_usb1_ss_core>;
- vdda-pll-supply = <&vdda_qusb_hs0_1p8>;
- vdda-phy-dpdm-supply = <&vdda_qusb_hs0_3p1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data &sd_card_det_n>;
- qcom,imp-res-offset-value = <8>;
- qcom,hstx-trim-value = <QUSB2_V2_HSTX_TRIM_21_6_MA>;
- qcom,preemphasis-level = <QUSB2_V2_PREEMPHASIS_5_PERCENT>;
- qcom,preemphasis-width = <QUSB2_V2_PREEMPHASIS_WIDTH_HALF_BIT>;
-};
+ vmmc-supply = <&vreg_l21a_2p95>;
+ vqmmc-supply = <&vddpx_2>;
-&usb_1_qmpphy {
status = "okay";
-
- vdda-phy-supply = <&vdda_usb1_ss_1p2>;
- vdda-pll-supply = <&vdda_usb1_ss_core>;
};
-/* PINCTRL - additions to nodes defined in sdm845.dtsi */
-
&tlmm {
gpio-reserved-ranges = <28 4>, <81 4>;
@@ -604,91 +616,79 @@ sd_card_det_n: sd-card-det-n-state {
};
};
-&pm8998_gpios {
- vol_up_pin_a: vol-up-active-state {
- pins = "gpio6";
- function = "normal";
- input-enable;
- bias-pull-up;
- qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
- };
+&qupv3_id_0 {
+ status = "okay";
};
-&pmi8998_flash {
+&qupv3_id_1 {
status = "okay";
-
- led-0 {
- label = "flash";
- function = LED_FUNCTION_FLASH;
- color = <LED_COLOR_ID_WHITE>;
- led-sources = <1>;
- led-max-microamp = <850000>;
- flash-max-microamp = <850000>;
- flash-max-timeout-us = <500000>;
- };
};
-&pmi8998_lpg {
+&uart6 {
+ pinctrl-0 = <&qup_uart6_4pin>;
+
status = "okay";
- led@0 {
- label = "blue";
- reg = <3>;
- color = <LED_COLOR_ID_BLUE>;
- default-state = "off";
+ bluetooth {
+ compatible = "qcom,wcn3990-bt";
+ vddio-supply = <&vreg_s4a_1p8>;
+ vddxo-supply = <&vreg_l7a_1p8>;
+ vddrf-supply = <&vreg_l17a_1p3>;
+ vddch0-supply = <&vreg_l25a_3p3>;
+ max-speed = <3200000>;
};
+};
- led@1 {
- label = "green";
- reg = <4>;
- color = <LED_COLOR_ID_GREEN>;
- default-state = "off";
- };
+&uart9 {
+ label = "LS-UART1";
- led@2 {
- label = "red";
- reg = <5>;
- color = <LED_COLOR_ID_RED>;
- default-state = "off";
- };
+ status = "okay";
};
-&qupv3_id_0 {
+/*
+ * UFS works partially and only with clk_ignore_unused.
+ * Sometimes it crashes with I/O errors.
+ */
+&ufs_mem_hc {
+ reset-gpios = <&tlmm 150 GPIO_ACTIVE_LOW>;
+ vcc-supply = <&vreg_l20a_2p95>;
+ vcc-max-microamp = <600000>;
+
status = "okay";
};
-&qupv3_id_1 {
+&ufs_mem_phy {
+ vdda-phy-supply = <&vdda_ufs1_core>;
+ vdda-pll-supply = <&vdda_ufs1_1p2>;
+
status = "okay";
};
-&qup_uart9_rx {
- drive-strength = <2>;
- bias-pull-up;
+&usb_1 {
+ status = "okay";
};
-&qup_uart9_tx {
- drive-strength = <2>;
- bias-disable;
+&usb_1_dwc3 {
+ dr_mode = "peripheral";
+ maximum-speed = "high-speed";
};
-&uart6 {
- pinctrl-0 = <&qup_uart6_4pin>;
-
- status = "okay";
+&usb_1_hsphy {
+ vdd-supply = <&vdda_usb1_ss_core>;
+ vdda-pll-supply = <&vdda_qusb_hs0_1p8>;
+ vdda-phy-dpdm-supply = <&vdda_qusb_hs0_3p1>;
- bluetooth {
- compatible = "qcom,wcn3990-bt";
+ qcom,imp-res-offset-value = <8>;
+ qcom,hstx-trim-value = <QUSB2_V2_HSTX_TRIM_21_6_MA>;
+ qcom,preemphasis-level = <QUSB2_V2_PREEMPHASIS_5_PERCENT>;
+ qcom,preemphasis-width = <QUSB2_V2_PREEMPHASIS_WIDTH_HALF_BIT>;
- vddio-supply = <&vreg_s4a_1p8>;
- vddxo-supply = <&vreg_l7a_1p8>;
- vddrf-supply = <&vreg_l17a_1p3>;
- vddch0-supply = <&vreg_l25a_3p3>;
- max-speed = <3200000>;
- };
+ status = "okay";
};
-&uart9 {
- label = "LS-UART1";
+&usb_1_qmpphy {
+ vdda-phy-supply = <&vdda_usb1_ss_1p2>;
+ vdda-pll-supply = <&vdda_usb1_ss_core>;
status = "okay";
};
--
2.51.0On 14/09/2025 01:56, Paul Sajna wrote:
> Fix style issues and sort alphabetically
What style issues? Why are you re-sorting this? Answer to these in the
commit msg.
>
> Signed-off-by: Paul Sajna <sajattack@postmarketos.org>
> -&uart6 {
> - pinctrl-0 = <&qup_uart6_4pin>;
> -
> - status = "okay";
> +&usb_1_hsphy {
> + vdd-supply = <&vdda_usb1_ss_core>;
> + vdda-pll-supply = <&vdda_qusb_hs0_1p8>;
> + vdda-phy-dpdm-supply = <&vdda_qusb_hs0_3p1>;
>
> - bluetooth {
> - compatible = "qcom,wcn3990-bt";
> + qcom,imp-res-offset-value = <8>;
> + qcom,hstx-trim-value = <QUSB2_V2_HSTX_TRIM_21_6_MA>;
> + qcom,preemphasis-level = <QUSB2_V2_PREEMPHASIS_5_PERCENT>;
> + qcom,preemphasis-width = <QUSB2_V2_PREEMPHASIS_WIDTH_HALF_BIT>;
>
> - vddio-supply = <&vreg_s4a_1p8>;
> - vddxo-supply = <&vreg_l7a_1p8>;
> - vddrf-supply = <&vreg_l17a_1p3>;
> - vddch0-supply = <&vreg_l25a_3p3>;
> - max-speed = <3200000>;
You just added all these on other patch, no? Don't add code which is
knowingly incorrect or have to be immediately adjusted. Probably you
organized the patchset wrong and any sorting should be done earlier,
assuming that we want this sorting in the first place?
Best regards,
Krzysztof
© 2016 - 2025 Red Hat, Inc.