Skip to content

Commit

Permalink
ASoC: soc-dai: Add sysclk source to snd_soc_dai_set_sysclk()
Browse files Browse the repository at this point in the history
The snd_soc_dai_set_sysclk() does not take any argument for system clock
(sysclk) source. It has "clk_id" argument which some drivers use for
describing sysclk source and others use it to identify a specific clock.
Hence there seems to be an inconsistency in the way "clk_id" is used.
Few such examples below:
  - sound/soc/atmel/sam9g20_wm8731.c      (clk_id used as sysclk source)
  - sound/soc/atmel/sam9x5_wm8731.c       (clk_id used as sysclk source)
  - sound/soc/intel/boards/bytcr_wm5102.c (clk_id used to identify specific
    clock)

Moreover snd_soc_component_set_sysclk() has both "clk_id" and "source"
argument. This is invoked by snd_soc_dai_set_sysclk() which hard codes
the "source" field for the component to 0. There is no way to propagate
sysclk source info to the component from snd_soc_dai_set_sysclk().

To allow selection of a particular source for sysclk, when a device has
multiple sources for it, and to address above, "source" argument is added
to snd_soc_dai_set_sysclk(). This is reflected across all the drivers
where this callback is used. These drivers continue to use the way they
have been using "clk_id". Though ideally we should have a consistent usage
for it and this is not in the scope of current patch to fix that.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
  • Loading branch information
pujars authored and intel-lab-lkp committed Feb 25, 2021
1 parent 96fb9e6 commit 226d9af
Show file tree
Hide file tree
Showing 268 changed files with 380 additions and 377 deletions.
4 changes: 2 additions & 2 deletions include/sound/soc-dai.h
Expand Up @@ -119,7 +119,7 @@ struct snd_soc_dai;
struct snd_ac97_bus_ops;

/* Digital Audio Interface clocking API.*/
int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, int source,
unsigned int freq, int dir);

int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
Expand Down Expand Up @@ -226,7 +226,7 @@ struct snd_soc_dai_ops {
* Called by soc_card drivers, normally in their hw_params.
*/
int (*set_sysclk)(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir);
int clk_id, int source, unsigned int freq, int dir);
int (*set_pll)(struct snd_soc_dai *dai, int pll_id, int source,
unsigned int freq_in, unsigned int freq_out);
int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/amd/acp-da7219-max98357a.c
Expand Up @@ -59,7 +59,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)

dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);

ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK,
ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 0,
CZ_PLAT_CLK, SND_SOC_CLOCK_IN);
if (ret < 0) {
dev_err(rtd->dev, "can't set codec sysclk: %d\n", ret);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/amd/acp-rt5645.c
Expand Up @@ -57,7 +57,7 @@ static int cz_aif1_hw_params(struct snd_pcm_substream *substream,
return ret;
}

ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1,
ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, 0,
params_rate(params) * 512, SND_SOC_CLOCK_OUT);
if (ret < 0) {
dev_err(rtd->dev, "can't set codec sysclk: %d\n", ret);
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/amd/acp3x-rt5682-max9836.c
Expand Up @@ -67,7 +67,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd)
}

/* Set codec sysclk */
ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL2,
ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL2, 0,
RT5682_PLL_FREQ, SND_SOC_CLOCK_IN);
if (ret < 0) {
dev_err(rtd->dev,
Expand Down Expand Up @@ -145,7 +145,7 @@ static int acp3x_1015_hw_params(struct snd_pcm_substream *substream,
64 * srate, 256 * srate);
if (ret < 0)
return ret;
ret = snd_soc_dai_set_sysclk(codec_dai, RT1015_SCLK_S_PLL,
ret = snd_soc_dai_set_sysclk(codec_dai, RT1015_SCLK_S_PLL, 0,
256 * srate, SND_SOC_CLOCK_IN);
if (ret < 0)
return ret;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/atmel/atmel_wm8904.c
Expand Up @@ -42,7 +42,7 @@ static int atmel_asoc_wm8904_hw_params(struct snd_pcm_substream *substream,
* so calling set_sysclk won't care freq parameter
* then we pass 0
*/
ret = snd_soc_dai_set_sysclk(codec_dai, WM8904_CLK_FLL,
ret = snd_soc_dai_set_sysclk(codec_dai, WM8904_CLK_FLL, 0,
0, SND_SOC_CLOCK_IN);
if (ret < 0) {
pr_err("%s -failed to set wm8904 SYSCLK\n", __func__);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/atmel/mchp-i2s-mcc.c
Expand Up @@ -289,7 +289,7 @@ static irqreturn_t mchp_i2s_mcc_interrupt(int irq, void *dev_id)
}

static int mchp_i2s_mcc_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct mchp_i2s_mcc_dev *dev = snd_soc_dai_get_drvdata(dai);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/atmel/mikroe-proto.c
Expand Up @@ -24,7 +24,7 @@ static int snd_proto_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

/* Set proto sysclk */
int ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
int ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, 0,
XTAL_RATE, SND_SOC_CLOCK_IN);
if (ret < 0) {
dev_err(card->dev, "Failed to set WM8731 SYSCLK: %d\n",
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/atmel/sam9g20_wm8731.c
Expand Up @@ -102,7 +102,7 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)

dev_dbg(dev, "%s called\n", __func__);

ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK,
ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK, 0,
MCLK_RATE, SND_SOC_CLOCK_IN);
if (ret < 0) {
dev_err(dev, "Failed to set WM8731 SYSCLK: %d\n", ret);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/atmel/sam9x5_wm8731.c
Expand Up @@ -47,7 +47,7 @@ static int sam9x5_wm8731_init(struct snd_soc_pcm_runtime *rtd)
dev_dbg(dev, "%s called\n", __func__);

/* set the codec system clock for DAC and ADC */
ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, 0,
MCLK_RATE, SND_SOC_CLOCK_IN);
if (ret < 0) {
dev_err(dev, "Failed to set WM8731 SYSCLK: %d\n", ret);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/bcm/cygnus-ssp.c
Expand Up @@ -713,7 +713,7 @@ static int cygnus_ssp_hw_params(struct snd_pcm_substream *substream,
* This function sets the mclk frequency for pll clock
*/
static int cygnus_ssp_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
int sel;
u32 value;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/cirrus/edb93xx.c
Expand Up @@ -38,7 +38,7 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream,
else
mclk_rate = rate * 64 * 2;

err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate,
err = snd_soc_dai_set_sysclk(codec_dai, 0, 0, mclk_rate,
SND_SOC_CLOCK_IN);
if (err)
return err;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/cirrus/ep93xx-i2s.c
Expand Up @@ -352,7 +352,7 @@ static int ep93xx_i2s_hw_params(struct snd_pcm_substream *substream,
return 0;
}

static int ep93xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
static int ep93xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id, int source,
unsigned int freq, int dir)
{
struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(cpu_dai);
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/cirrus/snappercl15.c
Expand Up @@ -27,12 +27,12 @@ static int snappercl15_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
int err;

err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK,
err = snd_soc_dai_set_sysclk(codec_dai, 0, 0, CODEC_CLOCK,
SND_SOC_CLOCK_IN);
if (err)
return err;

err = snd_soc_dai_set_sysclk(cpu_dai, 0, CODEC_CLOCK,
err = snd_soc_dai_set_sysclk(cpu_dai, 0, 0, CODEC_CLOCK,
SND_SOC_CLOCK_OUT);
if (err)
return err;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/88pm860x-codec.c
Expand Up @@ -999,7 +999,7 @@ static int pm860x_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai,
}

static int pm860x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ad193x.c
Expand Up @@ -279,7 +279,7 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
}

static int ad193x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/adau1373.c
Expand Up @@ -1155,7 +1155,7 @@ static int adau1373_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
}

static int adau1373_set_dai_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct adau1373 *adau1373 = snd_soc_component_get_drvdata(dai->component);
struct adau1373_dai *adau1373_dai = &adau1373->dais[dai->id];
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/adau17x1.c
Expand Up @@ -371,7 +371,7 @@ static int adau17x1_set_dai_pll(struct snd_soc_dai *dai, int pll_id,
}

static int adau17x1_set_dai_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(dai->component);
struct adau *adau = snd_soc_component_get_drvdata(dai->component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4535.c
Expand Up @@ -246,7 +246,7 @@ static const struct snd_soc_dapm_route ak4535_audio_map[] = {
};

static int ak4535_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct ak4535_priv *ak4535 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4613.c
Expand Up @@ -312,7 +312,7 @@ static int ak4613_dai_startup(struct snd_pcm_substream *substream,
}

static int ak4613_dai_set_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct ak4613_priv *priv = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4641.c
Expand Up @@ -302,7 +302,7 @@ static const struct snd_soc_dapm_route ak4641_audio_map[] = {
};

static int ak4641_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct ak4641_priv *ak4641 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4642.c
Expand Up @@ -333,7 +333,7 @@ static void ak4642_dai_shutdown(struct snd_pcm_substream *substream,
}

static int ak4642_dai_set_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct ak4642_priv *priv = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4671.c
Expand Up @@ -465,7 +465,7 @@ static int ak4671_hw_params(struct snd_pcm_substream *substream,
return 0;
}

static int ak4671_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
static int ak4671_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, int source,
unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/alc5623.c
Expand Up @@ -615,7 +615,7 @@ static int get_coeff(struct snd_soc_component *component, int rate)
* Clock after PLL and dividers
*/
static int alc5623_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct alc5623_priv *alc5623 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/alc5632.c
Expand Up @@ -788,7 +788,7 @@ static int get_coeff(struct snd_soc_component *component, int rate)
* Clock after PLL and dividers
*/
static int alc5632_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct alc5632_priv *alc5632 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/arizona.c
Expand Up @@ -1908,7 +1908,7 @@ static const char *arizona_dai_clk_str(int clk_id)
}

static int arizona_dai_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/cpcap.c
Expand Up @@ -1132,7 +1132,7 @@ static int cpcap_hifi_hw_params(struct snd_pcm_substream *substream,
return cpcap_set_samprate(cpcap, CPCAP_DAI_HIFI, rate);
}

static int cpcap_hifi_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id,
static int cpcap_hifi_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id, int source,
unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
Expand Down Expand Up @@ -1290,7 +1290,7 @@ static int cpcap_voice_hw_params(struct snd_pcm_substream *substream,
return 0;
}

static int cpcap_voice_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id,
static int cpcap_voice_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id, int source,
unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cq93vc.c
Expand Up @@ -47,7 +47,7 @@ static int cq93vc_mute(struct snd_soc_dai *dai, int mute, int direction)
}

static int cq93vc_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
switch (freq) {
case 22579200:
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l34.c
Expand Up @@ -598,7 +598,7 @@ static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate)
}

static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
struct cs35l34_private *cs35l34 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l35.c
Expand Up @@ -649,7 +649,7 @@ static int cs35l35_pdm_startup(struct snd_pcm_substream *substream,
}

static int cs35l35_dai_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
struct cs35l35_private *cs35l35 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l36.c
Expand Up @@ -905,7 +905,7 @@ static int cs35l36_pcm_hw_params(struct snd_pcm_substream *substream,
return 0;
}

static int cs35l36_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
static int cs35l36_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, int source,
unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4265.c
Expand Up @@ -316,7 +316,7 @@ static int cs4265_get_clk_index(int mclk, int rate)
return -EINVAL;
}

static int cs4265_set_sysclk(struct snd_soc_dai *codec_dai, int clk_id,
static int cs4265_set_sysclk(struct snd_soc_dai *codec_dai, int clk_id, int source,
unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4270.c
Expand Up @@ -255,7 +255,7 @@ static bool cs4270_reg_is_volatile(struct device *dev, unsigned int reg)
* that from a machine's driver 'hw_param' hook.
*/
static int cs4270_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs4270_private *cs4270 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4271.c
Expand Up @@ -195,7 +195,7 @@ static const struct snd_soc_dapm_route cs4271_dapm_routes[] = {
* ratios listed in cs4271_mclk_fs_ratios table
*/
static int cs4271_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42l42.c
Expand Up @@ -839,7 +839,7 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,
}

static int cs42l42_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42l51.c
Expand Up @@ -384,7 +384,7 @@ static struct cs42l51_ratios master_ratios[] = {
};

static int cs42l51_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs42l51_private *cs42l51 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42l52.c
Expand Up @@ -710,7 +710,7 @@ static int cs42l52_get_clk(int mclk, int rate)
}

static int cs42l52_set_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs42l52_private *cs42l52 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42l56.c
Expand Up @@ -712,7 +712,7 @@ static int cs42l56_get_mclk_ratio(int mclk, int rate)
}

static int cs42l56_set_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs42l56_private *cs42l56 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42l73.c
Expand Up @@ -905,7 +905,7 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq)
}

static int cs42l73_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = dai->component;
struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42xx8.c
Expand Up @@ -201,7 +201,7 @@ static const struct cs42xx8_ratios cs42xx8_ratios[] = {
};

static int cs42xx8_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs43130.c
Expand Up @@ -1534,7 +1534,7 @@ static int cs43130_dsd_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
}

static int cs43130_set_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_component *component = codec_dai->component;
struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component);
Expand Down

0 comments on commit 226d9af

Please sign in to comment.