From 7fda29ef57ef189b3ee4b615f3751470a2d2d9db Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Thu, 12 Mar 2020 11:59:04 -0700 Subject: [PATCH] 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 --- asoc/codecs/msm-cdc-pinctrl.c | 4 ++-- soc/pinctrl-lpi.c | 2 +- soc/pinctrl-wcd.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/asoc/codecs/msm-cdc-pinctrl.c b/asoc/codecs/msm-cdc-pinctrl.c index 62e9bfa26344..88121fd1e7d8 100644 --- a/asoc/codecs/msm-cdc-pinctrl.c +++ b/asoc/codecs/msm-cdc-pinctrl.c @@ -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++) diff --git a/soc/pinctrl-lpi.c b/soc/pinctrl-lpi.c index 2b9e52e94308..566013710c20 100644 --- a/soc/pinctrl-lpi.c +++ b/soc/pinctrl-lpi.c @@ -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; diff --git a/soc/pinctrl-wcd.c b/soc/pinctrl-wcd.c index 437563f0a8a0..4b6fb1c93242 100644 --- a/soc/pinctrl-wcd.c +++ b/soc/pinctrl-wcd.c @@ -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; }