ramips: set usb led trigger via devicetree

[openwrt/staging/lynxis.git] / target / linux / ramips / dts / rt3883.dtsi

diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi
index a7143388e33bc67ae11bb0591ee634f2bb11813d..ce71c915c0255484968958020334f75bdc75133d 100644 (file)
--- a/target/linux/ramips/dts/rt3883.dtsi
+++ b/target/linux/ramips/dts/rt3883.dtsi
@@ -116,7 +116,7 @@
                        #gpio-cells = <2>;
 
                        ralink,gpio-base = <0>;
-                       ralink,num-gpios = <24>;
+                       ralink,nr-gpio = <24>;
                        ralink,register-map = [ 00 04 08 0c
                                                20 24 28 2c
                                                30 34 ];
@@ -130,7 +130,7 @@
                        #gpio-cells = <2>;
 
                        ralink,gpio-base = <24>;
-                       ralink,num-gpios = <16>;
+                       ralink,nr-gpio = <16>;
                        ralink,register-map = [ 00 04 08 0c
                                                10 14 18 1c
                                                20 24 ];
@@ -146,7 +146,7 @@
                        #gpio-cells = <2>;
 
                        ralink,gpio-base = <40>;
-                       ralink,num-gpios = <32>;
+                       ralink,nr-gpio = <32>;
                        ralink,register-map = [ 00 04 08 0c
                                                10 14 18 1c
                                                20 24 ];
@@ -162,7 +162,7 @@
                        #gpio-cells = <2>;
 
                        ralink,gpio-base = <72>;
-                       ralink,num-gpios = <24>;
+                       ralink,nr-gpio = <24>;
                        ralink,register-map = [ 00 04 08 0c
                                                10 14 18 1c
                                                20 24 ];
@@ -295,8 +295,8 @@
 
                spi_cs1: spi1 {
                        spi1 {
-                               ralink,group = "spi_cs1";
-                               ralink,function = "spi_cs1";
+                               ralink,group = "pci";
+                               ralink,function = "pci-func";
                        };
                };
 
@@ -306,6 +306,13 @@
                                ralink,function = "uartlite";
                        };
                };
+
+               pci_pins: pci {
+                       pci {
+                               ralink,group = "pci";
+                               ralink,function = "pci-host1";
+                       };
+               };
        };
 
        ethernet: ethernet@10100000 {
@@ -350,6 +357,9 @@
                #size-cells = <1>;
                ranges; /* direct mapping */
 
+               pinctrl-names = "default";
+               pinctrl-0 = <&pci_pins>;
+
                status = "disabled";
 
                pciintc: interrupt-controller {
@@ -361,7 +371,7 @@
                        interrupts = <4>;
                };
 
-               host-bridge {
+               pci@0 {
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
@@ -388,7 +398,7 @@
                                0x9000 0 0 4 &pciintc 19
                        >;
 
-                       pci-bridge@1 {
+                       pci1: pci@1 {
                                reg = <0x0800 0 0 0 0>;
                                device_type = "pci";
                                #interrupt-cells = <1>;
@@ -397,33 +407,28 @@
 
                                status = "disabled";
 
-                               ralink,pci-slot = <1>;
-
                                interrupt-map-mask = <0x0 0 0 0>;
                                interrupt-map = <0x0 0 0 0 &pciintc 20>;
+
+                               bus-range = <1 255>;
+                               ranges;
                        };
 
-                       pci-slot@17 {
+                       pci17: pci@11,0 {
                                reg = <0x8800 0 0 0 0>;
-                               device_type = "pci";
                                #interrupt-cells = <1>;
                                #address-cells = <3>;
                                #size-cells = <2>;
 
-                               ralink,pci-slot = <17>;
-
                                status = "disabled";
                        };
 
-                       pci-slot@18 {
+                       pci18: pci@12,0 {
                                reg = <0x9000 0 0 0 0>;
-                               device_type = "pci";
                                #interrupt-cells = <1>;
                                #address-cells = <3>;
                                #size-cells = <2>;
 
-                               ralink,pci-slot = <18>;
-
                                status = "disabled";
                        };
                };
@@ -451,6 +456,8 @@
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
@@ -461,9 +468,16 @@
                interrupts = <18>;
 
                status = "disabled";
+
+               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>;
 
@@ -474,5 +488,10 @@
                interrupts = <18>;
 
                status = "disabled";
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };