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: 8e7b573b7aa4 ("lantiq: dts: assign the PCI pins to the PCI controller node")
Fixes: dcb5e52209e5 ("lantiq: dts: assign the STP pins to the STP GPIO controller node")
Fixes: 660200e53d62 ("lantiq: dts: assign the GPHY LED pins to the Ethernet controller node")
Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
index 344c2f4fa8819a351b13fb14c2a4011944272fef..12af82b8ceaf87db146180f6e13bda553f1469be 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
@@ -205,67 +205,83 @@
                        };
 
                        pci_gnt1_pins: pci-gnt1 {
-                               lantiq,groups = "gnt1";
-                               lantiq,function = "pci";
-                               lantiq,output = <1>;
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <0>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       lantiq,groups = "req4";
+                                       lantiq,function = "pci";
+                                       lantiq,output = <0>;
+                                       lantiq,open-drain = <1>;
+                                       lantiq,pull = <2>;
+                               };
                        };
 
                        spi_pins: spi {
@@ -289,11 +305,13 @@
                        };
 
                        stp_pins: stp {
-                               lantiq,groups = "stp";
-                               lantiq,function = "stp";
-                               lantiq,pull = <0>;
-                               lantiq,open-drain = <0>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "stp";
+                                       lantiq,function = "stp";
+                                       lantiq,pull = <0>;
+                                       lantiq,open-drain = <0>;
+                                       lantiq,output = <1>;
+                               };
                        };
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
index 6ee6dda57154054007574e5c1cf74732ef0819e6..ae8c1c045aa2623830952f9de47ed2bfd2df21e4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
@@ -194,43 +194,53 @@
                        };
 
                        pci_gnt1_pins: pci-gnt1 {
-                               lantiq,groups = "gnt1";
-                               lantiq,function = "pci";
-                               lantiq,output = <1>;
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <0>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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>;
+                               mux {
+                                       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";
-                               lantiq,pull = <0>;
-                               lantiq,open-drain = <0>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "stp";
+                                       lantiq,function = "stp";
+                                       lantiq,pull = <0>;
+                                       lantiq,open-drain = <0>;
+                                       lantiq,output = <1>;
+                               };
                        };
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
index 9e27830cb1cd7c5d252fca3b83fb682c77d5381e..35b1f180a5e59a11dc3668801a2a2a3af1c96295 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
@@ -214,51 +214,63 @@
                        reg = <0xe100b10 0xa0>;
 
                        gphy0_led0_pins: gphy0-led0 {
-                               lantiq,groups = "gphy0 led0";
-                               lantiq,function = "gphy";
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <2>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "gphy0 led0";
+                                       lantiq,function = "gphy";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,pull = <2>;
+                                       lantiq,output = <1>;
+                               };
                        };
 
                        gphy0_led1_pins: gphy0-led1 {
-                               lantiq,groups = "gphy0 led1";
-                               lantiq,function = "gphy";
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <2>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "gphy0 led1";
+                                       lantiq,function = "gphy";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,pull = <2>;
+                                       lantiq,output = <1>;
+                               };
                        };
 
                        gphy0_led2_pins: gphy0-led2 {
-                               lantiq,groups = "gphy0 led2";
-                               lantiq,function = "gphy";
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <2>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "gphy0 led2";
+                                       lantiq,function = "gphy";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,pull = <2>;
+                                       lantiq,output = <1>;
+                               };
                        };
 
                        gphy1_led0_pins: gphy1-led0 {
-                               lantiq,groups = "gphy1 led0";
-                               lantiq,function = "gphy";
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <2>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "gphy1 led0";
+                                       lantiq,function = "gphy";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,pull = <2>;
+                                       lantiq,output = <1>;
+                               };
                        };
 
                        gphy1_led1_pins: gphy1-led1 {
-                               lantiq,groups = "gphy1 led1";
-                               lantiq,function = "gphy";
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <2>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "gphy1 led1";
+                                       lantiq,function = "gphy";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,pull = <2>;
+                                       lantiq,output = <1>;
+                               };
                        };
 
                        gphy1_led2_pins: gphy1-led2 {
-                               lantiq,groups = "gphy1 led2";
-                               lantiq,function = "gphy";
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <2>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "gphy1 led2";
+                                       lantiq,function = "gphy";
+                                       lantiq,open-drain = <0>;
+                                       lantiq,pull = <2>;
+                                       lantiq,output = <1>;
+                               };
                        };
 
                        mdio_pins: mdio {
@@ -295,19 +307,23 @@
                        };
 
                        pci_gnt1_pins: pci-gnt1 {
-                               lantiq,groups = "gnt1";
-                               lantiq,function = "pci";
-                               lantiq,output = <1>;
-                               lantiq,open-drain = <0>;
-                               lantiq,pull = <0>;
+                               mux {
+                                       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>;
+                               mux {
+                                       lantiq,groups = "req1";
+                                       lantiq,function = "pci";
+                                       lantiq,output = <0>;
+                                       lantiq,open-drain = <1>;
+                                       lantiq,pull = <2>;
+                               };
                        };
 
                        spi_pins: spi {
@@ -331,11 +347,13 @@
                        };
 
                        stp_pins: stp {
-                               lantiq,groups = "stp";
-                               lantiq,function = "stp";
-                               lantiq,pull = <0>;
-                               lantiq,open-drain = <0>;
-                               lantiq,output = <1>;
+                               mux {
+                                       lantiq,groups = "stp";
+                                       lantiq,function = "stp";
+                                       lantiq,pull = <0>;
+                                       lantiq,open-drain = <0>;
+                                       lantiq,output = <1>;
+                               };
                        };
                };