bmips: backport accepted pinctrl patches

[openwrt/staging/ldir.git] / target / linux / bmips / dts / bcm6358-huawei-hg556a-b.dts

diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
index ba776caf780ebeaa0f77ab7933331f33858bbc9b..9658e2abca7c8d6f93da60ac726bc447e319b636 100644 (file)
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
@@ -23,28 +23,28 @@
 
                help {
                        label = "help";
-                       gpios = <&pinctrl 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HELP>;
                        debounce-interval = <60>;
                };
 
                wlan {
                        label = "wlan";
-                       gpios = <&pinctrl 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WLAN>;
                        debounce-interval = <60>;
                };
 
                restart {
                        label = "restart";
-                       gpios = <&pinctrl 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                        debounce-interval = <60>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&pinctrl 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_CONFIG>;
                        debounce-interval = <60>;
                };
@@ -55,70 +55,85 @@
 
                led@0 {
                        label = "red:message";
-                       gpios = <&pinctrl 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                hspa_red: led@1 {
                        label = "red:hspa";
-                       gpios = <&pinctrl 1 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                dsl_red: led@2 {
                        label = "red:dsl";
-                       gpios = <&pinctrl 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                power_red: led@3 {
                        label = "red:power";
-                       gpios = <&pinctrl 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led@6 {
                        label = "all";
-                       gpios = <&pinctrl 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led@12 {
                        label = "green:lan1";
-                       gpios = <&pinctrl 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                led@13 {
                        label = "red:lan1";
-                       gpios = <&pinctrl 13 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led@15 {
                        label = "green:lan2";
-                       gpios = <&pinctrl 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led@22 {
                        label = "red:lan2";
-                       gpios = <&pinctrl 22 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                led@23 {
                        label = "green:lan3";
-                       gpios = <&pinctrl 23 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                led@26 {
                        label = "red:lan3";
-                       gpios = <&pinctrl 26 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                };
 
                led@27 {
                        label = "green:lan4";
-                       gpios = <&pinctrl 27 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
 
                led@28 {
                        label = "red:lan4";
-                       gpios = <&pinctrl 28 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
        };
+
+       ath9k-fixup {
+               compatible = "brcm,ath9k-fixup";
+               reg = <0x30000000 0x8000000>;
+
+               pci-dev = <1>;
+
+               mtd-mac-address = <&cfe 0x6a0>;
+               mtd-mac-address-increment = <1>;
+
+               ath,eeprom = <&cal_data 0x1e000>;
+               ath,endian-check;
+               ath,led-pin = <2>;
+               ath,led-active-high;
+       };
 };
 
 &ehci {
@@ -129,6 +144,10 @@
        status = "okay";
 };
 
+&pci {
+       status = "okay";
+};
+
 &pflash {
        status = "okay";