lantiq: move mux for pins into subnodes

The mux need to be defined in a subnode to be considered by the pinctrl
framework. These muxes aren't set as expected and might cause not
working subsystems.

Fixes: 8e7b573b7a ("lantiq: dts: assign the PCI pins to the PCI controller node")
Fixes: dcb5e52209 ("lantiq: dts: assign the STP pins to the STP GPIO controller node")
Fixes: 660200e53d ("lantiq: dts: assign the GPHY LED pins to the Ethernet controller node")
Signed-off-by: Mathias Kresin <dev@kresin.me>
master
Mathias Kresin 4 years ago
parent 1a9408281b
commit f2d976f06e

@ -205,68 +205,84 @@
};
pci_gnt1_pins: pci-gnt1 {
mux {
lantiq,groups = "gnt1";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_gnt2_pins: pci-gnt2 {
mux {
lantiq,groups = "gnt2";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_gnt3_pins: pci-gnt3 {
mux {
lantiq,groups = "gnt3";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_gnt4_pins: pci-gnt4 {
mux {
lantiq,groups = "gnt4";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_req1_pins: pci-req1 {
mux {
lantiq,groups = "req1";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
pci_req2_pins: pci-req2 {
mux {
lantiq,groups = "req2";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
pci_req3_pins: pci-req3 {
mux {
lantiq,groups = "req3";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
pci_req4_pins: pci-req4 {
mux {
lantiq,groups = "req4";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
spi_pins: spi {
mux-0 {
@ -289,6 +305,7 @@
};
stp_pins: stp {
mux {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <0>;
@ -296,6 +313,7 @@
lantiq,output = <1>;
};
};
};
stp: stp@e100bb0 {
#gpio-cells = <2>;

@ -194,38 +194,47 @@
};
pci_gnt1_pins: pci-gnt1 {
mux {
lantiq,groups = "gnt1";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_gnt2_pins: pci-gnt2 {
mux {
lantiq,groups = "gnt2";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_req1_pins: pci-req1 {
mux {
lantiq,groups = "req1";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
pci_req2_pins: pci-req2 {
mux {
lantiq,groups = "req2";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
stp_pins: stp {
mux {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <0>;
@ -233,6 +242,7 @@
lantiq,output = <1>;
};
};
};
asc1: serial@e100c00 {
compatible = "lantiq,asc";

@ -214,52 +214,64 @@
reg = <0xe100b10 0xa0>;
gphy0_led0_pins: gphy0-led0 {
mux {
lantiq,groups = "gphy0 led0";
lantiq,function = "gphy";
lantiq,open-drain = <0>;
lantiq,pull = <2>;
lantiq,output = <1>;
};
};
gphy0_led1_pins: gphy0-led1 {
mux {
lantiq,groups = "gphy0 led1";
lantiq,function = "gphy";
lantiq,open-drain = <0>;
lantiq,pull = <2>;
lantiq,output = <1>;
};
};
gphy0_led2_pins: gphy0-led2 {
mux {
lantiq,groups = "gphy0 led2";
lantiq,function = "gphy";
lantiq,open-drain = <0>;
lantiq,pull = <2>;
lantiq,output = <1>;
};
};
gphy1_led0_pins: gphy1-led0 {
mux {
lantiq,groups = "gphy1 led0";
lantiq,function = "gphy";
lantiq,open-drain = <0>;
lantiq,pull = <2>;
lantiq,output = <1>;
};
};
gphy1_led1_pins: gphy1-led1 {
mux {
lantiq,groups = "gphy1 led1";
lantiq,function = "gphy";
lantiq,open-drain = <0>;
lantiq,pull = <2>;
lantiq,output = <1>;
};
};
gphy1_led2_pins: gphy1-led2 {
mux {
lantiq,groups = "gphy1 led2";
lantiq,function = "gphy";
lantiq,open-drain = <0>;
lantiq,pull = <2>;
lantiq,output = <1>;
};
};
mdio_pins: mdio {
mux {
@ -295,20 +307,24 @@
};
pci_gnt1_pins: pci-gnt1 {
mux {
lantiq,groups = "gnt1";
lantiq,function = "pci";
lantiq,output = <1>;
lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
};
pci_req1_pins: pci-req1 {
mux {
lantiq,groups = "req1";
lantiq,function = "pci";
lantiq,output = <0>;
lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
};
spi_pins: spi {
mux-0 {
@ -331,6 +347,7 @@
};
stp_pins: stp {
mux {
lantiq,groups = "stp";
lantiq,function = "stp";
lantiq,pull = <0>;
@ -338,6 +355,7 @@
lantiq,output = <1>;
};
};
};
stp: stp@e100bb0 {
status = "disabled";

Loading…
Cancel
Save