ramips: fix size-cells for spi nodes

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

diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index 37b65600ef8fbc6e8496baa6d63b73d53e9bdb6e..026e7458d3b6fb75c2b5ab10dee50e4e08e4ec99 100644 (file)
--- a/target/linux/ramips/dts/mt7620a.dtsi
+++ b/target/linux/ramips/dts/mt7620a.dtsi
@@ -23,7 +23,7 @@
        palmbus@10000000 {
                compatible = "palmbus";
                reg = <0x10000000 0x200000>;
-                ranges = <0x0 0x10000000 0x1FFFFF>;
+               ranges = <0x0 0x10000000 0x1FFFFF>;
 
                #address-cells = <1>;
                #size-cells = <1>;
@@ -210,7 +210,7 @@
                        reset-names = "spi";
 
                        #address-cells = <1>;
-                       #size-cells = <1>;
+                       #size-cells = <0>;
 
                        status = "disabled";
 
@@ -280,68 +280,86 @@
                compatible = "ralink,rt2880-pinmux";
                pinctrl-names = "default";
                pinctrl-0 = <&state_default>;
+
                state_default: pinctrl0 {
                };
+
                pcm_i2s_pins: pcm_i2s {
                        pcm_i2s {
                                ralink,group = "uartf";
                                ralink,function = "pcm i2s";
                        };
                };
+
                uartf_gpio_pins: uartf_gpio {
                        uartf_gpio {
                                ralink,group = "uartf";
                                ralink,function = "gpio uartf";
                        };
                };
+
                spi_pins: spi {
                        spi {
                                ralink,group = "spi";
                                ralink,function = "spi";
                        };
                };
+
                i2c_pins: i2c {
                        i2c {
-                               lantiq,group = "i2c";
-                               lantiq,function = "i2c";
+                               ralink,group = "i2c";
+                               ralink,function = "i2c";
                        };
                };
+
                uartlite_pins: uartlite {
                        uart {
                                ralink,group = "uartlite";
                                ralink,function = "uartlite";
                        };
                };
+
                mdio_pins: mdio {
                        mdio {
                                ralink,group = "mdio";
                                ralink,function = "mdio";
                        };
                };
+
                ephy_pins: ephy {
                        ephy {
                                ralink,group = "ephy";
                                ralink,function = "ephy";
                        };
                };
+
                wled_pins: wled {
                        wled {
                                ralink,group = "wled";
                                ralink,function = "wled";
                        };
                };
+
                rgmii1_pins: rgmii1 {
                        rgmii1 {
                                ralink,group = "rgmii1";
                                ralink,function = "rgmii1";
                        };
                };
+
                rgmii2_pins: rgmii2 {
                        rgmii2 {
                                ralink,group = "rgmii2";
                                ralink,function = "rgmii2";
                        };
                };
+
+               pcie_pins: pcie {
+                       pcie {
+                               ralink,group = "pcie";
+                               ralink,function = "pcie rst";
+                       };
+               };
        };
 
        rstctrl: rstctrl {
@@ -349,8 +367,9 @@
                #reset-cells = <1>;
        };
 
-       usbphy {
+       usbphy: usbphy {
                compatible = "ralink,mt7620a-usbphy";
+               #phy-cells = <1>;
 
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
@@ -395,12 +414,15 @@
                compatible = "ralink,mt7620a-gsw";
                reg = <0x10110000 8000>;
 
+               resets = <&rstctrl 23>;
+               reset-names = "esw";
+
                interrupt-parent = <&intc>;
                interrupts = <17>;
        };
 
        sdhci@10130000 {
-               compatible = "ralink,mt7620a-sdhci";
+               compatible = "ralink,mt7620-sdhci";
                reg = <0x10130000 4000>;
 
                interrupt-parent = <&intc>;
@@ -416,6 +438,9 @@
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
+               phys = <&usbphy 1>;
+               phy-names = "usb";
+
                status = "disabled";
        };
 
@@ -426,6 +451,9 @@
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
+               phys = <&usbphy 1>;
+               phy-names = "usb";
+
                status = "disabled";
        };
 
@@ -443,6 +471,17 @@
                interrupt-parent = <&cpuintc>;
                interrupts = <4>;
 
+               pinctrl-names = "default";
+               pinctrl-0 = <&pcie_pins>;
+
+               device_type = "pci";
+
+               bus-range = <0 255>;
+               ranges = <
+                       0x02000000 0 0x00000000 0x20000000 0 0x10000000 /* pci memory */
+                       0x01000000 0 0x00000000 0x10160000 0 0x00010000 /* io space */
+               >;
+
                status = "disabled";
 
                pcie-bridge {