arm64: dts: msm8916-samsung/longcheer: Move pinctrl/regulators to end of file

It is helpful to be able to see all hardware components in one part
of the device tree, without having to scroll over the large amount
of regulator/pinctrl nodes. Keep those separated at the end of the file
to make navigation a bit easier.

This also makes it consistent with the order used in apq8016-sbc.dtsi.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200622151751.408995-2-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index d5230cb76eb12d43e1d4077e970d42adb89f56bb..ed105e06c3fc6bdc9a92deee140c974b98d7a416 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -108,31 +108,6 @@
        };
 };
 
-&msmgpio {
-       gpio_keys_default: gpio-keys-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio107";
-               };
-               pinconf {
-                       pins = "gpio107";
-                       drive-strength = <2>;
-                       bias-pull-up;
-               };
-       };
-
-       usb_vbus_default: usb-vbus-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio62";
-               };
-               pinconf {
-                       pins = "gpio62";
-                       bias-pull-up;
-               };
-       };
-};
-
 &spmi_bus {
        pm8916@0 {
                pon@800 {
@@ -258,3 +233,28 @@
                regulator-max-microvolt = <2700000>;
        };
 };
+
+&msmgpio {
+       gpio_keys_default: gpio-keys-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio107";
+               };
+               pinconf {
+                       pins = "gpio107";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       usb_vbus_default: usb-vbus-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio62";
+               };
+               pinconf {
+                       pins = "gpio62";
+                       bias-pull-up;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index ea52adf07a4b4589b4b8526d825991418fcd4c97..b20c1013612f0c9afb57d28f2f9aa962a86e01d1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -167,77 +167,14 @@
        };
 };
 
-&msmgpio {
-       gpio_keys_default: gpio-keys-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio107", "gpio109";
-               };
-               pinconf {
-                       pins = "gpio107", "gpio109";
-                       drive-strength = <2>;
-                       bias-pull-up;
-               };
-       };
-
-       gpio_hall_sensor_default: gpio-hall-sensor-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio52";
-               };
-               pinconf {
-                       pins = "gpio52";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       muic_int_default: muic-int-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio12";
-               };
-               pinconf {
-                       pins = "gpio12";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       tsp_en_default: tsp-en-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio73";
-               };
-               pinconf {
-                       pins = "gpio73";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       pmx-mdss {
-               mdss_default: mdss-default {
-                       pinmux {
-                               function = "gpio";
-                               pins = "gpio25";
-                       };
-                       pinconf {
-                               pins = "gpio25";
-                               drive-strength = <8>;
-                               bias-disable;
-                       };
-               };
-
-               mdss_sleep: mdss-sleep {
-                       pinmux {
-                               function = "gpio";
-                               pins = "gpio25";
-                       };
-                       pinconf {
-                               pins = "gpio25";
-                               drive-strength = <2>;
-                               bias-pull-down;
+&spmi_bus {
+       pm8916@0 {
+               pon@800 {
+                       volume-down {
+                               compatible = "qcom,pm8941-resin";
+                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
+                               bias-pull-up;
+                               linux,code = <KEY_VOLUMEDOWN>;
                        };
                };
        };
@@ -356,15 +293,78 @@
        };
 };
 
-&spmi_bus {
-       pm8916@0 {
-               pon@800 {
-                       volume-down {
-                               compatible = "qcom,pm8941-resin";
-                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-                               bias-pull-up;
-                               linux,code = <KEY_VOLUMEDOWN>;
+&msmgpio {
+       gpio_keys_default: gpio-keys-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio107", "gpio109";
+               };
+               pinconf {
+                       pins = "gpio107", "gpio109";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       gpio_hall_sensor_default: gpio-hall-sensor-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio52";
+               };
+               pinconf {
+                       pins = "gpio52";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+       };
+
+       mdss {
+               mdss_default: mdss-default {
+                       pinmux {
+                               function = "gpio";
+                               pins = "gpio25";
+                       };
+                       pinconf {
+                               pins = "gpio25";
+                               drive-strength = <8>;
+                               bias-disable;
+                       };
+               };
+
+               mdss_sleep: mdss-sleep {
+                       pinmux {
+                               function = "gpio";
+                               pins = "gpio25";
                        };
+                       pinconf {
+                               pins = "gpio25";
+                               drive-strength = <2>;
+                               bias-pull-down;
+                       };
+               };
+       };
+
+       muic_int_default: muic-int-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio12";
+               };
+               pinconf {
+                       pins = "gpio12";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+       };
+
+       tsp_en_default: tsp-en-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio73";
+               };
+               pinconf {
+                       pins = "gpio73";
+                       drive-strength = <2>;
+                       bias-disable;
                };
        };
 };