ASoC: codecs: update gpio property name
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:
parent
70561ef6c1
commit
7fda29ef57
@ -277,10 +277,10 @@ static int msm_cdc_pinctrl_probe(struct platform_device *pdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
cdc_tlmm_gpio:
|
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)
|
if (count <= 0)
|
||||||
goto cdc_rst;
|
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)) {
|
tlmm_gpio, count)) {
|
||||||
gpio_data->wakeup_capable = true;
|
gpio_data->wakeup_capable = true;
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
|
@ -635,7 +635,7 @@ static int lpi_pinctrl_probe(struct platform_device *pdev)
|
|||||||
return ret;
|
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)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -273,10 +273,10 @@ static int wcd_pinctrl_probe(struct platform_device *pdev)
|
|||||||
u32 npins;
|
u32 npins;
|
||||||
char **name;
|
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) {
|
if (ret) {
|
||||||
dev_err(dev, "%s: Looking up %s property in node %s failed\n",
|
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;
|
ret = -EINVAL;
|
||||||
goto err_priv_alloc;
|
goto err_priv_alloc;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user