Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fda29ef authored by Vignesh Kulothungan's avatar Vignesh Kulothungan
Browse files

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: default avatarVignesh Kulothungan <vigneshk@codeaurora.org>
parent 70561ef6

asoc/codecs/msm-cdc-pinctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -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++)

soc/pinctrl-lpi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

soc/pinctrl-wcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}