Skip to content
Snippets Groups Projects
Commit dcb5e522 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Adrian Schmutzler
Browse files

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: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
parent 660200e5
No related branches found
No related tags found
No related merge requests found
Showing
with 36 additions and 68 deletions
...@@ -131,12 +131,6 @@ ...@@ -131,12 +131,6 @@
lantiq,open-drain = <0>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,output = <1>;
}; };
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
exin { exin {
lantiq,groups = "exin1", "exin2"; lantiq,groups = "exin1", "exin2";
lantiq,function = "exin"; lantiq,function = "exin";
......
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
state_default: pinmux { state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
exin { exin {
lantiq,groups = "exin1"; lantiq,groups = "exin1";
lantiq,function = "exin"; lantiq,function = "exin";
...@@ -33,11 +29,6 @@ ...@@ -33,11 +29,6 @@
lantiq,groups = "gnt1"; lantiq,groups = "gnt1";
lantiq,function = "pci"; lantiq,function = "pci";
}; };
conf_out {
lantiq,pins = "io4", "io5", "io6"; /* stp */
lantiq,open-drain;
lantiq,pull = <0>;
};
}; };
}; };
......
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
state_default: pinmux { state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
exin { exin {
lantiq,groups = "exin1"; lantiq,groups = "exin1";
lantiq,function = "exin"; lantiq,function = "exin";
...@@ -33,11 +29,6 @@ ...@@ -33,11 +29,6 @@
lantiq,groups = "gnt1"; lantiq,groups = "gnt1";
lantiq,function = "pci"; lantiq,function = "pci";
}; };
conf_out {
lantiq,pins = "io4", "io5", "io6"; /* stp */
lantiq,open-drain;
lantiq,pull = <0>;
};
}; };
}; };
......
...@@ -189,17 +189,12 @@ ...@@ -189,17 +189,12 @@
lantiq,groups = "exin3"; lantiq,groups = "exin3";
lantiq,function = "exin"; lantiq,function = "exin";
}; };
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
pci { pci {
lantiq,groups = "gnt1", "req1"; lantiq,groups = "gnt1", "req1";
lantiq,function = "pci"; lantiq,function = "pci";
}; };
conf_out { conf_out {
lantiq,pins = "io4", "io5", "io6", /* stp */ lantiq,pins = "io21",
"io21",
"io33"; "io33";
lantiq,open-drain; lantiq,open-drain;
lantiq,pull = <0>; lantiq,pull = <0>;
......
...@@ -52,18 +52,6 @@ ...@@ -52,18 +52,6 @@
}; };
}; };
&gpio {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
};
};
};
&gpios { &gpios {
status = "okay"; status = "okay";
}; };
......
...@@ -103,13 +103,6 @@ ...@@ -103,13 +103,6 @@
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
state_default: pinmux { state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <2>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
exin { exin {
lantiq,groups = "exin1"; lantiq,groups = "exin1";
lantiq,function = "exin"; lantiq,function = "exin";
...@@ -118,11 +111,6 @@ ...@@ -118,11 +111,6 @@
lantiq,groups = "gnt1"; lantiq,groups = "gnt1";
lantiq,function = "pci"; lantiq,function = "pci";
}; };
conf_out {
lantiq,pins = "io4", "io5", "io6";
lantiq,open-drain;
lantiq,pull = <0>;
};
}; };
usb_vbus: regulator-usb-vbus { usb_vbus: regulator-usb-vbus {
......
...@@ -201,13 +201,6 @@ ...@@ -201,13 +201,6 @@
lantiq,groups = "exin3"; lantiq,groups = "exin3";
lantiq,function = "exin"; lantiq,function = "exin";
}; };
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <2>;
lantiq,open-drain = <0>;
lantiq,output = <1>;
};
pci-in { pci-in {
lantiq,groups = "req1"; lantiq,groups = "req1";
lantiq,function = "pci"; lantiq,function = "pci";
......
...@@ -212,13 +212,6 @@ ...@@ -212,13 +212,6 @@
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
state_default: pinmux { state_default: pinmux {
stp {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,open-drain = <0>;
lantiq,output = <1>;
lantiq,pull = <0>;
};
pci-rst { pci-rst {
lantiq,pins = "io21"; lantiq,pins = "io21";
lantiq,open-drain = <0>; lantiq,open-drain = <0>;
......
...@@ -223,6 +223,14 @@ ...@@ -223,6 +223,14 @@
lantiq,output = <1>; 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 { stp: stp@e100bb0 {
...@@ -230,6 +238,10 @@ ...@@ -230,6 +238,10 @@
compatible = "lantiq,gpio-stp-xway"; compatible = "lantiq,gpio-stp-xway";
gpio-controller; gpio-controller;
reg = <0xe100bb0 0x40>; reg = <0xe100bb0 0x40>;
pinctrl-0 = <&stp_pins>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
......
...@@ -144,6 +144,10 @@ ...@@ -144,6 +144,10 @@
compatible = "lantiq,gpio-stp-xway"; compatible = "lantiq,gpio-stp-xway";
gpio-controller; gpio-controller;
reg = <0xe100bb0 0x40>; reg = <0xe100bb0 0x40>;
pinctrl-0 = <&stp_pins>;
pinctrl-names = "default";
lantiq,shadow = <0xfff>; lantiq,shadow = <0xfff>;
lantiq,groups = <0x3>; lantiq,groups = <0x3>;
status = "disabled"; status = "disabled";
...@@ -188,6 +192,14 @@ ...@@ -188,6 +192,14 @@
lantiq,pull = <0>; 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 { asc1: serial@e100c00 {
......
...@@ -313,6 +313,14 @@ ...@@ -313,6 +313,14 @@
lantiq,output = <1>; 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 { stp: stp@e100bb0 {
...@@ -322,6 +330,9 @@ ...@@ -322,6 +330,9 @@
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
pinctrl-0 = <&stp_pins>;
pinctrl-names = "default";
lantiq,shadow = <0xffffff>; lantiq,shadow = <0xffffff>;
lantiq,groups = <0x7>; lantiq,groups = <0x7>;
lantiq,dsl = <0x0>; lantiq,dsl = <0x0>;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment