lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: codecs: update gpio property name

Browse Source 
From kernel 5.4, device node properties with
-gpio/-gpios suffix in the name is expected to define
gpio node properities like "#gpio-cells".
Update non-gpio property names to not have -gpio/-gpios
suffix.

Change-Id: I63fc81ce16c4e9705a08a3762aa91c7cacd174b5
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
This commit is contained in:
Vignesh Kulothungan 2020-03-12 11:59:04 -07:00
parent 70561ef6c1
commit 7fda29ef57
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asoc/codecs/msm-cdc-pinctrl.c
View File

@ -277,10 +277,10 @@ static int msm_cdc_pinctrl_probe(struct platform_device *pdev)
}
cdc_tlmm_gpio:
count = of_property_count_u32_elems(pdev->dev.of_node, "qcom,tlmm-gpio");
count = of_property_count_u32_elems(pdev->dev.of_node, "qcom,tlmm-pins");
if (count <= 0)
goto cdc_rst;
if (!of_property_read_u32_array(pdev->dev.of_node, "qcom,tlmm-gpio",
if (!of_property_read_u32_array(pdev->dev.of_node, "qcom,tlmm-pins",
tlmm_gpio, count)) {
gpio_data->wakeup_capable = true;
for (i = 0; i < count; i++)

2
soc/pinctrl-lpi.c
View File

@ -635,7 +635,7 @@ static int lpi_pinctrl_probe(struct platform_device *pdev)
return ret;
}
ret = of_property_read_u32(dev->of_node, "qcom,num-gpios", &npins);
ret = of_property_read_u32(dev->of_node, "qcom,gpios-count", &npins);
if (ret < 0)
return ret;

4
soc/pinctrl-wcd.c
View File

@ -273,10 +273,10 @@ static int wcd_pinctrl_probe(struct platform_device *pdev)
u32 npins;
char **name;
ret = of_property_read_u32(dev->of_node, "qcom,num-gpios", &npins);
ret = of_property_read_u32(dev->of_node, "qcom,gpios-count", &npins);
if (ret) {
dev_err(dev, "%s: Looking up %s property in node %s failed\n",
__func__, "qcom,num-gpios", dev->of_node->full_name);
__func__, "qcom,gpios-count", dev->of_node->full_name);
ret = -EINVAL;
goto err_priv_alloc;
}