lantiq: allow pcie to be disabled by dts + vgv7519 fix pci irq + disable pcie by dts

[openwrt/openwrt.git] / target / linux / lantiq / dts / VGV7519.dtsi

diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 83adda9e8204549d75b9ae4a665eab5bb58c1087..e67c07f417cfa5f025eec5259ce4842ce9ea7a99 100644 (file)
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -43,7 +43,7 @@
                                        lantiq,function = "stp";
                                };
                                spi {
-                                       lantiq,groups = "spi", "spi_cs4";
+                                       lantiq,groups = "spi";
                                        lantiq,function = "spi";
                                };
                                mdio {
@@ -55,11 +55,15 @@
                                        lantiq,pull = <0>;
                                        lantiq,output = <1>;
                                };
-                               conf_out {
-                                       lantiq,pins = "io4", "io5", "io6", /* stp */
-                                                       "io21",
-                                                       "io33";
-                                       lantiq,open-drain;
+                               stp_out {
+                                       lantiq,pins = "io4", "io5", "io6";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,output = <1>;
+                                       lantiq,pull = <0>;
+                               };
+                               pci-rst {
+                                       lantiq,pins = "io21";
+                                       lantiq,open-drain = <0>;
                                        lantiq,pull = <0>;
                                        lantiq,output = <1>;
                                };
@@ -67,6 +71,8 @@
                                        lantiq,groups = "gphy0 led1", "gphy1 led0";
                                        lantiq,function = "gphy";
                                        lantiq,open-drain = <0>;
+                                       lantiq,pull = <0>;
+                                       lantiq,output = <1>;
                                };
                        };
                };
@@ -184,10 +190,11 @@
                };
 
                pci@E105400 {
+                       status = "okay";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
-                       compatible = "lantiq,pci-xway1";
+                       compatible = "lantiq,pci-xway";
                        bus-range = <0x0 0x0>;
                        ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
                                0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
@@ -199,11 +206,15 @@
                        lantiq,delay-lo = <0>; /* 0.0ns delay */
                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                        interrupt-map = <
-                               0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
+                               0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
                                >;
-                       gpios-reset = <&gpio 21 0>;
+                       gpio-reset = <&gpio 21 0>;
                        req-mask = <0x1>;       /* GNT1 */
                };
+
+               pcie@d900000 {
+                       status = "disabled";
+               };
        };
 
        gphy-xrx200 {
@@ -212,6 +223,11 @@
                phys = [ 00 01 ];
        };
 
+       ralink_eep {
+               compatible = "ralink,eeprom";
+               ralink,eeprom = "RT2860.eeprom";
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;