ipq806x: clean up dts files

[openwrt/staging/lynxis/omap.git] / target / linux / ipq806x / files / arch / arm / boot / dts / qcom-ipq8064-ea8500.dts

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 96e4acf1a8e51a8f8912341ec0bf795b8d279304..b5840e8717b674a5be42813793e0b440f6bf5693 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -39,20 +39,42 @@
 
        soc {
                pinmux@800000 {
+                       button_pins: button_pins {
+                               mux {
+                                       pins = "gpio65", "gpio67", "gpio68";
+                                       function = "gpio";
+                                       drive-strength = <2>;
+                                       bias-pull-up;
+                               };
+                       };
+
                        i2c4_pins: i2c4_pinmux {
-                               pins = "gpio12", "gpio13";
-                               function = "gsbi4";
-                               bias-disable;
+                               mux {
+                                       pins = "gpio12", "gpio13";
+                                       function = "gsbi4";
+                                       drive-strength = <12>;
+                                       bias-disable;
+                               };
                        };
 
-                       spi_pins: spi_pins {
+                       led_pins: led_pins {
                                mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       drive-strength = <10>;
-                                       bias-none;
+                                       pins = "gpio6", "gpio53", "gpio54";
+                                       function = "gpio";
+                                       drive-strength = <2>;
+                                       bias-pull-up;
                                };
                        };
+
+                       mdio0_pins: mdio0_pins {
+                               mux {
+                                       pins = "gpio0", "gpio1";
+                                       function = "gpio";
+                                       drive-strength = <8>;
+                                       bias-disable;
+                               };
+                       };
+
                        nand_pins: nand_pins {
                                mux {
                                        pins = "gpio34", "gpio35", "gpio36",
@@ -76,15 +98,6 @@
                                };
                        };
 
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "gpio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
                        rgmii2_pins: rgmii2_pins {
                                mux {
                                        pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
@@ -94,9 +107,6 @@
                                        bias-disable;
                                };
                        };
-                       
-                       
-                       
                };
 
                gsbi@16300000 {
@@ -207,7 +217,7 @@
                                reg = <0x0660000 0x0120000>;
                                read-only;
                        };
-                       
+
                        TZ@780000 {
                                label = "TZ";
                                reg = <0x0780000 0x0280000>;
@@ -231,54 +241,53 @@
                                reg = <0x0dc0000 0x0100000>;
                                read-only;
                        };
-                       
+
                        u_env@ec0000 {
                                label = "u_env";
                                reg = <0x0ec0000 0x0040000>;
                        };
-                       
+
                        s_env@f00000 {
                                label = "s_env";
                                reg = <0x0f00000 0x0040000>;
                        };
-                       
+
                        devinfo@f40000 {
                                label = "devinfo";
                                reg = <0x0f40000 0x0040000>;
                        };
-                       
+
                        linux@f80000 { 
                                label = "kernel1";
                                reg = <0x0f80000 0x2800000>;  /* 3 MB spill to rootfs*/
                        };
-                       
+
                        rootfs@1280000 {
                                label = "rootfs1";
                                reg = <0x1280000 0x2500000>;
                        };
-                       
+
                        linux2@3780000 {
                                label = "kernel2";
                                reg = <0x3780000 0x2800000>;
                        };
-                       
+
                        rootfs2@3a80000 {
                                label = "rootfs2";
                                reg = <0x3a80000 0x2500000>;
                        };
-                       
+
                        syscfg@5f80000 {
                                label = "syscfg";
                                reg = <0x5f80000 0x2080000>;
                        };
-
                };
 
                mdio0: mdio {
                        compatible = "virtual,mdio-gpio";
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
+                       gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
                        pinctrl-0 = <&mdio0_pins>;
                        pinctrl-names = "default";
 
@@ -332,17 +341,23 @@
                        };
                };
 
+               rpm@108000 {
+                       pinctrl-0 = <&i2c4_pins>;
+                       pinctrl-names = "default";
+               };
+
                adm_dma: dma@18300000 {
                        status = "ok";
                };
-
        };
 
        gpio-keys {
                compatible = "gpio-keys";
+               pinctrl-0 = <&button_pins>;
+               pinctrl-names = "default";
 
-               rfkill {
-                       label = "rfkill"; /* WIFI on-off*/
+               wifi {
+                       label = "wifi";
                        gpios = <&qcom_pinmux 67 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
@@ -358,29 +373,27 @@
                        gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
-
        };
 
        gpio-leds {
                compatible = "gpio-leds";
+               pinctrl-0 = <&led_pins>;
+               pinctrl-names = "default";
 
                wps {
                        label = "ea8500:green:wps";
-                       gpios = <&qcom_pinmux 53 0>;
-                       default-state = "off";
+                       gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                };
 
                power: power {
                        label = "ea8500:white:power";
-                       gpios = <&qcom_pinmux 6 1>;
-                       default-state = "off";
-                       linux,default-trigger = "heartbeat";
+                       gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
+                       default-state = "keep";
                };
 
                wifi {
                        label = "ea8500:green:wifi";
-                       gpios = <&qcom_pinmux 54 0>;
-                       default-state = "off";
+                       gpios = <&qcom_pinmux 54 GPIO_ACTIVE_HIGH>;
                };
        };
 };