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

Assign the PCI pins to the PCI controller node instead of using pin
hogging (where pins are assigned to the pin controller).
This is the preferred way of assigning pins upstream.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
index 794253594361ea12513b992d25eb3d7ebb594b50..67b0f9631f29b4d849880b167a09608bf16a0f9e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
@@ -37,10 +37,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1", "req1";
-                       lantiq,function = "pci";
-               };
        };
 };
 
@@ -96,6 +92,9 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
 };
 
 &usb_phy {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
index a61972518ec90c125fae13c10d17381e60c0fcda..19a44d5f6ddb2f07eb7bca863b96a6caf6f2eb44 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
@@ -136,18 +136,6 @@
                        lantiq,function = "exin";
                        lantiq,output = <0>;
                };
-               pci_in {
-                       lantiq,groups = "req1", "req2";
-                       lantiq,function = "pci";
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1", "gnt2";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <0>;
-                       lantiq,pull = <0>;
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,open-drain = <0>;
@@ -205,6 +193,11 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>,
+                   <&pci_req1_pins>, <&pci_req2_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        interrupt-map = <
                0x6000 0 0 1 &icu0 135

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
index f5dec312f89c90be0e93fe1bb064157fe8a9b276..dcae06d8942a209eb32848bf23fd3fec3f4a9ae7 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
@@ -119,19 +119,6 @@
                        lantiq,groups = "ebu cs1";
                        lantiq,function = "ebu";
                };
-               pci_in {
-                       lantiq,groups = "req1", "req2";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1", "gnt2";
-                       lantiq,function = "pci";
-                       lantiq,pull = <0>;
-                       lantiq,output = <1>;
-               };
        };
 };
 
@@ -189,6 +176,11 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>,
+                   <&pci_req1_pins>, <&pci_req2_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
        req-mask = <0xf>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
index 95944d9cfc79872ca820aae5fdb01e6845a28d92..b59477cb19c4c9f93addfa66c9d7f1d7423a7f77 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
@@ -135,18 +135,6 @@
                        lantiq,groups = "ebu cs1";
                        lantiq,function = "ebu";
                };
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,open-drain = <0>;
@@ -210,6 +198,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
index d55613a02b5481ef74fc0123506379dd7f1e146a..cceb42164ebb791af4808bd910854ffbdf2313ef 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
@@ -80,18 +80,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -149,6 +137,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
index 4ff0f67ca378b53fc9a211b3e6cb6645b43f1537..eecff4bb0bfb3cf6aaa0551b550a6540395a4f50 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
@@ -147,18 +147,6 @@
                        lantiq,groups = "ebu cs1";
                        lantiq,function = "ebu";
                };
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <0>;
@@ -228,6 +216,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
index c0bca8403149a3d3ca3debf355129f7a50f8742d..9e4216033beb170f1d5612ff30c9608170318339 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
@@ -91,11 +91,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               pci {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -149,6 +144,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
index 5c4a41e95718f310755ae1b001462cad715629dc..e5fd05fe4013317277e44b42c8ba2ed0be5a8384 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
@@ -86,18 +86,6 @@
                        lantiq,pull = <2>;
                        lantiq,output = <0>;
                };
-               pci_in {
-                       lantiq,groups = "req1", "req2";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -173,6 +161,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>, <&pci_req2_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        interrupt-map = <
                0x7000 0 0 1 &icu0 30

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
index 458fd65495c6194fd37f765c95d407c6ee89a625..ae0d27a0426936d4af7ab1cdc6e4174315cb6867 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
@@ -116,19 +116,6 @@
                        lantiq,groups = "ebu cs1";
                        lantiq,function = "ebu";
                };
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,pull = <0>;
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -215,6 +202,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
        lantiq,external-clock;
        req-mask = <0xf>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
index e9c418e482a6896cd021bbea494742b83dbb3f3f..34b541af9299daf1d6f4e9571f74c628101fc923 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
@@ -131,19 +131,6 @@
                        lantiq,groups = "ebu cs1";
                        lantiq,function = "ebu";
                };
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,pull = <0>;
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -200,6 +187,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
        req-mask = <0xf>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
index bcdc2249fd0e58254154c36c9d1377bfaa4676ab..d673c9b204a32d53ad91478b062e1be514108099 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
@@ -83,10 +83,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1", "req1";
-                       lantiq,function = "pci";
-               };
        };
 };
 
@@ -134,6 +130,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
 
        wifi@0,0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
index dbec1eb6a14bada2c25889c883c0c0d29cbc19a5..069b1b1ed64be2452bbcde9a5519d04013081d87 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
@@ -123,18 +123,6 @@
                        lantiq,pull = <2>;
                        lantiq,output = <0>;
                };
-               pci_in {
-                       lantiq,groups = "req2", "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -220,6 +208,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>, <&pci_req2_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
        interrupt-map = <0x7000 0 0 1 &icu0 135>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
index de996d10cc03d3ab67d3717113daaf933002dfe8..ec90a2bef9aa6d7a8dd6d14e5f37923e92ed5ffd 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
@@ -151,18 +151,6 @@
                        lantiq,pull = <2>;
                        lantiq,output = <0>;
                };
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,open-drain = <1>;
@@ -235,6 +223,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        lantiq,external-clock;
        interrupt-map = <
                0x7000 0 0 1 &icu0 30

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
index 00131f929c54843e3a9bfa56994df6fc90f65e7f..4bf44a10e1dd6d65e31f95e907971ca324ef1128 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
@@ -95,18 +95,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-                       lantiq,output = <0>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,pull = <2>;
@@ -163,6 +151,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 
        wifi@168c,0029 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
index 5d69ed8d72d0697398940554299a82d4e26d713f..40886feec4a9d76819b4b22075518b903d84ecc1 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
@@ -112,20 +112,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,output = <0>;
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-                       lantiq,open-drain = <0>;
-                       lantiq,pull = <0>;
-               };
 
                pci_rst {
                        lantiq,pins = "io21";
@@ -225,6 +211,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 
        wifi@168c,0027 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
index b4d9fbea91a2b814571be5441e1445e172864483..044ae2b417a24589d73c34182b344db2e73e1248 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
@@ -109,21 +109,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               pci_in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,output = <0>;
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-               };
-               pci_out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-                       lantiq,open-drain = <0>;
-                       lantiq,pull = <0>;
-               };
-
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,output = <1>;
@@ -184,6 +169,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 
        wifi@7000 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
index b12101a5d12aefca25f78d52787d6b455c4407c6..a3dbbbdfadb2e996bfb03994a370d775e83755cd 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
@@ -115,21 +115,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1", "req1";
-                       lantiq,function = "pci";
-               };
-               pci-in {
-                       lantiq,groups = "req1";
-                       lantiq,output = <0>;
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-               };
-               pci-out {
-                       lantiq,groups = "gnt1";
-                       lantiq,output = <1>;
-                       lantiq,pull = <0>;
-               };
        };
 };
 
@@ -139,6 +124,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 
        wifi@168c,0029 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
index 74318a5f65c84cf777472ac60c094ae2af489739..1afc74900e47c4cef52ad6cae67f4da553b11aef 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
@@ -25,10 +25,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-               };
        };
 };
 
@@ -69,3 +65,8 @@
                };
        };
 };
+
+&pci0 {
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+};

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
index 492dbac98e7bc3b648bafd80da17b7fc234b93a8..87ba62de332de0bb7f8e79d9ec9c57054898d454 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
@@ -25,10 +25,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-               };
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
index 37ba1c0c9a4e1336a91ad4b937825e53674b6c2e..4fbc1ac4962b4e9d668bd843edd36c8a31c8706b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
@@ -189,10 +189,6 @@
                        lantiq,groups = "exin3";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1", "req1";
-                       lantiq,function = "pci";
-               };
                conf_out {
                        lantiq,pins = "io21",
                                        "io33";
@@ -257,6 +253,11 @@
        };
 };
 
+&pci0 {
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+};
+
 &stp {
        status = "okay";
 

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 0190dd2f01aa999195165efef3a13ed182c5c60d..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
@@ -75,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";
@@ -166,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>;
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
index 6c0dad873f80af9012b2f38f75dd429e026aced2..424b778bb46068dd61b6f100a3bb9f4fc0b0895b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
@@ -73,29 +73,6 @@
        };
 };
 
-&gpio {
-       pinctrl-names = "default";
-       pinctrl-0 = <&state_default>;
-
-       state_default: pinmux {
-               pci {
-                       lantiq,groups = "gnt1", "req1", "req2", "req3", "req4", "gnt2", "gnt3", "gnt4";
-                       lantiq,function = "pci";
-               };
-               pci-in {
-                       lantiq,groups = "req1", "req2", "req3", "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>;
-               };
-       };
-};
-
 &gsw {
        phy-mode = "mii";
        mtd-mac-address = <&ath9k_cal 0xa91>;
@@ -141,6 +118,12 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>,
+                   <&pci_gnt3_pins>, <&pci_gnt4_pins>,
+                   <&pci_req1_pins>, <&pci_req2_pins>,
+                   <&pci_req3_pins>, <&pci_req4_pins>;
+
        req-mask = <0xf>;
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
index c31945fff092bc79ff9828205b65610187f1b504..79896c6478d63f21fb2985cce3b686ebdfeda952 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
@@ -107,10 +107,6 @@
                        lantiq,groups = "exin1";
                        lantiq,function = "exin";
                };
-               pci {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-               };
        };
 
        usb_vbus: regulator-usb-vbus {
@@ -161,6 +157,11 @@
        };
 };
 
+&pci0 {
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+};
+
 &stp {
        status = "okay";
        lantiq,shadow = <0xfff>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
index d6879009dbb83a6c79ce4fac81283c94b13bba26..5f8392ca44acf9a024f11135c7fe7181554f4064 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
@@ -201,20 +201,6 @@
                        lantiq,groups = "exin3";
                        lantiq,function = "exin";
                };
-               pci-in {
-                       lantiq,groups = "req1";
-                       lantiq,function = "pci";
-                       lantiq,output = <0>;
-                       lantiq,open-drain = <1>;
-                       lantiq,pull = <2>;
-               };
-               pci-out {
-                       lantiq,groups = "gnt1";
-                       lantiq,function = "pci";
-                       lantiq,output = <1>;
-                       lantiq,open-drain = <0>;
-                       lantiq,pull = <0>;
-               };
                pci_rst {
                        lantiq,pins = "io21";
                        lantiq,output = <1>;
@@ -237,6 +223,10 @@
 
 &pci0 {
        status = "okay";
+
+       pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
+       pinctrl-names = "default";
+
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
index a613131e48046e26412e109427c2bc3326520574..344c2f4fa8819a351b13fb14c2a4011944272fef 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
@@ -204,6 +204,70 @@
                                };
                        };
 
+                       pci_gnt1_pins: pci-gnt1 {
+                               lantiq,groups = "gnt1";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_gnt2_pins: pci-gnt2 {
+                               lantiq,groups = "gnt2";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_gnt3_pins: pci-gnt3 {
+                               lantiq,groups = "gnt3";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_gnt4_pins: pci-gnt4 {
+                               lantiq,groups = "gnt4";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_req1_pins: pci-req1 {
+                               lantiq,groups = "req1";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
+                       pci_req2_pins: pci-req2 {
+                               lantiq,groups = "req2";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
+                       pci_req3_pins: pci-req3 {
+                               lantiq,groups = "req3";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
+                       pci_req4_pins: pci-req4 {
+                               lantiq,groups = "req4";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
                        spi_pins: spi {
                                mux-0 {
                                        lantiq,groups = "spi_di";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
index 795df712e2adf9d3987d7c3b52dafd2bcc905075..6ee6dda57154054007574e5c1cf74732ef0819e6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
@@ -193,6 +193,38 @@
                                };
                        };
 
+                       pci_gnt1_pins: pci-gnt1 {
+                               lantiq,groups = "gnt1";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_gnt2_pins: pci-gnt2 {
+                               lantiq,groups = "gnt2";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_req1_pins: pci-req1 {
+                               lantiq,groups = "req1";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
+                       pci_req2_pins: pci-req2 {
+                               lantiq,groups = "req2";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
                        stp_pins: stp {
                                lantiq,groups = "stp";
                                lantiq,function = "stp";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
index fa8d2fae63fb46a985f4d00b89db9a65788408a7..9e27830cb1cd7c5d252fca3b83fb682c77d5381e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
@@ -294,6 +294,22 @@
                                };
                        };
 
+                       pci_gnt1_pins: pci-gnt1 {
+                               lantiq,groups = "gnt1";
+                               lantiq,function = "pci";
+                               lantiq,output = <1>;
+                               lantiq,open-drain = <0>;
+                               lantiq,pull = <0>;
+                       };
+
+                       pci_req1_pins: pci-req1 {
+                               lantiq,groups = "req1";
+                               lantiq,function = "pci";
+                               lantiq,output = <0>;
+                               lantiq,open-drain = <1>;
+                               lantiq,pull = <2>;
+                       };
+
                        spi_pins: spi {
                                mux-0 {
                                        lantiq,groups = "spi_di";