KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: use ralink,nr-gpio instead of ralink,num-gpios

Browse source 
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>
This commit is contained in:
Mathias Kresin 2018-07-21 19:32:51 +02:00
parent 1bad2b74ae
commit d8e7a526a3
10 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/ramips/dts/mt7620a.dtsi
View file

@ -116,7 +116,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -133,7 +133,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <24>; ralink,gpio-base = <24>;
ralink,num-gpios = <16>; ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -152,7 +152,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <40>; ralink,gpio-base = <40>;
ralink,num-gpios = <32>; ralink,nr-gpio = <32>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -171,7 +171,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <72>; ralink,gpio-base = <72>;
ralink,num-gpios = <1>; ralink,nr-gpio = <1>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

8
target/linux/ramips/dts/mt7620n.dtsi
View file

@ -101,7 +101,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -118,7 +118,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <24>; ralink,gpio-base = <24>;
ralink,num-gpios = <16>; ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -137,7 +137,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <40>; ralink,gpio-base = <40>;
ralink,num-gpios = <32>; ralink,nr-gpio = <32>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -156,7 +156,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <72>; ralink,gpio-base = <72>;
ralink,num-gpios = <1>; ralink,nr-gpio = <1>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

6
target/linux/ramips/dts/rt2880.dtsi
View file

@ -80,7 +80,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -94,7 +94,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <24>; ralink,gpio-base = <24>;
ralink,num-gpios = <16>; ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -110,7 +110,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <40>; ralink,gpio-base = <40>;
ralink,num-gpios = <32>; ralink,nr-gpio = <32>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

6
target/linux/ramips/dts/rt3050.dtsi
View file

@ -109,7 +109,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -129,7 +129,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <24>; ralink,gpio-base = <24>;
ralink,num-gpios = <16>; ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -145,7 +145,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <40>; ralink,gpio-base = <40>;
ralink,num-gpios = <12>; ralink,nr-gpio = <12>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

6
target/linux/ramips/dts/rt3352.dtsi
View file

@ -107,7 +107,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -126,7 +126,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <24>; ralink,gpio-base = <24>;
ralink,num-gpios = <16>; ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -142,7 +142,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <40>; ralink,gpio-base = <40>;
ralink,num-gpios = <6>; ralink,nr-gpio = <6>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

8
target/linux/ramips/dts/rt3883.dtsi
View file

@ -116,7 +116,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -130,7 +130,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <24>; ralink,gpio-base = <24>;
ralink,num-gpios = <16>; ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -146,7 +146,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <40>; ralink,gpio-base = <40>;
ralink,num-gpios = <32>; ralink,nr-gpio = <32>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];
@ -162,7 +162,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <72>; ralink,gpio-base = <72>;
ralink,num-gpios = <24>; ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

4
target/linux/ramips/dts/rt5350.dtsi
View file

@ -116,7 +116,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <0>; ralink,gpio-base = <0>;
ralink,num-gpios = <22>; ralink,nr-gpio = <22>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
20 24 28 2c 20 24 28 2c
30 34 ]; 30 34 ];
@ -133,7 +133,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
ralink,gpio-base = <22>; ralink,gpio-base = <22>;
ralink,num-gpios = <6>; ralink,nr-gpio = <6>;
ralink,register-map = [ 00 04 08 0c ralink,register-map = [ 00 04 08 0c
10 14 18 1c 10 14 18 1c
20 24 ]; 20 24 ];

2
target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
View file

@ -482,7 +482,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if (!of_device_is_available(np)) + if (!of_device_is_available(np))
+ continue; + 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); + gpiobase = of_get_property(np, "ralink,gpio-base", NULL);
+ if (!ngpio || !gpiobase) { + if (!ngpio || !gpiobase) {
+ dev_err(&pdev->dev, "failed to load chip info\n"); + dev_err(&pdev->dev, "failed to load chip info\n");

4
target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch
View file

@ -29,7 +29,7 @@ Cc: linux-gpio@vger.kernel.org
+- reg : Physical base address and length of the controller's registers +- reg : Physical base address and length of the controller's registers
+- interrupt-parent: phandle to the INTC device node +- interrupt-parent: phandle to the INTC device node
+- interrupts : Specify the INTC interrupt number +- 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 +- ralink,register-map : The register layout depends on the GPIO bank and actual
+ SoC type. Register offsets need to be in this order. + SoC type. Register offsets need to be in this order.
+ [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ] + [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ]
@ -51,7 +51,7 @@ Cc: linux-gpio@vger.kernel.org
+ interrupts = <6>; + interrupts = <6>;
+ +
+ ralink,gpio-base = <0>; + ralink,gpio-base = <0>;
+ ralink,num-gpios = <24>; + ralink,nr-gpio = <24>;
+ ralink,register-map = [ 00 04 08 0c + ralink,register-map = [ 00 04 08 0c
+ 20 24 28 2c + 20 24 28 2c
+ 30 34 ]; + 30 34 ];

2
target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
View file

@ -371,7 +371,7 @@ Cc: linux-gpio@vger.kernel.org
+ return -EINVAL; + return -EINVAL;
+ } + }
+ +
+ ngpio = of_get_property(np, "ralink,num-gpios", NULL); + ngpio = of_get_property(np, "ralink,nr-gpio", NULL);
+ if (!ngpio) { + if (!ngpio) {
+ dev_err(&pdev->dev, "failed to read number of pins\n"); + dev_err(&pdev->dev, "failed to read number of pins\n");
+ return -EINVAL; + return -EINVAL;