aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-07-21 19:32:51 +0200
committerMathias Kresin <dev@kresin.me>2018-08-04 08:39:35 +0200
commitd8e7a526a38499e1d1368829a76e4a0e541893b0 (patch)
treed18096e66ac273ecc83c12eff3219491a1def4fc
parent1bad2b74aea59289c21209aa1d8e5c2ccef74a72 (diff)
downloadupstream-d8e7a526a38499e1d1368829a76e4a0e541893b0.tar.gz
upstream-d8e7a526a38499e1d1368829a76e4a0e541893b0.tar.bz2
upstream-d8e7a526a38499e1d1368829a76e4a0e541893b0.zip
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 <dev@kresin.me>
Diffstat
-rw-r--r--target/linux/ramips/dts/mt7620a.dtsi8
-rw-r--r--target/linux/ramips/dts/mt7620n.dtsi8
-rw-r--r--target/linux/ramips/dts/rt2880.dtsi6
-rw-r--r--target/linux/ramips/dts/rt3050.dtsi6
-rw-r--r--target/linux/ramips/dts/rt3352.dtsi6
-rw-r--r--target/linux/ramips/dts/rt3883.dtsi8
-rw-r--r--target/linux/ramips/dts/rt5350.dtsi4
-rw-r--r--target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch2
-rw-r--r--target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch4
-rw-r--r--target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch2
10 files changed, 27 insertions, 27 deletions
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 ];
diff --git a/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch b/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
index 3e5dac5376..e9a03d93dd 100644
--- a/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
+++ b/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
@@ -482,7 +482,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if (!of_device_is_available(np))
+ continue;
+
-+ ngpio = of_get_property(np, "ralink,num-gpios", NULL);
++ ngpio = of_get_property(np, "ralink,nr-gpio", NULL);
+ gpiobase = of_get_property(np, "ralink,gpio-base", NULL);
+ if (!ngpio || !gpiobase) {
+ dev_err(&pdev->dev, "failed to load chip info\n");
diff --git a/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch
index 7d5f98f647..0bce0b433a 100644
--- a/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch
+++ b/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch
@@ -29,7 +29,7 @@ Cc: linux-gpio@vger.kernel.org
+- reg : Physical base address and length of the controller's registers
+- interrupt-parent: phandle to the INTC device node
+- interrupts : Specify the INTC interrupt number
-+- ralink,num-gpios : Specify the number of GPIOs
++- ralink,nr-gpio : Specify the number of GPIOs
+- ralink,register-map : The register layout depends on the GPIO bank and actual
+ SoC type. Register offsets need to be in this order.
+ [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ]
@@ -51,7 +51,7 @@ Cc: linux-gpio@vger.kernel.org
+ interrupts = <6>;
+
+ 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 ];
diff --git a/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
index 35cedf61fd..eaae0d3d02 100644
--- a/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
+++ b/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
@@ -371,7 +371,7 @@ Cc: linux-gpio@vger.kernel.org
+ return -EINVAL;
+ }
+
-+ ngpio = of_get_property(np, "ralink,num-gpios", NULL);
++ ngpio = of_get_property(np, "ralink,nr-gpio", NULL);
+ if (!ngpio) {
+ dev_err(&pdev->dev, "failed to read number of pins\n");
+ return -EINVAL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 19:15:57 +0000