bmips: dts: move leds dt-bindings include to SoCs

[openwrt/openwrt.git] / target / linux / bmips / dts / bcm6318-comtrend-ar-5315u.dts

diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
index ec50c3e07df5e582e5292bef52231956e26f2a70..c5d2182b78fa6b70c6ca2d549235475d38e7f0fc 100644 (file)
--- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
@@ -11,15 +11,11 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-internet = &led_internet_green;
-               led-usb = &led_usb_green;
        };
 
        keys {
                compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               poll-interval = <100>;
 
                wps {
                        label = "wps";
@@ -37,15 +33,15 @@
        };
 
        bcm43217-sprom {
-               compatible = "brcm,bcm43217-sprom";
+               compatible = "brcm,bcma-sprom";
 
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
+               brcm,sprom = "brcm/bcm43217-sprom.bin";
                brcm,sprom-fixups = <6 0x1c00>,
                                    <65 0x1255>,
                                    <97 0xfe55>,
@@ -67,7 +63,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -89,10 +85,22 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       cfe: partition@0 {
+                       partition@0 {
                                reg = <0x000000 0x010000>;
                                label = "cfe";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -120,50 +128,53 @@
        led@0 {
                reg = <0>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led_power_green: led@1 {
                reg = <1>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
-       led_usb_green: led@2 {
+       led@2 {
                reg = <2>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@4 {
+               /* EPHY0 Act */
                reg = <4>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <4>;
-               /* EPHY0 Act */
        };
 
        led@5 {
+               /* EPHY1 Act */
                reg = <5>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <5>;
-               /* EPHY1 Act */
        };
 
        led@6 {
+               /* EPHY2 Act */
                reg = <6>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <6>;
-               /* EPHY2 Act */
        };
 
        led@7 {
+               /* EPHY3 Act */
                reg = <7>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <7>;
-               /* EPHY3 Act */
        };
 
-       led_internet_green: led@8 {
+       led@8 {
                reg = <8>;
                active-low;
                label = "green:internet";
@@ -175,7 +186,7 @@
                label = "red:internet";
        };
 
-       led_dsl_green: led@10 {
+       led@10 {
                reg = <10>;
                active-low;
                label = "green:dsl";
@@ -184,7 +195,9 @@
        led_power_red: led@11 {
                reg = <11>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
+               panic-indicator;
        };
 };
 
@@ -213,6 +226,7 @@
                        label = "lan4";
 
                        phy-handle = <&phy1>;
+                       phy-mode = "mii";
                };
 
                port@1 {
@@ -220,6 +234,7 @@
                        label = "lan3";
 
                        phy-handle = <&phy2>;
+                       phy-mode = "mii";
                };
 
                port@2 {
@@ -227,6 +242,7 @@
                        label = "lan2";
 
                        phy-handle = <&phy3>;
+                       phy-mode = "mii";
                };
 
                port@3 {
@@ -234,6 +250,7 @@
                        label = "lan1";
 
                        phy-handle = <&phy4>;
+                       phy-mode = "mii";
                };
        };
 };
@@ -245,13 +262,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};