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

Commit 17b5273d authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_rt5640: cosmetic fixes 



Reorder variable names, change MCLK test, change quirks
No functional change

Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 02c0a3b3

sound/soc/intel/boards/bytcr_rt5640.c

+36 −37
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
#include <linux/moduleparam.h>

#include <linux/platform_device.h>

#include <linux/acpi.h>

#include <linux/clk.h>

#include <linux/device.h>

#include <linux/dmi.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <asm/platform_sst_audio.h>

#include <linux/clk.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -44,7 +44,7 @@ enum { 
	BYT_RT5640_IN3_MAP,

};



#define BYT_RT5640_MAP(quirk)	((quirk) & 0xff)

#define BYT_RT5640_MAP(quirk)	((quirk) &  GENMASK(7, 0))

#define BYT_RT5640_DMIC_EN	BIT(16)

#define BYT_RT5640_MONO_SPEAKER BIT(17)

#define BYT_RT5640_DIFF_MIC     BIT(18) /* defaut is single-ended */
@@ -178,7 +178,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, 
	}



	if (SND_SOC_DAPM_EVENT_ON(event)) {

		if (priv->mclk) {

		if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {

			ret = clk_prepare_enable(priv->mclk);

			if (ret < 0) {

				dev_err(card->dev,
@@ -199,7 +199,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, 
					     48000 * 512,

					     SND_SOC_CLOCK_IN);

		if (!ret) {

			if (priv->mclk)

			if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN)

				clk_disable_unprepare(priv->mclk);

		}

	}
@@ -376,7 +376,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP |

		.driver_data = (void *)(BYT_RT5640_IN1_MAP |

					BYT_RT5640_MCLK_EN),

	},

	{
@@ -385,12 +385,11 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP |

		.driver_data = (void *)(BYT_RT5640_IN1_MAP |

					BYT_RT5640_MONO_SPEAKER |

					BYT_RT5640_DIFF_MIC |

					BYT_RT5640_SSP0_AIF2 |

						 BYT_RT5640_MCLK_EN

						 ),

					BYT_RT5640_MCLK_EN),

	},

	{

		.callback = byt_rt5640_quirk_cb,
@@ -398,7 +397,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "DellInc."),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Venue 8 Pro 5830"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_DMIC2_MAP |

		.driver_data = (void *)(BYT_RT5640_DMIC2_MAP |

					BYT_RT5640_DMIC_EN |

					BYT_RT5640_MCLK_EN),

	},
@@ -408,7 +407,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP ElitePad 1000 G2"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP |

		.driver_data = (void *)(BYT_RT5640_IN1_MAP |

					BYT_RT5640_MCLK_EN),

	},

	{
@@ -417,7 +416,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_DMIC1_MAP |

		.driver_data = (void *)(BYT_RT5640_DMIC1_MAP |

					BYT_RT5640_DMIC_EN),

	},

	{
@@ -426,7 +425,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_VENDOR, "TECLAST"),

			DMI_MATCH(DMI_BOARD_NAME, "tPAD"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |

		.driver_data = (void *)(BYT_RT5640_IN3_MAP |

					BYT_RT5640_MCLK_EN |

					BYT_RT5640_SSP0_AIF1),

	},
@@ -436,7 +435,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP |

		.driver_data = (void *)(BYT_RT5640_IN1_MAP |

						 BYT_RT5640_MCLK_EN |

						 BYT_RT5640_SSP0_AIF1),
@@ -446,7 +445,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),

		},

		.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |

		.driver_data = (void *)(BYT_RT5640_IN3_MAP |

					BYT_RT5640_MCLK_EN |

					BYT_RT5640_SSP0_AIF1),
@@ -456,12 +455,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 


static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)

{

	int ret;

	struct snd_soc_codec *codec = runtime->codec;

	struct snd_soc_card *card = runtime->card;

	const struct snd_soc_dapm_route *custom_map;

	struct byt_rt5640_private *priv = snd_soc_card_get_drvdata(card);

	struct snd_soc_codec *codec = runtime->codec;

	const struct snd_soc_dapm_route *custom_map;

	int num_routes;

	int ret;



	card->dapm.idle_bias_off = true;
@@ -549,7 +548,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) 
	snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");



	if (priv->mclk) {

	if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {

		/*

		 * The firmware might enable the clock at

		 * boot (this information may or may not
@@ -758,12 +757,12 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ 


static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)

{

	int ret_val = 0;

	struct byt_rt5640_private *priv;

	struct sst_acpi_mach *mach;

	const char *i2c_name = NULL;

	int i;

	int ret_val = 0;

	int dai_index;

	struct byt_rt5640_private *priv;

	int i;



	is_bytcr = false;

	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC);
@@ -786,7 +785,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 


	/* fixup codec name based on HID */

	i2c_name = sst_acpi_find_name_from_hid(mach->id);

	if (i2c_name != NULL) {

	if (i2c_name) {

		snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name),

			"%s%s", "i2c-", i2c_name);