ath79: define CONFIG_MFD_RB4XX_CPLD to fix build breakage

[oweals/openwrt.git] / target / linux / ath79 / dts / ar9344_pcs_cr5000.dts

diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index 0d38a3557eb2f311cd4ceaaef773a55767640af5..a43ac4e93577d07a849404824e85b49e0ccafa44 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -12,17 +12,17 @@
 
        aliases {
                serial0 = &uart;
-               led-status = &status;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
-
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+               compatible = "gpio-keys";
+
                pinctrl-names = "default";
-                pinctrl-0 = <&jtag_disable_pins>;
+               pinctrl-0 = <&jtag_disable_pins>;
 
                reset {
                        label = "Reset button";
@@ -42,7 +42,7 @@
        leds {
                compatible = "gpio-leds";
 
-               status: power {
+               led_power: power {
                        label = "pcs:amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>,
                                <&gpio 4 GPIO_ACTIVE_LOW>;
@@ -52,17 +52,14 @@
                wlan2g {
                        label = "pcs:blue:wlan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        linux,default-trigger = "phy0tpt";
                };
 
                wps_white {
                        label = "pcs:white:wps";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
        };
-
 };
 
 &ref {
@@ -78,13 +75,11 @@
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <25000000>;
@@ -107,6 +102,7 @@
                        };
 
                        partition@50000 {
+                               compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x050000 0x07a0000>;
                        };
@@ -122,17 +118,13 @@
 
 &usb {
        status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-       port@1 {
+       hub_port1: port@1 {
                reg = <1>;
                #trigger-source-cells = <0>;
-
-               hub_port1: port@1 {
-                       reg = <1>;
-                       #trigger-source-cells = <0>;
-               };
        };
-
 };
 
 &usb_phy {
@@ -142,12 +134,13 @@
 &pcie {
        status = "okay";
 
-        ath9k: wifi@168c,0030 {
-               compatible = "168c,0030";
+       ath9k: wifi@0,0 {
+               compatible = "pci168c,0030";
+               reg = <0x0000 0 0 0 0>;
                mtd-mac-address = <&art 0x5002>;
                #gpio-cells = <2>;
                gpio-controller;
-        };
+       };
 };
 
 &mdio0 {
@@ -158,7 +151,7 @@
        phy0: ethernet-phy@0 {
                reg = <0>;
                phy-mode = "rgmii";
-                qca,ar8327-initvals = <
+               qca,ar8327-initvals = <
                        0x04 0x07600000 /* PORT0 PAD MODE CTRL */
                        0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcc35cc35 /* LED_CTRL0 */
@@ -171,6 +164,8 @@
 };
 
 &eth0 {
+       #address-cells = <1>;
+       #size-cells = <0>;
        status = "okay";
 
        /* default for ar934x, except for 1000M */
@@ -181,46 +176,48 @@
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 
-
        aliases {
                ag0 = &eth1;
        };
 
        port@0 {
                compatible = "swconfig,port";
+               reg = <0>;
                swconfig,segment = "lan";
                swconfig,portmap = <1 1>;
        };
 
        port@1 {
                compatible = "swconfig,port";
+               reg = <1>;
                swconfig,segment = "lan";
                swconfig,portmap = <2 2>;
        };
 
        port@2 {
                compatible = "swconfig,port";
+               reg = <2>;
                swconfig,segment = "lan";
                swconfig,portmap = <3 3>;
        };
 
        port@3 {
                compatible = "swconfig,port";
+               reg = <3>;
                swconfig,segment = "lan";
                swconfig,portmap = <4 4>;
        };
 
        port@4 {
                compatible = "swconfig,port";
+               reg = <4>;
                swconfig,segment = "wan";
                swconfig,portmap = <5 5>;
        };
-
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };