From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 8 Jul 2019 13:24:22 +0000 (+0200)
Subject: lantiq: dts: assign the ASC pins to the serial controller node
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b;p=openwrt%2Fstaging%2Fnbd.git

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 ef57b2f06b..c5dd1600f4 100644
--- 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 0143a21a9c..943b00f898 100644
--- 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 6b5606d8ab..496150b7a7 100644
--- 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 {