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

Commit 57a19bfe authored by Banajit Goswami's avatar Banajit Goswami
Browse files

ASoC: msm: 8084: remove unused code for MCLK GPIO 



Codec MCLK for APQ8084 devices are supplied from PMIC using
PMIC GPIO 15. This GPIO is controlled from PMIC code itself. Remove
the unused code to set PMIC GPIO 15 for codec MCLK.

Change-Id: I04db0d9ad4962169835649cb1ea42796128aeecb
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent d6e87cbf

arch/arm/boot/dts/apq8084.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,6 @@ 
			"DMIC6", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic6";



		qcom,cdc-mclk-gpios = <&pma8084_gpios 15 0>;

		qcom,taiko-mclk-clk-freq = <9600000>;

		qcom,prim-auxpcm-gpio-clk  = <&msmgpio 87 0>;

		qcom,prim-auxpcm-gpio-sync = <&msmgpio 88 0>;

sound/soc/msm/apq8084.c

+0 −40
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ struct msm_auxpcm_ctrl { 
};



struct apq8084_asoc_mach_data {

	int mclk_gpio;

	u32 mclk_freq;

	int us_euro_gpio;

	struct msm_auxpcm_ctrl *pri_auxpcm_ctrl;
@@ -2719,23 +2718,6 @@ err: 
	return ret;

}



static int apq8084_prepare_codec_mclk(struct snd_soc_card *card)

{

	struct apq8084_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);

	int ret;



	if (pdata->mclk_gpio) {

		ret = gpio_request(pdata->mclk_gpio, "TAIKO_CODEC_PMIC_MCLK");

		if (ret) {

			dev_err(card->dev,

				"%s: Failed to request taiko mclk gpio %d\n",

				__func__, pdata->mclk_gpio);

			return ret;

		}

	}

	return 0;

}



static int apq8084_prepare_us_euro(struct snd_soc_card *card)

{

	struct apq8084_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);
@@ -2801,21 +2783,6 @@ static int apq8084_asoc_machine_probe(struct platform_device *pdev) 
		goto err;

	}



	pdata->mclk_gpio = of_get_named_gpio(pdev->dev.of_node,

				"qcom,cdc-mclk-gpios", 0);

	if (pdata->mclk_gpio < 0) {

		dev_err(&pdev->dev,

			"Looking up %s property in node %s failed %d\n",

			"qcom, cdc-mclk-gpios", pdev->dev.of_node->full_name,

			pdata->mclk_gpio);

		ret = -ENODEV;

		goto err;

	}



	ret = apq8084_prepare_codec_mclk(card);

	if (ret)

		goto err;



	if (of_property_read_bool(pdev->dev.of_node, "qcom,hdmi-audio-rx")) {

		dev_info(&pdev->dev, "%s(): hdmi audio support present\n",

				__func__);
@@ -2918,12 +2885,6 @@ static int apq8084_asoc_machine_probe(struct platform_device *pdev) 
	return 0;



err:

	if (pdata->mclk_gpio > 0) {

		dev_dbg(&pdev->dev, "%s free gpio %d\n",

			__func__, pdata->mclk_gpio);

		gpio_free(pdata->mclk_gpio);

		pdata->mclk_gpio = 0;

	}

	if (pdata->us_euro_gpio > 0) {

		dev_dbg(&pdev->dev, "%s free us_euro gpio %d\n",

			__func__, pdata->us_euro_gpio);
@@ -2946,7 +2907,6 @@ static int apq8084_asoc_machine_remove(struct platform_device *pdev) 
	if (gpio_is_valid(ext_ult_spk_amp_gpio))

		gpio_free(ext_ult_spk_amp_gpio);



	gpio_free(pdata->mclk_gpio);

	gpio_free(pdata->us_euro_gpio);

	if (gpio_is_valid(ext_spk_amp_gpio))

		gpio_free(ext_spk_amp_gpio);