Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lantiq: move mux for pins into subnodes

Browse source 
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>
This commit is contained in:
Mathias Kresin 2020-03-15 21:26:23 +01:00
parent 1a9408281b
commit f2d976f06e
3 changed files with 161 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
View file

@ -205,67 +205,83 @@
}; };
pci_gnt1_pins: pci-gnt1 { pci_gnt1_pins: pci-gnt1 {
lantiq,groups = "gnt1"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt1";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_gnt2_pins: pci-gnt2 { pci_gnt2_pins: pci-gnt2 {
lantiq,groups = "gnt2"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt2";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_gnt3_pins: pci-gnt3 { pci_gnt3_pins: pci-gnt3 {
lantiq,groups = "gnt3"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt3";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_gnt4_pins: pci-gnt4 { pci_gnt4_pins: pci-gnt4 {
lantiq,groups = "gnt4"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt4";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_req1_pins: pci-req1 { pci_req1_pins: pci-req1 {
lantiq,groups = "req1"; mux {
lantiq,function = "pci"; lantiq,groups = "req1";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
pci_req2_pins: pci-req2 { pci_req2_pins: pci-req2 {
lantiq,groups = "req2"; mux {
lantiq,function = "pci"; lantiq,groups = "req2";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
pci_req3_pins: pci-req3 { pci_req3_pins: pci-req3 {
lantiq,groups = "req3"; mux {
lantiq,function = "pci"; lantiq,groups = "req3";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
pci_req4_pins: pci-req4 { pci_req4_pins: pci-req4 {
lantiq,groups = "req4"; mux {
lantiq,function = "pci"; lantiq,groups = "req4";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
spi_pins: spi { spi_pins: spi {
@ -289,11 +305,13 @@
}; };
stp_pins: stp { stp_pins: stp {
lantiq,groups = "stp"; mux {
lantiq,function = "stp"; lantiq,groups = "stp";
lantiq,pull = <0>; lantiq,function = "stp";
lantiq,open-drain = <0>; lantiq,pull = <0>;
lantiq,output = <1>; lantiq,open-drain = <0>;
lantiq,output = <1>;
};
}; };
}; };

60
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
View file

@ -194,43 +194,53 @@
}; };
pci_gnt1_pins: pci-gnt1 { pci_gnt1_pins: pci-gnt1 {
lantiq,groups = "gnt1"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt1";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_gnt2_pins: pci-gnt2 { pci_gnt2_pins: pci-gnt2 {
lantiq,groups = "gnt2"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt2";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_req1_pins: pci-req1 { pci_req1_pins: pci-req1 {
lantiq,groups = "req1"; mux {
lantiq,function = "pci"; lantiq,groups = "req1";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
pci_req2_pins: pci-req2 { pci_req2_pins: pci-req2 {
lantiq,groups = "req2"; mux {
lantiq,function = "pci"; lantiq,groups = "req2";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
stp_pins: stp { stp_pins: stp {
lantiq,groups = "stp"; mux {
lantiq,function = "stp"; lantiq,groups = "stp";
lantiq,pull = <0>; lantiq,function = "stp";
lantiq,open-drain = <0>; lantiq,pull = <0>;
lantiq,output = <1>; lantiq,open-drain = <0>;
lantiq,output = <1>;
};
}; };
}; };

108
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
View file

@ -214,51 +214,63 @@
reg = <0xe100b10 0xa0>; reg = <0xe100b10 0xa0>;
gphy0_led0_pins: gphy0-led0 { gphy0_led0_pins: gphy0-led0 {
lantiq,groups = "gphy0 led0"; mux {
lantiq,function = "gphy"; lantiq,groups = "gphy0 led0";
lantiq,open-drain = <0>; lantiq,function = "gphy";
lantiq,pull = <2>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,pull = <2>;
lantiq,output = <1>;
};
}; };
gphy0_led1_pins: gphy0-led1 { gphy0_led1_pins: gphy0-led1 {
lantiq,groups = "gphy0 led1"; mux {
lantiq,function = "gphy"; lantiq,groups = "gphy0 led1";
lantiq,open-drain = <0>; lantiq,function = "gphy";
lantiq,pull = <2>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,pull = <2>;
lantiq,output = <1>;
};
}; };
gphy0_led2_pins: gphy0-led2 { gphy0_led2_pins: gphy0-led2 {
lantiq,groups = "gphy0 led2"; mux {
lantiq,function = "gphy"; lantiq,groups = "gphy0 led2";
lantiq,open-drain = <0>; lantiq,function = "gphy";
lantiq,pull = <2>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,pull = <2>;
lantiq,output = <1>;
};
}; };
gphy1_led0_pins: gphy1-led0 { gphy1_led0_pins: gphy1-led0 {
lantiq,groups = "gphy1 led0"; mux {
lantiq,function = "gphy"; lantiq,groups = "gphy1 led0";
lantiq,open-drain = <0>; lantiq,function = "gphy";
lantiq,pull = <2>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,pull = <2>;
lantiq,output = <1>;
};
}; };
gphy1_led1_pins: gphy1-led1 { gphy1_led1_pins: gphy1-led1 {
lantiq,groups = "gphy1 led1"; mux {
lantiq,function = "gphy"; lantiq,groups = "gphy1 led1";
lantiq,open-drain = <0>; lantiq,function = "gphy";
lantiq,pull = <2>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,pull = <2>;
lantiq,output = <1>;
};
}; };
gphy1_led2_pins: gphy1-led2 { gphy1_led2_pins: gphy1-led2 {
lantiq,groups = "gphy1 led2"; mux {
lantiq,function = "gphy"; lantiq,groups = "gphy1 led2";
lantiq,open-drain = <0>; lantiq,function = "gphy";
lantiq,pull = <2>; lantiq,open-drain = <0>;
lantiq,output = <1>; lantiq,pull = <2>;
lantiq,output = <1>;
};
}; };
mdio_pins: mdio { mdio_pins: mdio {
@ -295,19 +307,23 @@
}; };
pci_gnt1_pins: pci-gnt1 { pci_gnt1_pins: pci-gnt1 {
lantiq,groups = "gnt1"; mux {
lantiq,function = "pci"; lantiq,groups = "gnt1";
lantiq,output = <1>; lantiq,function = "pci";
lantiq,open-drain = <0>; lantiq,output = <1>;
lantiq,pull = <0>; lantiq,open-drain = <0>;
lantiq,pull = <0>;
};
}; };
pci_req1_pins: pci-req1 { pci_req1_pins: pci-req1 {
lantiq,groups = "req1"; mux {
lantiq,function = "pci"; lantiq,groups = "req1";
lantiq,output = <0>; lantiq,function = "pci";
lantiq,open-drain = <1>; lantiq,output = <0>;
lantiq,pull = <2>; lantiq,open-drain = <1>;
lantiq,pull = <2>;
};
}; };
spi_pins: spi { spi_pins: spi {
@ -331,11 +347,13 @@
}; };
stp_pins: stp { stp_pins: stp {
lantiq,groups = "stp"; mux {
lantiq,function = "stp"; lantiq,groups = "stp";
lantiq,pull = <0>; lantiq,function = "stp";
lantiq,open-drain = <0>; lantiq,pull = <0>;
lantiq,output = <1>; lantiq,open-drain = <0>;
lantiq,output = <1>;
};
}; };
}; };