lantiq: dts: assign the ASC pins to the serial controller node

Assign the ASC pins to the serial 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>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
index ef57b2f06bfb03b0e46a9b59e136c549ddafe58f..c5dd1600f4f6d303c5a31772eb7a977efe38fbc5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
@@ -61,10 +61,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               asc {
-                       lantiq,groups = "asc";
-                       lantiq,function = "asc";
-               };
                keys_in {
                        lantiq,pins = "io0",/* "io25", */"io29";
                        lantiq,pull = <2>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
index 0143a21a9cd99c29fbe1eb3a748a45c96cde14b1..943b00f898d1b0f486cdf62aa29c1783b38e1b9d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
@@ -86,10 +86,6 @@
        pinctrl-0 = <&state_default>;
 
        state_default: pinmux {
-               asc {
-                       lantiq,groups = "asc";
-                       lantiq,function = "asc";
-               };
                keys_in {
                        lantiq,pins = "io0",/* "io25", */"io29";
                        lantiq,pull = <2>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
index 6b5606d8ab3d605c8b27ca365fbe10812a979177..496150b7a7e8838f668629cc13fdc8e1c75ca49a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
@@ -151,6 +151,13 @@
                        gpio-controller;
                        reg = <0xe100b10 0xa0>;
 
+                       asc_pins: asc-pins {
+                               mux {
+                                       lantiq,groups = "asc";
+                                       lantiq,function = "asc";
+                               };
+                       };
+
                        mdio_pins: mdio {
                                mux {
                                        lantiq,groups = "mdio";
@@ -184,6 +191,8 @@
                        reg = <0xe100c00 0x400>;
                        interrupt-parent = <&icu0>;
                        interrupts = <72 74 75>;
+                       pinctrl-0 = <&asc_pins>;
+                       pinctrl-names = "default";
                };
 
                mei@e116000 {