From 008db6b970613d291b245d95734e3e42b5455f6c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 3 Jul 2020 17:21:12 +0200 Subject: [PATCH] ath79: enable gpio on ar933x by default All other SoC DTSI files have gpio enabled by default, only ar9330/ar9331 disable it by default, only to have it enabled again afterwards for each individual device. So, do not disable it in the first place, and drop all device-specific status statements afterwards. Though this is a cosmetic commit, it might be a pitfall for device-support backporters if missing. Since backporting it is trivial, let's just do it. Signed-off-by: Adrian Schmutzler (cherry picked from commit dc1280ef652c6522269c7a864810c19362d33dc4) --- target/linux/ath79/dts/ar9330.dtsi | 2 -- target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts | 4 ---- target/linux/ath79/dts/ar9330_pqi_air-pen.dts | 4 ---- target/linux/ath79/dts/ar9331_8dev_carambola2.dts | 4 ---- target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts | 4 ---- target/linux/ath79/dts/ar9331_etactica_eg200.dts | 4 ---- target/linux/ath79/dts/ar9331_pisen_wmm003n.dts | 4 ---- target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts | 4 ---- target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts | 4 ---- target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi | 4 ---- target/linux/ath79/dts/ar9331_tplink_tl-wr710n-v1.dts | 4 ---- target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi | 4 ---- 12 files changed, 46 deletions(-) diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 64c135405b..6ccb30c9a1 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -57,8 +57,6 @@ interrupt-controller; #interrupt-cells = <2>; - - status = "disabled"; }; pinmux: pinmux@18040028 { diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts index c5f559bb36..30c9c77c27 100644 --- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts +++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts @@ -67,10 +67,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts index 06f728b267..cd66162366 100644 --- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts +++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts @@ -56,10 +56,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts index eb8ea3b20c..4ccd774575 100644 --- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts +++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts @@ -53,10 +53,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index 88b48faf89..cf800e78f7 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -49,10 +49,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts index 708e9defa4..eef47b0a4e 100644 --- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts +++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts @@ -56,10 +56,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts index b3bc2e4c45..2fed9b398b 100644 --- a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts +++ b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts @@ -102,10 +102,6 @@ compatible = "syscon", "simple-mfd"; }; -&gpio { - status = "okay"; -}; - &uart { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts index 9182374235..91c201b254 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts @@ -90,10 +90,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts index 6fc4b6868b..cd372c240e 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts @@ -86,10 +86,6 @@ status = "okay"; }; -&gpio { - status = "okay"; -}; - &usb { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi index ffd3d71a62..779e0aa895 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi @@ -99,10 +99,6 @@ compatible = "syscon", "simple-mfd"; }; -&gpio { - status = "okay"; -}; - &uart { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-v1.dts index 056e9fa512..c037015e4c 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-v1.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-v1.dts @@ -105,10 +105,6 @@ mtd-mac-address-increment = <(-1)>; }; -&gpio { - status = "okay"; -}; - &uart { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi index e4b59f1591..c439a372db 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi @@ -141,10 +141,6 @@ mtd-mac-address-increment = <(-1)>; }; -&gpio { - status = "okay"; -}; - &uart { status = "okay"; }; -- 2.30.2