ARM: tegra: Sort nodes by unit-address, then alphabetically

[linux-2.6-block.git] / arch / arm / boot / dts / tegra124-apalis.dtsi

diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index d3f16c117b0ca2d2e34155bb2e70de395fc07972..554c8089491c95d323d26396cf6b096bb5893817 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -64,6 +64,24 @@
                vdd-supply = <&reg_vdd_gpu>;
        };
 
+       gpio@6000d000 {
+               /* I210 Gigabit Ethernet Controller Reset */
+               lan-reset-n-hog {
+                       gpio-hog;
+                       gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
+                       output-high;
+                       line-name = "LAN_RESET_N";
+               };
+
+               /* Control MXM3 pin 26 Reset Module Output Carrier Input */
+               reset-moci-ctrl-hog {
+                       gpio-hog;
+                       gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
+                       output-high;
+                       line-name = "RESET_MOCI_CTRL";
+               };
+       };
+
        pinmux@70000868 {
                pinctrl-names = "default";
                pinctrl-0 = <&state_default>;
@@ -1578,18 +1596,18 @@
                        pinctrl-0 = <&as3722_default>;
 
                        as3722_default: pinmux {
+                               gpio0-1-3-4-5-6 {
+                                       pins = "gpio0", "gpio1", "gpio3",
+                                              "gpio4", "gpio5", "gpio6";
+                                       bias-high-impedance;
+                               };
+
                                gpio2-7 {
                                        pins = "gpio2", /* PWR_EN_+V3.3 */
                                               "gpio7"; /* +V1.6_LPO */
                                        function = "gpio";
                                        bias-pull-up;
                                };
-
-                               gpio0-1-3-4-5-6 {
-                                       pins = "gpio0", "gpio1", "gpio3",
-                                              "gpio4", "gpio5", "gpio6";
-                                       bias-high-impedance;
-                               };
                        };
 
                        regulators {
@@ -1935,18 +1953,18 @@
                };
        };
 
-       clk32k_in: osc3 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-       };
-
        cpus {
                cpu@0 {
                        vdd-cpu-supply = <&reg_vdd_cpu>;
                };
        };
 
+       clk32k_in: osc3 {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <32768>;
+       };
+
        reg_1v05_avdd_hdmi_pll: regulator-1v05-avdd-hdmi-pll {
                compatible = "regulator-fixed";
                regulator-name = "+V1.05_AVDD_HDMI_PLL";
@@ -2048,21 +2066,3 @@
                };
        };
 };
-
-&gpio {
-       /* I210 Gigabit Ethernet Controller Reset */
-       lan-reset-n-hog {
-               gpio-hog;
-               gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "LAN_RESET_N";
-       };
-
-       /* Control MXM3 pin 26 Reset Module Output Carrier Input */
-       reset-moci-ctrl-hog {
-               gpio-hog;
-               gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "RESET_MOCI_CTRL";
-       };
-};