From 85ca6923bc21a7de031ca9b68e13ecfb4f3debd3 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Mon, 5 Apr 2021 22:53:46 -0700 Subject: ramips: gpio-ralink: use ngpios, not ralink,num-gpios DTS properties that match *-gpios are treated specially. Use ngpios instead, as most GPIO drivers upstream do. Fixes 5.10 DTS errors such as: OF: /palmbus@300000/gpio@600: could not find phandle Fixes DTC warnings such as: Warning (gpios_property): /palmbus@300000/gpio@600:ralink,num-gpios: Could not get phandle node for (cell 0) Signed-off-by: Ilya Lipnitskiy Cc: Daniel Golle --- 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 ++-- .../801-DT-Add-documentation-for-gpio-ralink.patch | 4 ++-- .../802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch | 2 +- .../804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch | 11 +++++++++++ .../0026-DT-Add-documentation-for-gpio-ralink.patch | 4 ++-- ...0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch | 2 +- .../804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch | 11 +++++++++++ 13 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 target/linux/ramips/patches-5.10/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch create mode 100644 target/linux/ramips/patches-5.4/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index afd638a386..c33dd135fe 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -117,8 +117,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -134,8 +134,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <16>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -153,8 +153,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <32>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -172,8 +172,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <1>; ralink,gpio-base = <72>; - ralink,num-gpios = <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 309608adb1..2fac091898 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -102,8 +102,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -119,8 +119,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <16>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -138,8 +138,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <32>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -157,8 +157,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <1>; ralink,gpio-base = <72>; - ralink,num-gpios = <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 b02ef4f465..9dd8f3c6e3 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -81,8 +81,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -95,8 +95,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <16>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -111,8 +111,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <32>; ralink,gpio-base = <40>; - ralink,num-gpios = <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 9ba8a4df36..0cecd5d8cf 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -110,8 +110,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -130,8 +130,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <16>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -146,8 +146,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <12>; ralink,gpio-base = <40>; - ralink,num-gpios = <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 054d2e8450..84d6ed5905 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -108,8 +108,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -127,8 +127,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <16>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -143,8 +143,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <6>; ralink,gpio-base = <40>; - ralink,num-gpios = <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 081b52bfd8..158640bf92 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -117,8 +117,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <0>; - ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -131,8 +131,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <16>; ralink,gpio-base = <24>; - ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -147,8 +147,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <32>; ralink,gpio-base = <40>; - ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -163,8 +163,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <24>; ralink,gpio-base = <72>; - ralink,num-gpios = <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 579d41456b..ac4c6d9db2 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -117,8 +117,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <22>; ralink,gpio-base = <0>; - ralink,num-gpios = <22>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -134,8 +134,8 @@ gpio-controller; #gpio-cells = <2>; + ngpios = <6>; ralink,gpio-base = <22>; - ralink,num-gpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; diff --git a/target/linux/ramips/patches-5.10/801-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-5.10/801-DT-Add-documentation-for-gpio-ralink.patch index 7d5f98f647..93dabf8776 100644 --- a/target/linux/ramips/patches-5.10/801-DT-Add-documentation-for-gpio-ralink.patch +++ b/target/linux/ramips/patches-5.10/801-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 ++- ngpios : 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 ] @@ -50,8 +50,8 @@ Cc: linux-gpio@vger.kernel.org + interrupt-parent = <&intc>; + interrupts = <6>; + ++ ngpios = <24>; + ralink,gpio-base = <0>; -+ ralink,num-gpios = <24>; + ralink,register-map = [ 00 04 08 0c + 20 24 28 2c + 30 34 ]; diff --git a/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index 141d29f940..c173336924 100644 --- a/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -357,7 +357,7 @@ Cc: linux-gpio@vger.kernel.org + return -EINVAL; + } + -+ ngpio = of_get_property(np, "ralink,num-gpios", NULL); ++ ngpio = of_get_property(np, "ngpios", NULL); + if (!ngpio) { + dev_err(&pdev->dev, "failed to read number of pins\n"); + return -EINVAL; diff --git a/target/linux/ramips/patches-5.10/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch b/target/linux/ramips/patches-5.10/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch new file mode 100644 index 0000000000..0d62bd8b03 --- /dev/null +++ b/target/linux/ramips/patches-5.10/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch @@ -0,0 +1,11 @@ +--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c ++++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c +@@ -354,7 +354,7 @@ static int rt2880_pinmux_probe(struct pl + if (!of_device_is_available(np)) + continue; + +- ngpio = of_get_property(np, "ralink,num-gpios", NULL); ++ ngpio = of_get_property(np, "ngpios", 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-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch index 7d5f98f647..93dabf8776 100644 --- a/target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch +++ b/target/linux/ramips/patches-5.4/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 ++- ngpios : 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 ] @@ -50,8 +50,8 @@ Cc: linux-gpio@vger.kernel.org + interrupt-parent = <&intc>; + interrupts = <6>; + ++ ngpios = <24>; + ralink,gpio-base = <0>; -+ ralink,num-gpios = <24>; + ralink,register-map = [ 00 04 08 0c + 20 24 28 2c + 30 34 ]; diff --git a/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index eae507bcd7..525c1976f9 100644 --- a/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -357,7 +357,7 @@ Cc: linux-gpio@vger.kernel.org + return -EINVAL; + } + -+ ngpio = of_get_property(np, "ralink,num-gpios", NULL); ++ ngpio = of_get_property(np, "ngpios", NULL); + if (!ngpio) { + dev_err(&pdev->dev, "failed to read number of pins\n"); + return -EINVAL; diff --git a/target/linux/ramips/patches-5.4/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch b/target/linux/ramips/patches-5.4/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch new file mode 100644 index 0000000000..0d62bd8b03 --- /dev/null +++ b/target/linux/ramips/patches-5.4/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch @@ -0,0 +1,11 @@ +--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c ++++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c +@@ -354,7 +354,7 @@ static int rt2880_pinmux_probe(struct pl + if (!of_device_is_available(np)) + continue; + +- ngpio = of_get_property(np, "ralink,num-gpios", NULL); ++ ngpio = of_get_property(np, "ngpios", NULL); + gpiobase = of_get_property(np, "ralink,gpio-base", NULL); + if (!ngpio || !gpiobase) { + dev_err(&pdev->dev, "failed to load chip info\n"); -- cgit v1.2.3