From f2b952a657c08e1611593572b0d12bb54aac8736 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 9 Oct 2020 22:45:36 +0200 Subject: [PATCH] ath79: drop redundant gpios on i2c Since "sda-gpios" and "scl-gpios" are only available since kernel 4.19, a few devices have redundantly defined "gpios" to also support older kernels. Since we have nothing older than 4.19 now, we can remove the redundant definitions. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7161_aruba_ap-105.dts | 4 ---- target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts | 4 ---- 2 files changed, 8 deletions(-) diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts index 65c0be073b6..45f77f78914 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts @@ -85,10 +85,6 @@ sda-gpios = <&gpio 5 GPIO_ACTIVE_LOW>; scl-gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - /* can be removed on 4.19 */ - gpios = <&gpio 5 GPIO_ACTIVE_LOW>, - <&gpio 4 GPIO_ACTIVE_LOW>; - #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts index fd587c5da0f..f2cb35eae99 100644 --- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts +++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts @@ -30,10 +30,6 @@ sda-gpios = <&gpio 19 GPIO_ACTIVE_LOW>; scl-gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - /* can be removed on 4.19 */ - gpios = <&gpio 19 GPIO_ACTIVE_LOW>, - <&gpio 15 GPIO_ACTIVE_LOW>; - pcf8563: pcf8563@51 { compatible = "nxp,pcf8563"; reg = <0x51>; -- 2.30.2