lantiq: dts: assign the STP pins to the STP GPIO controller node

Assign the STP pins to the STP GPIO 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>
This commit is contained in:
Martin Blumenstingl 2019-07-08 14:54:13 +02:00 committed by Adrian Schmutzler
parent 660200e53d
commit dcb5e52209
11 changed files with 36 additions and 68 deletions

View File

@ -131,12 +131,6 @@
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
exin {
lantiq,groups = "exin1", "exin2";
lantiq,function = "exin";

View File

@ -21,10 +21,6 @@
pinctrl-0 = <&state_default>;
state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
exin {
lantiq,groups = "exin1";
lantiq,function = "exin";
@ -33,11 +29,6 @@
lantiq,groups = "gnt1";
lantiq,function = "pci";
};
conf_out {
lantiq,pins = "io4", "io5", "io6"; /* stp */
lantiq,open-drain;
lantiq,pull = <0>;
};
};
};

View File

@ -21,10 +21,6 @@
pinctrl-0 = <&state_default>;
state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
exin {
lantiq,groups = "exin1";
lantiq,function = "exin";
@ -33,11 +29,6 @@
lantiq,groups = "gnt1";
lantiq,function = "pci";
};
conf_out {
lantiq,pins = "io4", "io5", "io6"; /* stp */
lantiq,open-drain;
lantiq,pull = <0>;
};
};
};

View File

@ -189,17 +189,12 @@
lantiq,groups = "exin3";
lantiq,function = "exin";
};
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
pci {
lantiq,groups = "gnt1", "req1";
lantiq,function = "pci";
};
conf_out {
lantiq,pins = "io4", "io5", "io6", /* stp */
"io21",
lantiq,pins = "io21",
"io33";
lantiq,open-drain;
lantiq,pull = <0>;

View File

@ -52,18 +52,6 @@
};
};
&gpio {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
};
};
&gpios {
status = "okay";
};

View File

@ -103,13 +103,6 @@
pinctrl-0 = <&state_default>;
state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <2>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
exin {
lantiq,groups = "exin1";
lantiq,function = "exin";
@ -118,11 +111,6 @@
lantiq,groups = "gnt1";
lantiq,function = "pci";
};
conf_out {
lantiq,pins = "io4", "io5", "io6";
lantiq,open-drain;
lantiq,pull = <0>;
};
};
usb_vbus: regulator-usb-vbus {

View File

@ -201,13 +201,6 @@
lantiq,groups = "exin3";
lantiq,function = "exin";
};
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <2>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
pci-in {
lantiq,groups = "req1";
lantiq,function = "pci";

View File

@ -212,13 +212,6 @@
pinctrl-0 = <&state_default>;
state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,open-drain = <0>;
lantiq,output = <1>;
lantiq,pull = <0>;
};
pci-rst {
lantiq,pins = "io21";
lantiq,open-drain = <0>;

View File

@ -223,6 +223,14 @@
lantiq,output = <1>;
};
};
stp_pins: stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <0>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
};
stp: stp@e100bb0 {
@ -230,6 +238,10 @@
compatible = "lantiq,gpio-stp-xway";
gpio-controller;
reg = <0xe100bb0 0x40>;
pinctrl-0 = <&stp_pins>;
pinctrl-names = "default";
status = "disabled";
};

View File

@ -144,6 +144,10 @@
compatible = "lantiq,gpio-stp-xway";
gpio-controller;
reg = <0xe100bb0 0x40>;
pinctrl-0 = <&stp_pins>;
pinctrl-names = "default";
lantiq,shadow = <0xfff>;
lantiq,groups = <0x3>;
status = "disabled";
@ -188,6 +192,14 @@
lantiq,pull = <0>;
};
};
stp_pins: stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <0>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
};
asc1: serial@e100c00 {

View File

@ -313,6 +313,14 @@
lantiq,output = <1>;
};
};
stp_pins: stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <0>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
};
stp: stp@e100bb0 {
@ -322,6 +330,9 @@
#gpio-cells = <2>;
gpio-controller;
pinctrl-0 = <&stp_pins>;
pinctrl-names = "default";
lantiq,shadow = <0xffffff>;
lantiq,groups = <0x7>;
lantiq,dsl = <0x0>;