From d8e7a526a38499e1d1368829a76e4a0e541893b0 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sat, 21 Jul 2018 19:32:51 +0200 Subject: ramips: use ralink,nr-gpio instead of ralink,num-gpios Since commit c1e7738988f5 ("checks: add gpio binding properties check") dtc treats any *-gpios and *-gpio property as phandle at least during checks. The only whitelisted property is nr-gpio. Use ralink,nr-gpio in favour of ralink,num-gpios to get rid of false positive warnings. Signed-off-by: Mathias Kresin --- target/linux/ramips/dts/mt7620a.dtsi | 8 ++++---- target/linux/ramips/dts/mt7620n.dtsi | 8 ++++---- target/linux/ramips/dts/rt2880.dtsi | 6 +++--- target/linux/ramips/dts/rt3050.dtsi | 6 +++--- target/linux/ramips/dts/rt3352.dtsi | 6 +++--- target/linux/ramips/dts/rt3883.dtsi | 8 ++++---- target/linux/ramips/dts/rt5350.dtsi | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'target/linux/ramips/dts') diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 262932f959..39e5227d12 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -133,7 +133,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; + ralink,nr-gpio = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -152,7 +152,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; + ralink,nr-gpio = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -171,7 +171,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,num-gpios = <1>; + ralink,nr-gpio = <1>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index ff9f31e79c..874d8c42c9 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -101,7 +101,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -118,7 +118,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; + ralink,nr-gpio = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -137,7 +137,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; + ralink,nr-gpio = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -156,7 +156,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,num-gpios = <1>; + ralink,nr-gpio = <1>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 184526ff96..0d7a97fafb 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -80,7 +80,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -94,7 +94,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; + ralink,nr-gpio = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -110,7 +110,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; + ralink,nr-gpio = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index c13d9ef805..75f1229c92 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -109,7 +109,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -129,7 +129,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; + ralink,nr-gpio = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -145,7 +145,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,num-gpios = <12>; + ralink,nr-gpio = <12>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index db0eda9fe8..a609afd73d 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -107,7 +107,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -126,7 +126,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; + ralink,nr-gpio = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -142,7 +142,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,num-gpios = <6>; + ralink,nr-gpio = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index a7143388e3..b2ce93b8cf 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -130,7 +130,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; + ralink,nr-gpio = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -146,7 +146,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; + ralink,nr-gpio = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -162,7 +162,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,num-gpios = <24>; + ralink,nr-gpio = <24>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index d2be76f319..f14162a588 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,num-gpios = <22>; + ralink,nr-gpio = <22>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -133,7 +133,7 @@ #gpio-cells = <2>; ralink,gpio-base = <22>; - ralink,num-gpios = <6>; + ralink,nr-gpio = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; -- cgit v1.2.3