ramips: dts: Unify naming of gpio-keys nodes

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7628an.dtsi

diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi
index 6d5ed95e49715aa9daffbeeb87e345238a4131d1..91f715c2457a7301f8565c103656dc068e11e9bd 100644 (file)
--- a/target/linux/ramips/dts/mt7628an.dtsi
+++ b/target/linux/ramips/dts/mt7628an.dtsi
@@ -1,11 +1,15 @@
 / {
        #address-cells = <1>;
        #size-cells = <1>;
-       compatible = "ralink,mtk7628an-soc";
+       compatible = "mediatek,mt7628an-soc";
 
        cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                cpu@0 {
                        compatible = "mips,mips24KEc";
+                       reg = <0>;
                };
        };
 
@@ -17,7 +21,7 @@
                serial0 = &uartlite;
        };
 
-       cpuintc: cpuintc@0 {
+       cpuintc: cpuintc {
                #address-cells = <0>;
                #interrupt-cells = <1>;
                interrupt-controller;
@@ -33,13 +37,13 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,mt7620a-sysc";
+                       compatible = "ralink,mt7620a-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
-               watchdog: watchdog@120 {
-                       compatible = "ralink,mt7628an-wdt", "mtk,mt7621-wdt";
-                       reg = <0x120 0x10>;
+               watchdog: watchdog@100 {
+                       compatible = "ralink,mt7628an-wdt", "mediatek,mt7621-wdt";
+                       reg = <0x100 0x30>;
 
                        resets = <&rstctrl 8>;
                        reset-names = "wdt";
@@ -110,7 +114,7 @@
                };
 
                i2c: i2c@900 {
-                       compatible = "mediatek,mt7628-i2c";
+                       compatible = "mediatek,mt7621-i2c";
                        reg = <0x900 0x100>;
 
                        resets = <&rstctrl 16>;
@@ -126,7 +130,7 @@
                };
 
                i2s: i2s@a00 {
-                       compatible = "ralink,mt7620a-i2s";
+                       compatible = "mediatek,mt7628-i2s";
                        reg = <0xa00 0x100>;
 
                        resets = <&rstctrl 17>;
@@ -135,8 +139,11 @@
                        interrupt-parent = <&intc>;
                        interrupts = <10>;
 
-                       dmas = <&gdma 2>,
-                               <&gdma 3>;
+                       txdma-req = <2>;
+                       rxdma-req = <3>;
+
+                       dmas = <&gdma 4>,
+                               <&gdma 6>;
                        dma-names = "tx", "rx";
 
                        status = "disabled";
@@ -274,8 +281,8 @@
                state_default: pinctrl0 {
                };
 
-               spi_pins: spi {
-                       spi {
+               spi_pins: spi_pins {
+                       spi_pins {
                                ralink,group = "spi";
                                ralink,function = "spi";
                        };
@@ -288,13 +295,20 @@
                        };
                };
 
-               i2c_pins: i2c {
-                       i2c {
+               i2c_pins: i2c_pins {
+                       i2c_pins {
                                ralink,group = "i2c";
                                ralink,function = "i2c";
                        };
                };
 
+               i2s_pins: i2s {
+                       i2s {
+                               ralink,group = "i2s";
+                               ralink,function = "i2s";
+                       };
+               };
+
                uart0_pins: uartlite {
                        uartlite {
                                ralink,group = "uart0";
@@ -337,12 +351,19 @@
                        };
                };
 
-               pcm_i2s_pins: i2s {
-                       i2s {
+               pcm_i2s_pins: pcm_i2s {
+                       pcm_i2s {
                                ralink,group = "i2s";
                                ralink,function = "pcm";
                        };
                };
+
+               refclk_pins: refclk {
+                       refclk {
+                               ralink,group = "refclk";
+                               ralink,function = "refclk";
+                       };
+               };
        };
 
        rstctrl: rstctrl {
@@ -356,10 +377,11 @@
        };
 
        usbphy: usbphy@10120000 {
-               compatible = "ralink,mt7628an-usbphy", "mediatek,mt7620-usbphy";
-               reg = <0x10120000 0x4000>;
-               #phy-cells = <1>;
+               compatible = "mediatek,mt7628-usbphy", "mediatek,mt7620-usbphy";
+               reg = <0x10120000 0x1000>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
                clocks = <&clkctrl 22 &clkctrl 25>;
@@ -380,25 +402,39 @@
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
+
+               ehci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        ohci: ohci@101c1000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        ethernet: ethernet@10100000 {
@@ -451,13 +487,15 @@
                        0x01000000 0 0x00000000 0x10160000 0 0x00010000 /* io space */
                >;
 
-               pcie-bridge {
+               pcie0: pcie@0,0 {
                        reg = <0x0000 0 0 0 0>;
 
                        #address-cells = <3>;
                        #size-cells = <2>;
 
                        device_type = "pci";
+
+                       ranges;
                };
        };
 
@@ -471,6 +509,5 @@
                status = "disabled";
 
                mediatek,mtd-eeprom = <&factory 0x0000>;
-               mediatek,5ghz = <0>;
        };
 };