ramips: enable R6120 USB power

[openwrt/openwrt.git] / target / linux / ramips / dts / R6120.dts

diff --git a/target/linux/ramips/dts/R6120.dts b/target/linux/ramips/dts/R6120.dts
index 1b9795885ab79a1acfcba0308d933a01963174ba..d263c7824be7b59f2bb30f624519dda01446ca8e 100644 (file)
--- a/target/linux/ramips/dts/R6120.dts
+++ b/target/linux/ramips/dts/R6120.dts
@@ -55,23 +55,36 @@
                        gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
                };
 
-               wlan5 {
-                       label = "r6120:green:wlan5g";
+               wan {
+                       label = "r6120:green:wan";
                        gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                };
 
-               wlan5_orange {
-                       label = "r6120:orange:wlan5g";
+               wan_orange {
+                       label = "r6120:orange:wan";
                        gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
                };
        };
+
+       usb-regulator {
+               compatible = "regulator-fixed";
+
+               regulator-name = "USB-power";
+               gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+
+               regulator-always-on;
+       };
 };
 
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
                        ralink,group = "p0led_an", "p1led_an", "p2led_an",
-                                      "p3led_an", "p4led_an", "wdt", "wled_an";
+                                      "p3led_an", "p4led_an", "wdt",
+                                      "wled_an", "uart1";
                        ralink,function = "gpio";
                };
        };
@@ -84,7 +97,6 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
-               m25p,chunked-io = <32>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -103,7 +115,7 @@
                                read-only;
                        };
 
-                       nvram: partition@60000 {
+                       partition@60000 {
                                label = "nvram";
                                reg = <0x60000 0x30000>;
                                read-only;
@@ -126,12 +138,12 @@
 
 &wmac {
        status = "okay";
-       mtd-mac-address = <&nvram 0x100b0>;
-       mediatek,mtd-eeprom = <&factory 0x20000>;
+       mtd-mac-address = <&factory 0x4>;
+       mediatek,mtd-eeprom = <&factory 0x0>;
 };
 
 &ethernet {
-       mtd-mac-address = <&nvram 0x100b0>;
+       mtd-mac-address = <&factory 0x4>;
 };
 
 &pcie {
@@ -141,9 +153,9 @@
 &pcie0 {
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x28000>;
+               mediatek,mtd-eeprom = <&factory 0x8000>;
                ieee80211-freq-limit = <5000000 6000000>;
-               mtd-mac-address = <&nvram 0x100b0>;
+               mtd-mac-address = <&factory 0x4>;
                mtd-mac-address-increment = <(2)>;
        };
 };