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 df2ed37c9a1c7ecbeab970fa42db36440a038102..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;
@@ -37,9 +41,9 @@
                        reg = <0x0 0x100>;
                };
 
-               watchdog: watchdog@120 {
+               watchdog: watchdog@100 {
                        compatible = "ralink,mt7628an-wdt", "mediatek,mt7621-wdt";
-                       reg = <0x120 0x10>;
+                       reg = <0x100 0x30>;
 
                        resets = <&rstctrl 8>;
                        reset-names = "wdt";
@@ -277,8 +281,8 @@
                state_default: pinctrl0 {
                };
 
-               spi_pins: spi {
-                       spi {
+               spi_pins: spi_pins {
+                       spi_pins {
                                ralink,group = "spi";
                                ralink,function = "spi";
                        };
@@ -291,8 +295,8 @@
                        };
                };
 
-               i2c_pins: i2c {
-                       i2c {
+               i2c_pins: i2c_pins {
+                       i2c_pins {
                                ralink,group = "i2c";
                                ralink,function = "i2c";
                        };
@@ -398,6 +402,8 @@
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
@@ -406,9 +412,16 @@
 
                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>;
 
@@ -417,6 +430,11 @@
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        ethernet: ethernet@10100000 {
@@ -469,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;
                };
        };