aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2019-07-08 15:24:22 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-12-22 01:24:23 +0100
commit4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b (patch)
tree76cde5f733d675e123d3f16e422082ed6dc09724 /target/linux
parent8e7b573b7aa4c08c7e838b271677dc68a0db128e (diff)
downloadupstream-4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b.tar.gz
upstream-4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b.tar.bz2
upstream-4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b.zip
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>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts4
-rw-r--r--target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts4
-rw-r--r--target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi9
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 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 {