Unverified Commit 45ea8620 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel: bytcr_rt5651: few cleanups" from Andy Shevchenko... 

Merge series "ASoC: Intel: bytcr_rt5651: few cleanups" from Andy Shevchenko <andriy.shevchenko@linux.intel.com>:

The small set of cleanups against bytcr_rt5651 board file.

In v2:
- added commit message to patch 2 (Joe, Pierre)
- added cover letter (Pierre)
- added Hans to Cc list (Hans)

Andy Shevchenko (4):
  ASoC: Intel: bytcr_rt5651: Get platform data via dev_get_platdata()
  ASoC: Intel: bytcr_rt5651: Use temporary variable for struct device
  ASoC: Intel: bytcr_rt5651: use devm_clk_get_optional() for mclk
  ASoC: Intel: bytcr_rt5651: Utilize dev_err_probe() to avoid log
    saturation

 sound/soc/intel/boards/bytcr_rt5651.c | 118 +++++++++++---------------
 1 file changed, 50 insertions(+), 68 deletions(-)

--
2.33.0
parents ee233500 45c5dc45

sound/soc/intel/boards/bytcr_rt5651.c

+50 −68
Original line number Diff line number Diff line
@@ -188,14 +188,11 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, 
	}



	if (SND_SOC_DAPM_EVENT_ON(event)) {

		if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {

		ret = clk_prepare_enable(priv->mclk);

		if (ret < 0) {

				dev_err(card->dev,

					"could not configure MCLK state");

			dev_err(card->dev, "could not configure MCLK state");

			return ret;

		}

		}

		ret = byt_rt5651_prepare_and_enable_pll1(codec_dai, 48000, 50);

	} else {

		/*
@@ -207,7 +204,6 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, 
					     48000 * 512,

					     SND_SOC_CLOCK_IN);

		if (!ret)

			if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN)

			clk_disable_unprepare(priv->mclk);

	}
@@ -629,15 +625,12 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) 
		return ret;

	}



	if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {

	/*

		 * The firmware might enable the clock at

		 * boot (this information may or may not

		 * be reflected in the enable clock register).

		 * To change the rate we must disable the clock

		 * first to cover these cases. Due to common

		 * clock framework restrictions that do not allow

		 * to disable a clock that has not been enabled,

	 * The firmware might enable the clock at boot (this information

	 * may or may not be reflected in the enable clock register).

	 * To change the rate we must disable the clock first to cover

	 * these cases. Due to common clock framework restrictions that

	 * do not allow to disable a clock that has not been enabled,

	 * we need to enable the clock first.

	 */

	ret = clk_prepare_enable(priv->mclk);
@@ -651,7 +644,6 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) 


	if (ret)

		dev_err(card->dev, "unable to set MCLK rate\n");

	}



	report = 0;

	if (BYT_RT5651_JDSRC(byt_rt5651_quirk))
@@ -894,9 +886,10 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ 


static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	static const char * const mic_name[] = { "dmic", "in1", "in2", "in12" };

	struct snd_soc_acpi_mach *mach = dev_get_platdata(dev);

	struct byt_rt5651_private *priv;

	struct snd_soc_acpi_mach *mach;

	const char *platform_name;

	struct acpi_device *adev;

	struct device *codec_dev;
@@ -906,14 +899,12 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	int dai_index = 0;

	int i;



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	/* register the soc card */

	byt_rt5651_card.dev = &pdev->dev;



	mach = byt_rt5651_card.dev->platform_data;

	byt_rt5651_card.dev = dev;

	snd_soc_card_set_drvdata(&byt_rt5651_card, priv);



	/* fix index of codec dai */
@@ -933,7 +924,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
		put_device(&adev->dev);

		byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		dev_err(dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENXIO;

	}
@@ -981,13 +972,13 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
							       &pkg_ctx);

		if (pkg_found) {

			if (chan_package.aif_value == 1) {

				dev_info(&pdev->dev, "BIOS Routing: AIF1 connected\n");

				dev_info(dev, "BIOS Routing: AIF1 connected\n");

				byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF1;

			} else  if (chan_package.aif_value == 2) {

				dev_info(&pdev->dev, "BIOS Routing: AIF2 connected\n");

				dev_info(dev, "BIOS Routing: AIF2 connected\n");

				byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF2;

			} else {

				dev_info(&pdev->dev, "BIOS Routing isn't valid, ignored\n");

				dev_info(dev, "BIOS Routing isn't valid, ignored\n");

				pkg_found = false;

			}

		}
@@ -1002,7 +993,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	dmi_check_system(byt_rt5651_quirk_table);



	if (quirk_override != -1) {

		dev_info(&pdev->dev, "Overriding quirk 0x%lx => 0x%x\n",

		dev_info(dev, "Overriding quirk 0x%lx => 0x%x\n",

			 byt_rt5651_quirk, quirk_override);

		byt_rt5651_quirk = quirk_override;

	}
@@ -1018,8 +1009,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 


	if (byt_rt5651_gpios) {

		devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios);

		priv->ext_amp_gpio = devm_fwnode_gpiod_get(&pdev->dev,

							   codec_dev->fwnode,

		priv->ext_amp_gpio = devm_fwnode_gpiod_get(dev, codec_dev->fwnode,

							   "ext-amp-enable",

							   GPIOD_OUT_LOW,

							   "speaker-amp");
@@ -1030,15 +1020,13 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
				priv->ext_amp_gpio = NULL;

				break;

			default:

				dev_err(&pdev->dev, "Failed to get ext-amp-enable GPIO: %d\n",

					ret_val);

				dev_err(dev, "Failed to get ext-amp-enable GPIO: %d\n", ret_val);

				fallthrough;

			case -EPROBE_DEFER:

				goto err;

			}

		}

		priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev,

							codec_dev->fwnode,

		priv->hp_detect = devm_fwnode_gpiod_get(dev, codec_dev->fwnode,

							"hp-detect",

							GPIOD_IN,

							"hp-detect");
@@ -1049,8 +1037,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
				priv->hp_detect = NULL;

				break;

			default:

				dev_err(&pdev->dev, "Failed to get hp-detect GPIO: %d\n",

					ret_val);

				dev_err(dev, "Failed to get hp-detect GPIO: %d\n", ret_val);

				fallthrough;

			case -EPROBE_DEFER:

				goto err;
@@ -1058,7 +1045,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
		}

	}



	log_quirks(&pdev->dev);

	log_quirks(dev);



	if ((byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) ||

	    (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2))
@@ -1069,22 +1056,19 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
		byt_rt5651_dais[dai_index].cpus->dai_name = "ssp0-port";



	if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {

		priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");

		priv->mclk = devm_clk_get_optional(dev, "pmc_plt_clk_3");

		if (IS_ERR(priv->mclk)) {

			ret_val = PTR_ERR(priv->mclk);

			dev_err(&pdev->dev,

				"Failed to get MCLK from pmc_plt_clk_3: %d\n",

				ret_val);

			ret_val = dev_err_probe(dev, PTR_ERR(priv->mclk),

						"Failed to get MCLK from pmc_plt_clk_3\n");

			goto err;

		}

		/*

			 * Fall back to bit clock usage for -ENOENT (clock not

			 * available likely due to missing dependencies), bail

			 * for all other errors, including -EPROBE_DEFER

		 * Fall back to bit clock usage when clock is not

		 * available likely due to missing dependencies.

		 */

			if (ret_val != -ENOENT)

				goto err;

		if (!priv->mclk)

			byt_rt5651_quirk &= ~BYT_RT5651_MCLK_EN;

	}

	}



	snprintf(byt_rt5651_components, sizeof(byt_rt5651_components),

		 "cfg-spk:%s cfg-mic:%s%s",
@@ -1112,7 +1096,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	if (ret_val)

		goto err;



	sof_parent = snd_soc_acpi_sof_parent(&pdev->dev);

	sof_parent = snd_soc_acpi_sof_parent(dev);



	/* set card and driver name */

	if (sof_parent) {
@@ -1125,13 +1109,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 


	/* set pm ops */

	if (sof_parent)

		pdev->dev.driver->pm = &snd_soc_pm_ops;



	ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5651_card);

		dev->driver->pm = &snd_soc_pm_ops;



	ret_val = devm_snd_soc_register_card(dev, &byt_rt5651_card);

	if (ret_val) {

		dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",

			ret_val);

		dev_err(dev, "devm_snd_soc_register_card failed %d\n", ret_val);

		goto err;

	}

	platform_set_drvdata(pdev, &byt_rt5651_card);