arm64: dts: qcom: msm8916-pins: move sdhc2 cd node with its siblings

Nodes relative to the first sdhc node were interlaced with node of the
second sdhc. Move sdhc2_cd_pin with its siblings to prevent that. Also
rename the grouping node from sdhc2_cd_pin to pmx_sdc2_cd_pin, as
"pmx_sdc" is the prefix used by other nodes.

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index 98f7404..68fb589 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -342,31 +342,6 @@
                };
        };
 
-       sdhc2_cd_pin {
-               sdc2_cd_on: cd_on {
-                       pinmux {
-                               function = "gpio";
-                               pins = "gpio38";
-                       };
-                       pinconf {
-                               pins = "gpio38";
-                               drive-strength = <2>;
-                               bias-pull-up;
-                       };
-               };
-               sdc2_cd_off: cd_off {
-                       pinmux {
-                               function = "gpio";
-                               pins = "gpio38";
-                       };
-                       pinconf {
-                               pins = "gpio38";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-               };
-       };
-
        pmx_sdc1_clk {
                sdc1_clk_on: clk_on {
                        pinmux {
@@ -505,6 +480,31 @@
                };
        };
 
+       pmx_sdc2_cd_pin {
+               sdc2_cd_on: cd_on {
+                       pinmux {
+                               function = "gpio";
+                               pins = "gpio38";
+                       };
+                       pinconf {
+                               pins = "gpio38";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+               };
+               sdc2_cd_off: cd_off {
+                       pinmux {
+                               function = "gpio";
+                               pins = "gpio38";
+                       };
+                       pinconf {
+                               pins = "gpio38";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+               };
+       };
+
        cdc-pdm-lines {
                cdc_pdm_lines_act: pdm_lines_on {
                        pinmux {