lantiq: ltq-tapi: fix compatibility with Linux 4.15+

[openwrt/staging/lynxis.git] / target / linux / lantiq / files-4.14 / arch / mips / boot / dts / ARV4520PW.dts

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
index 05e0dfe048cf3c07ed475d793b59013636ecbdd9..cd76bf579968002744b51761da2f435ddf7930c4 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
@@ -16,10 +16,11 @@
                led-boot = &power_blue;
                led-failsafe = &power_red;
                led-running = &power_blue;
+               led-upgrade = &power_blue;
 
                led-dsl = &dsl;
                led-internet = &internet_blue;
-               led-usb = &usb;
+               led-usb = &led_usb;
                led-wifi = &wifi;
        };
 
@@ -27,112 +28,6 @@
                reg = <0x0 0x2000000>;
        };
 
-       sram@1F000000 {
-               vmmc@107000 {
-                       status = "okay";
-                       gpios = <&gpio 31 GPIO_ACTIVE_HIGH
-                               &gpiomm 7 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       fpi@10000000 {
-               localbus@0 {
-                       nor-boot@0 {
-                               compatible = "lantiq,nor";
-                               bank-width = <2>;
-                               reg = <0 0x0 0x800000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "uboot";
-                                               reg = <0x00000 0x20000>;
-                                               read-only;
-                                       };
-
-                                       partition@20000 {
-                                               label = "uboot_env";
-                                               reg = <0x20000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       partition@30000 {
-                                               label = "firmware";
-                                               reg = <0x30000 0x3c0000>;
-                                       };
-
-                                       boardconfig: partition@7f0000 {
-                                               label = "boardconfig";
-                                               reg = <0x3f0000 0x10000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-
-                       gpiomm: gpiomm@4000000 {
-                               compatible = "lantiq,gpio-mm";
-                               reg = <1 0x0 0x10 >;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               lantiq,shadow = <0x400>;
-                       };
-               };
-
-               gpio: pinmux@E100B10 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&state_default>;
-
-                       state_default: pinmux {
-                               ebu {
-                                       lantiq,groups = "ebu cs1";
-                                       lantiq,function = "ebu";
-                               };
-                               pci_in {
-                                       lantiq,groups = "req1";
-                                       lantiq,function = "pci";
-                                       lantiq,open-drain = <1>;
-                                       lantiq,pull = <2>;
-                                       lantiq,output = <0>;
-                               };
-                               pci_out {
-                                       lantiq,groups = "gnt1";
-                                       lantiq,function = "pci";
-                                       lantiq,output = <1>;
-                               };
-                               pci_rst {
-                                       lantiq,pins = "io21";
-                                       lantiq,open-drain = <0>;
-                                       lantiq,pull = <0>;
-                               };
-                       };
-               };
-
-               etop@E180000 {
-                       phy-mode = "rmii";
-                       mtd-mac-address = <&boardconfig 0x16>;
-               };
-
-               ifxhcd@E101000 {
-                       status = "okay";
-                       gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
-               };
-
-               pci@E105400 {
-                       status = "okay";
-                       lantiq,external-clock;
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-// gpiomm 10 - switch
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
@@ -202,7 +97,7 @@
                        label = "arv4520pw:blue:sprache";
                        gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
                };
-               usb: usb {
+               led_usb: usb {
                        label = "arv4520pw:blue:usb";
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
@@ -218,4 +113,116 @@
                        info is missing
                */
        };
+
+       usb_vbus: regulator-usb-vbus {
+               compatible = "regulator-fixed";
+
+               regulator-name = "USB_VBUS";
+
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+
+               gpio = <&gpio 28 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+};
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               ebu {
+                       lantiq,groups = "ebu cs1";
+                       lantiq,function = "ebu";
+               };
+               pci_in {
+                       lantiq,groups = "req1";
+                       lantiq,function = "pci";
+                       lantiq,open-drain = <1>;
+                       lantiq,pull = <2>;
+                       lantiq,output = <0>;
+               };
+               pci_out {
+                       lantiq,groups = "gnt1";
+                       lantiq,function = "pci";
+                       lantiq,output = <1>;
+               };
+               pci_rst {
+                       lantiq,pins = "io21";
+                       lantiq,open-drain = <0>;
+                       lantiq,pull = <0>;
+               };
+       };
+};
+
+&gpiomm {
+       status = "okay";
+       lantiq,shadow = <0x400>;
+};
+
+&gsw {
+       /* gpiomm 10 - switch */
+       phy-mode = "rmii";
+       mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+       nor@0 {
+               compatible = "lantiq,nor";
+               bank-width = <2>;
+               reg = <0 0x0 0x800000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x20000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "uboot_env";
+                               reg = <0x20000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "firmware";
+                               reg = <0x30000 0x3c0000>;
+                       };
+
+                       boardconfig: partition@7f0000 {
+                               label = "boardconfig";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pci0 {
+       status = "okay";
+       lantiq,external-clock;
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&usb {
+       status = "okay";
+       vbus-supply = <&usb_vbus>;
+};
+
+&vmmc {
+       status = "okay";
+       gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+               &gpiomm 7 GPIO_ACTIVE_HIGH>;
 };