From 731318667d8b11a13bce05e9f877079ae40bea50 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 4 Jul 2024 18:35:50 +0800 Subject: [PATCH] ath79: correct dts ngpios properties SoC Model GPIO number ar7100 12 ar7240 18(unknown, default) ar7241 20 ar7242 18 ar9132 22(unknown, default) ar9331 30 ar934x 23 qca953x 18 qca955x 24 qca956x 23 Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/15784 Signed-off-by: Robert Marko --- target/linux/ath79/dts/ar7100.dtsi | 2 +- target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi | 5 +---- target/linux/ath79/dts/ar7240.dtsi | 4 ++++ target/linux/ath79/dts/ar7242.dtsi | 2 +- target/linux/ath79/dts/ar724x.dtsi | 2 -- target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi | 1 - target/linux/ath79/dts/qca953x.dtsi | 2 +- target/linux/ath79/dts/qca956x.dtsi | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index 6648311619..5237157458 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -67,7 +67,7 @@ reg = <0x18040000 0x28>; interrupts = <2>; - ngpios = <16>; + ngpios = <12>; gpio-controller; #gpio-cells = <2>; diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi index 6ec700f179..41629da750 100644 --- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi +++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi @@ -49,12 +49,9 @@ }; &gpio { - ngpios = <31>; gpio-line-names = "", "", "", "", "LED", "RDY", "", "MDC", - "MDIO", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", ""; + "MDIO", "", "", ""; }; &pcie0 { diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index afbae33a80..eb4b2e4aa3 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -15,6 +15,10 @@ }; }; +&gpio { + ngpios = <18>; +}; + &ahb { usb: usb@1b000000 { compatible = "generic-ohci"; diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi index 96b0442614..aab6c28f7b 100644 --- a/target/linux/ath79/dts/ar7242.dtsi +++ b/target/linux/ath79/dts/ar7242.dtsi @@ -16,7 +16,7 @@ }; &gpio { - ngpios = <20>; + ngpios = <18>; }; &ahb { diff --git a/target/linux/ath79/dts/ar724x.dtsi b/target/linux/ath79/dts/ar724x.dtsi index c758fc244e..7b4bf3e3f2 100644 --- a/target/linux/ath79/dts/ar724x.dtsi +++ b/target/linux/ath79/dts/ar724x.dtsi @@ -60,8 +60,6 @@ reg = <0x18040000 0x28>; interrupts = <2>; - ngpios = <18>; - gpio-controller; #gpio-cells = <2>; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi index f6ff4f3a10..648c3a9c8e 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi +++ b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi @@ -91,7 +91,6 @@ }; &gpio { - ngpios = <17>; gpio-line-names = "","reset-zigbee","reset-zwave","reset", "LED-orange","","","","","","", diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index cc26db5ba2..0e52a80f6e 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -72,7 +72,7 @@ reg = <0x18040000 0x28>; interrupts = <2>; - ngpios = <20>; + ngpios = <18>; gpio-controller; #gpio-cells = <2>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index 8b261568f0..de685d053c 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -61,7 +61,7 @@ reg = <0x18040000 0x28>; interrupts = <2>; - ngpios = <24>; + ngpios = <23>; gpio-controller; #gpio-cells = <2>; -- 2.30.2