ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / BR-6475ND.dts

diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 11611b083f86e706016ca07f96dcab0d942e216a..f7fb8b5c40e90ca6cced5a96a6ff6124ce8a4e92 100644 (file)
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -9,10 +9,15 @@
        compatible = "edimax,br-6475nd", "ralink,rt3883-soc";
        model = "Edimax BR-6475nD";
 
        compatible = "edimax,br-6475nd", "ralink,rt3883-soc";
        model = "Edimax BR-6475nD";
 

-       gpio-keys-polled {
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
+       keys {

                compatible = "gpio-keys-polled";
                compatible = "gpio-keys-polled";

-               #address-cells = <1>;
-               #size-cells = <0>;

                poll-interval = <100>;
 
                reset {
                poll-interval = <100>;
 
                reset {


@@ -29,10 +34,10 @@
                };
        };
 
                };
        };
 

-       gpio-leds {
+       leds {

                compatible = "gpio-leds";
 
                compatible = "gpio-leds";
 

-               power {
+               led_power: power {

                        label = "br-6475nd:green:power";
                        gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };
                        label = "br-6475nd:green:power";
                        gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };


@@ -52,36 +57,41 @@
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;

-               #address-cells = <1>;
-               #size-cells = <1>;

 
 

-               partition@0 {
-                       reg = <0x00000000 0x00030000>;
-                       label = "u-boot";
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;

 
 

-               partition@30000 {
-                       reg = <0x00030000 0x00010000>;
-                       label = "nvram";
-                       read-only;
-               };
+                       partition@0 {
+                               reg = <0x00000000 0x00030000>;
+                               label = "u-boot";
+                               read-only;
+                       };

 
 

-               factory: partition@40000 {
-                       reg = <0x00040000 0x00010000>;
-                       label = "factory";
-                       read-only;
-               };
+                       partition@30000 {
+                               reg = <0x00030000 0x00010000>;
+                               label = "nvram";
+                               read-only;
+                       };

 
 

-               devdata: partition@50000 {
-                       reg = <0x00050000 0x00020000>;
-                       label = "devdata";
-                       read-only;
-               };
+                       factory: partition@40000 {
+                               reg = <0x00040000 0x00010000>;
+                               label = "factory";
+                               read-only;
+                       };

 
 

-               partition@70000 {
-                       reg = <0x00070000 0x00790000>;
-                       label = "firmware";
+                       devdata: partition@50000 {
+                               reg = <0x00050000 0x00020000>;
+                               label = "devdata";
+                               read-only;
+                       };
+
+                       partition@70000 {
+                               compatible = "edimax,uimage";
+                               reg = <0x00070000 0x00790000>;
+                               label = "firmware";
+                       };

                };
        };
 
                };
        };
 


@@ -92,9 +102,11 @@
                realtek,extif0 = <1 0 1 1 1 1 1 1 2>;
        };
 
                realtek,extif0 = <1 0 1 1 1 1 1 1 2>;
        };
 

-       /* Unclear if this is the correct gpio setup; the USB ports are
-          unpopulated on a stock BR-6475nD, even though the hardware exists
-          and the headers are there. */
+       /*
+        * Unclear if this is the correct gpio setup; the USB ports are
+        * unpopulated on a stock BR-6475nD, even though the hardware exists
+        * and the headers are there.
+        */

        /*
        gpio_export {
                compatible = "gpio-export";
        /*
        gpio_export {
                compatible = "gpio-export";


@@ -146,27 +158,16 @@
 
 &pci {
        status = "okay";
 
 &pci {
        status = "okay";

-       pinctrl-names = "default";
-       pinctrl-0 = <&pci_pins>;
-
-       pci_pins: pci {
-               pci {
-                       ralink,group = "pci";
-                       ralink,function = "pci-fnc";
-               };
-       };
+};

 
 

-       host-bridge {
-               pci-bridge@1 {
-                       status = "okay";
+&pci1 {
+       status = "okay";

 
 

-                       wifi@0,0 {
-                               compatible = "pci0,0";
-                               reg = <0x10000 0 0 0 0>;
-                               ralink,5ghz = <0>;
-                               ralink,mtd-eeprom = <&factory 0x8000>;
-                       };
-               };
+       wifi@0,0 {
+               compatible = "pci0,0";
+               reg = <0x10000 0 0 0 0>;
+               ralink,5ghz = <0>;
+               ralink,mtd-eeprom = <&factory 0x8000>;

        };
 };
 
        };
 };