lantiq: dts: assign the PCI pins to the PCI controller node

[openwrt/openwrt.git] / target / linux / lantiq / files / arch / mips / boot / dts / FRITZ7312.dts

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
index ecc4a133444d97c6e4ad7990479e839fa4a1bcb9..aa825abd9f04d3a9247be1c0690b1a36d19c299d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
@@ -18,8 +18,7 @@
                led-running = &power;
                led-upgrade = &power;
 
-               led-internet = &info_green;
-               led-dsl = &power;
+               led-dsl = &info_green;
                led-wifi = &wlan;
        };
 
@@ -28,10 +27,8 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                wlan {
@@ -46,7 +43,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power: power {
@@ -78,21 +75,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               pci {
-                       lantiq,groups = "gnt1", "req1", "req2", "req4", "gnt2", "gnt3", "gnt4";
-                       lantiq,function = "pci";
-               };
-               pci-in {
-                       lantiq,groups = "req1", "req2", "req4";
-                       lantiq,output = <0>;
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-               };
-               pci-out {
-                       lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4";
-                       lantiq,output = <1>;
-                       lantiq,pull = <0>;
-               };
                ar8030-intr {
                        lantiq,groups = "exin3";
                        lantiq,function = "exin";
@@ -122,7 +104,6 @@
        mdio-bus {
                #address-cells = <1>;
                #size-cells = <0>;
-               reg = <0>;
 
                phy0: ethernet-phy@0 {
                        reg = <0>;
@@ -132,12 +113,10 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -172,6 +151,13 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>,
+                   <&pci_gnt3_pins>, <&pci_gnt4_pins>,
+                   <&pci_req1_pins>, <&pci_req2_pins>,
+                   <&pci_req4_pins>;
+       pinctrl-names = "default";
+
        req-mask = <0xf>;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_LOW>;