From 4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 15:24:22 +0200 Subject: [PATCH] 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 --- .../linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts | 4 ---- .../linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts | 4 ---- .../linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi | 9 +++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) 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 ef57b2f06bfb..c5dd1600f4f6 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 0143a21a9cd9..943b00f898d1 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 6b5606d8ab3d..496150b7a7e8 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 { -- 2.30.2