diff options
| author | Chuanhong Guo <gch981213@gmail.com> | 2020-04-12 20:58:29 +0800 |
|---|---|---|
| committer | Chuanhong Guo <gch981213@gmail.com> | 2020-04-12 22:29:17 +0800 |
| commit | b756ea2a909a36d7e931b96edf0d15539421c733 (patch) | |
| tree | fcdf71be66cce8bb5a588d1fd972cf4d77c3595f /target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch | |
| parent | 8f6334eb947a2594da8a2b58cf7afdabb83fb5a0 (diff) | |
| download | upstream-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-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch')
| -rw-r--r-- | target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 a374e01b59..497110bb37 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 @@ -156,8 +156,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + struct pinctrl_map **map) +{ + const char *function; -+ int func = of_property_read_string(np, "ralink,function", &function); -+ int grps = of_property_count_strings(np, "ralink,group"); ++ int func = of_property_read_string(np, "function", &function); ++ int grps = of_property_count_strings(np, "groups"); + int i; + + if (func || !grps) @@ -166,7 +166,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + for (i = 0; i < grps; i++) { + const char *group; + -+ of_property_read_string_index(np, "ralink,group", i, &group); ++ of_property_read_string_index(np, "groups", i, &group); + + (*map)->type = PIN_MAP_TYPE_MUX_GROUP; + (*map)->name = function; @@ -186,7 +186,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + struct device_node *np; + + for_each_child_of_node(np_config, np) { -+ int ret = of_property_count_strings(np, "ralink,group"); ++ int ret = of_property_count_strings(np, "groups"); + + if (ret >= 0) + max_maps += ret; @@ -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,nr-gpio", NULL); ++ ngpio = of_get_property(np, "ralink,num-gpios", NULL); + gpiobase = of_get_property(np, "ralink,gpio-base", NULL); + if (!ngpio || !gpiobase) { + dev_err(&pdev->dev, "failed to load chip info\n"); |