ath79: fix I2C on GL-AR300M devices

[openwrt/staging/chunkeey.git] / target / linux / ath79 / dts / qca9531_glinet_gl-ar300m.dtsi

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 617076b0746b9885457a8b35ae5d249f052ccc51..47fda91a0c787ebe01ed3b0b2bbf109b5db56df8 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -37,23 +37,33 @@
                };
        };
 
+       reg_usb_vbus: reg_usb_vbus {
+               compatible = "regulator-fixed";
+
+               regulator-name = "usb_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
        leds {
                compatible = "gpio-leds";
 
                // Colors for non-Lite versions
 
                led_status: status {
-                       label = "gl-ar300m:green:status";
+                       label = "green:status";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
-               led_lan: lan {
-                       label = "gl-ar300m:green:lan";
+               lan {
+                       label = "green:lan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan: wlan {
-                       label = "gl-ar300m:red:wlan";
+                       label = "red:wlan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -62,6 +72,9 @@
        i2c: i2c {
                compatible = "i2c-gpio";
 
+               pinctrl-names = "default";
+               pinctrl-0 = <&enable_gpio17>;
+
                sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
        };
@@ -74,8 +87,6 @@
 &spi {
        status = "okay";
 
-       num-cs = <2>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
@@ -133,13 +144,10 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &usb0 {
        #address-cells = <1>;
        #size-cells = <0>;
+       vbus-supply = <&reg_usb_vbus>;
        status = "okay";
 };
 
@@ -152,15 +160,33 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 };
 
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};
+
+&pinmux {
+       enable_gpio17: pinmux_enable_gpio17 {
+               pinctrl-single,bits = <0x10 0x0000 0xff00>;
+       };
+};