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>

27 files changed, 213 insertions, 260 deletions

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 7942535943..67b0f9631f 100644
--- 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 a61972518e..19a44d5f6d 100644
--- 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 f5dec312f8..dcae06d894 100644
--- 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 95944d9cfc..b59477cb19 100644
--- 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 d55613a02b..cceb42164e 100644
--- 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 4ff0f67ca3..eecff4bb0b 100644
--- 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 c0bca84031..9e4216033b 100644
--- 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 5c4a41e957..e5fd05fe40 100644
--- 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 458fd65495..ae0d27a042 100644
--- 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 e9c418e482..34b541af92 100644
--- 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 bcdc2249fd..d673c9b204 100644
--- 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 dbec1eb6a1..069b1b1ed6 100644
--- 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 de996d10cc..ec90a2bef9 100644
--- 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 00131f929c..4bf44a10e1 100644
--- 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 5d69ed8d72..40886feec4 100644
--- 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 b4d9fbea91..044ae2b417 100644
--- 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 b12101a5d1..a3dbbbdfad 100644
--- 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 74318a5f65..1afc74900e 100644
--- 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 492dbac98e..87ba62de33 100644
--- 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 37ba1c0c9a..4fbc1ac496 100644
--- 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 0190dd2f01..aa825abd9f 100644
--- 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 6c0dad873f..424b778bb4 100644
--- 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 c31945fff0..79896c6478 100644
--- 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 d6879009db..5f8392ca44 100644
--- 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 a613131e48..344c2f4fa8 100644
--- 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 795df712e2..6ee6dda571 100644
--- 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 fa8d2fae63..9e27830cb1 100644
--- 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";