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>
master
Martin Blumenstingl 2019-07-08 15:17:25 +02:00 committed by Adrian Schmutzler
parent dcb5e52209
commit 8e7b573b7a
27 changed files with 213 additions and 260 deletions

View File

@ -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 {

View File

@ -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

View File

@ -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>;
};

View File

@ -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>;
};

View File

@ -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>;
};

View File

@ -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>;
};

View File

@ -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>;

View File

@ -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

View File

@ -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>;

View File

@ -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>;

View File

@ -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 {

View File

@ -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>;

View File

@ -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

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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";
};

View File

@ -25,10 +25,6 @@
lantiq,groups = "exin1";
lantiq,function = "exin";
};
pci {
lantiq,groups = "gnt1";
lantiq,function = "pci";
};
};
};

View File

@ -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";

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;
};

View File

@ -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";

View File

@ -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";

View File

@ -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";