aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.4
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2020-04-12 20:58:29 +0800
committerChuanhong Guo <gch981213@gmail.com>2020-04-12 22:29:17 +0800
commitb756ea2a909a36d7e931b96edf0d15539421c733 (patch)
treefcdf71be66cce8bb5a588d1fd972cf4d77c3595f /target/linux/ramips/patches-5.4
parent8f6334eb947a2594da8a2b58cf7afdabb83fb5a0 (diff)
downloadupstream-b756ea2a909a36d7e931b96edf0d15539421c733.tar.gz
upstream-b756ea2a909a36d7e931b96edf0d15539421c733.tar.bz2
upstream-b756ea2a909a36d7e931b96edf0d15539421c733.zip
ramips: replace pinctrl property names
Upstream pinctrl driver in drivers/staging uses groups/function/ralink,num-gpios instead of ralink,group/ralink,function/ralink,nr-gpio Replace these properties in dts as well as the pinctrl driver in patches-4.14. This commit is created using: sed -i 's/ralink,group/groups/g' sed -i 's/ralink,function/function/g' sed -i 's/ralink,nr-gpio/ralink,num-gpios/g' Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
Diffstat (limited to 'target/linux/ramips/patches-5.4')
-rw-r--r--target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch4
-rw-r--r--target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch2
2 files changed, 3 insertions, 3 deletions
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 0bce0b433a..7d5f98f647 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,nr-gpio : Specify the number of GPIOs
++- ralink,num-gpios : 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,nr-gpio = <24>;
++ 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 3d78ef40c6..eae507bcd7 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,nr-gpio", NULL);
++ ngpio = of_get_property(np, "ralink,num-gpios", NULL);
+ if (!ngpio) {
+ dev_err(&pdev->dev, "failed to read number of pins\n");
+ return -EINVAL;