From b756ea2a909a36d7e931b96edf0d15539421c733 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sun, 12 Apr 2020 20:58:29 +0800 Subject: 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 --- .../patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch') 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 + 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 + 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 + 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 + 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"); -- cgit v1.2.3