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

Commit 7e00880e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rockchip',... 

Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rockchip', 'asoc/topic/rt5670' and 'asoc/topic/rt5677' into asoc-next
parents bf851392 7e0fc116 bba14312 026e7368 38d595e2

sound/soc/codecs/rt5670.c

+38 −0
Original line number Diff line number Diff line
@@ -14,10 +14,12 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/i2c.h>

#include <linux/platform_device.h>

#include <linux/acpi.h>

#include <linux/spi/spi.h>

#include <linux/dmi.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -2188,6 +2190,13 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai, 
	if (freq == rt5670->sysclk && clk_id == rt5670->sysclk_src)

		return 0;



	if (rt5670->pdata.jd_mode) {

		if (clk_id == RT5670_SCLK_S_PLL1)

			snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");

		else

			snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");

		snd_soc_dapm_sync(&codec->dapm);

	}

	switch (clk_id) {

	case RT5670_SCLK_S_MCLK:

		reg_val |= RT5670_SCLK_SRC_MCLK;
@@ -2549,6 +2558,17 @@ static struct acpi_device_id rt5670_acpi_match[] = { 
MODULE_DEVICE_TABLE(acpi, rt5670_acpi_match);

#endif



static const struct dmi_system_id dmi_platform_intel_braswell[] = {

	{

		.ident = "Intel Braswell",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_BOARD_NAME, "Braswell CRB"),

		},

	},

	{}

};



static int rt5670_i2c_probe(struct i2c_client *i2c,

		    const struct i2c_device_id *id)

{
@@ -2568,6 +2588,12 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 
	if (pdata)

		rt5670->pdata = *pdata;



	if (dmi_check_system(dmi_platform_intel_braswell)) {

		rt5670->pdata.dmic_en = true;

		rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;

		rt5670->pdata.jd_mode = 1;

	}



	rt5670->regmap = devm_regmap_init_i2c(i2c, &rt5670_regmap);

	if (IS_ERR(rt5670->regmap)) {

		ret = PTR_ERR(rt5670->regmap);
@@ -2609,6 +2635,10 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 
	}



	if (rt5670->pdata.jd_mode) {

		regmap_update_bits(rt5670->regmap, RT5670_GLB_CLK,

				   RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_RCCLK);

		rt5670->sysclk = 0;

		rt5670->sysclk_src = RT5670_SCLK_S_RCCLK;

		regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG1,

				   RT5670_PWR_MB, RT5670_PWR_MB);

		regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG2,
@@ -2716,18 +2746,26 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 


	}



	pm_runtime_enable(&i2c->dev);

	pm_request_idle(&i2c->dev);



	ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5670,

			rt5670_dai, ARRAY_SIZE(rt5670_dai));

	if (ret < 0)

		goto err;



	pm_runtime_put(&i2c->dev);



	return 0;

err:

	pm_runtime_disable(&i2c->dev);



	return ret;

}



static int rt5670_i2c_remove(struct i2c_client *i2c)

{

	pm_runtime_disable(&i2c->dev);

	snd_soc_unregister_codec(&i2c->dev);



	return 0;

sound/soc/codecs/rt5677.c

+178 −17
Original line number Diff line number Diff line
@@ -922,6 +922,97 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, 
		return 0;

}



static int is_using_asrc(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink)

{

	unsigned int reg, shift, val;



	if (source->reg == RT5677_ASRC_1) {

		switch (source->shift) {

		case 12:

			reg = RT5677_ASRC_4;

			shift = 0;

			break;

		case 13:

			reg = RT5677_ASRC_4;

			shift = 4;

			break;

		case 14:

			reg = RT5677_ASRC_4;

			shift = 8;

			break;

		case 15:

			reg = RT5677_ASRC_4;

			shift = 12;

			break;

		default:

			return 0;

		}

	} else {

		switch (source->shift) {

		case 0:

			reg = RT5677_ASRC_6;

			shift = 8;

			break;

		case 1:

			reg = RT5677_ASRC_6;

			shift = 12;

			break;

		case 2:

			reg = RT5677_ASRC_5;

			shift = 0;

			break;

		case 3:

			reg = RT5677_ASRC_5;

			shift = 4;

			break;

		case 4:

			reg = RT5677_ASRC_5;

			shift = 8;

			break;

		case 5:

			reg = RT5677_ASRC_5;

			shift = 12;

			break;

		case 12:

			reg = RT5677_ASRC_3;

			shift = 0;

			break;

		case 13:

			reg = RT5677_ASRC_3;

			shift = 4;

			break;

		case 14:

			reg = RT5677_ASRC_3;

			shift = 12;

			break;

		default:

			return 0;

		}

	}



	val = (snd_soc_read(source->codec, reg) >> shift) & 0xf;

	switch (val) {

	case 1 ... 6:

		return 1;

	default:

		return 0;

	}



}



static int can_use_asrc(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);

	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	if (rt5677->sysclk > rt5677->lrck[RT5677_AIF1] * 384)

		return 1;



	return 0;

}



/* Digital Mixer */

static const struct snd_kcontrol_new rt5677_sto1_adc_l_mix[] = {

	SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO1_ADC_MIXER,
@@ -2216,6 +2307,45 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = { 
	SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,

		0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),



	/* ASRC */

	SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5677_ASRC_1, 0, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("I2S2 ASRC", 1, RT5677_ASRC_1, 1, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("I2S3 ASRC", 1, RT5677_ASRC_1, 2, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("I2S4 ASRC", 1, RT5677_ASRC_1, 3, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("DAC STO ASRC", 1, RT5677_ASRC_2, 14, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("DAC MONO2 L ASRC", 1, RT5677_ASRC_2, 13, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DAC MONO2 R ASRC", 1, RT5677_ASRC_2, 12, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DAC MONO3 L ASRC", 1, RT5677_ASRC_1, 15, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DAC MONO3 R ASRC", 1, RT5677_ASRC_1, 14, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DAC MONO4 L ASRC", 1, RT5677_ASRC_1, 13, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DAC MONO4 R ASRC", 1, RT5677_ASRC_1, 12, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DMIC STO1 ASRC", 1, RT5677_ASRC_2, 11, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DMIC STO2 ASRC", 1, RT5677_ASRC_2, 10, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DMIC STO3 ASRC", 1, RT5677_ASRC_2, 9, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DMIC STO4 ASRC", 1, RT5677_ASRC_2, 8, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DMIC MONO L ASRC", 1, RT5677_ASRC_2, 7, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("DMIC MONO R ASRC", 1, RT5677_ASRC_2, 6, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("ADC STO1 ASRC", 1, RT5677_ASRC_2, 5, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("ADC STO2 ASRC", 1, RT5677_ASRC_2, 4, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("ADC STO3 ASRC", 1, RT5677_ASRC_2, 3, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("ADC STO4 ASRC", 1, RT5677_ASRC_2, 2, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("ADC MONO L ASRC", 1, RT5677_ASRC_2, 1, 0, NULL,

		0),

	SND_SOC_DAPM_SUPPLY_S("ADC MONO R ASRC", 1, RT5677_ASRC_2, 0, 0, NULL,

		0),



	/* Input Side */

	/* micbias */

	SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5677_PWR_ANLG2, RT5677_PWR_MB1_BIT,
@@ -2646,10 +2776,18 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = { 
	/* DAC Mixer */

	SND_SOC_DAPM_SUPPLY("dac stereo1 filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_S1F_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("dac mono left filter", RT5677_PWR_DIG2,

	SND_SOC_DAPM_SUPPLY("dac mono2 left filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M2F_L_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("dac mono right filter", RT5677_PWR_DIG2,

	SND_SOC_DAPM_SUPPLY("dac mono2 right filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M2F_R_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("dac mono3 left filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M3F_L_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("dac mono3 right filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M3F_R_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("dac mono4 left filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M4F_L_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("dac mono4 right filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M4F_R_BIT, 0, NULL, 0),



	SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,

		rt5677_sto1_dac_l_mix, ARRAY_SIZE(rt5677_sto1_dac_l_mix)),
@@ -2722,6 +2860,31 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = { 
};



static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {

	{ "Stereo1 DMIC Mux", NULL, "DMIC STO1 ASRC", can_use_asrc },

	{ "Stereo2 DMIC Mux", NULL, "DMIC STO2 ASRC", can_use_asrc },

	{ "Stereo3 DMIC Mux", NULL, "DMIC STO3 ASRC", can_use_asrc },

	{ "Stereo4 DMIC Mux", NULL, "DMIC STO4 ASRC", can_use_asrc },

	{ "Mono DMIC L Mux", NULL, "DMIC MONO L ASRC", can_use_asrc },

	{ "Mono DMIC R Mux", NULL, "DMIC MONO R ASRC", can_use_asrc },

	{ "I2S1", NULL, "I2S1 ASRC", can_use_asrc},

	{ "I2S2", NULL, "I2S2 ASRC", can_use_asrc},

	{ "I2S3", NULL, "I2S3 ASRC", can_use_asrc},

	{ "I2S4", NULL, "I2S4 ASRC", can_use_asrc},



	{ "dac stereo1 filter", NULL, "DAC STO ASRC", is_using_asrc },

	{ "dac mono2 left filter", NULL, "DAC MONO2 L ASRC", is_using_asrc },

	{ "dac mono2 right filter", NULL, "DAC MONO2 R ASRC", is_using_asrc },

	{ "dac mono3 left filter", NULL, "DAC MONO3 L ASRC", is_using_asrc },

	{ "dac mono3 right filter", NULL, "DAC MONO3 R ASRC", is_using_asrc },

	{ "dac mono4 left filter", NULL, "DAC MONO4 L ASRC", is_using_asrc },

	{ "dac mono4 right filter", NULL, "DAC MONO4 R ASRC", is_using_asrc },

	{ "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc },

	{ "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc },

	{ "adc stereo3 filter", NULL, "ADC STO3 ASRC", is_using_asrc },

	{ "adc stereo4 filter", NULL, "ADC STO4 ASRC", is_using_asrc },

	{ "adc mono left filter", NULL, "ADC MONO L ASRC", is_using_asrc },

	{ "adc mono right filter", NULL, "ADC MONO R ASRC", is_using_asrc },



	{ "DMIC1", NULL, "DMIC L1" },

	{ "DMIC1", NULL, "DMIC R1" },

	{ "DMIC2", NULL, "DMIC L2" },
@@ -2852,8 +3015,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 


	{ "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" },

	{ "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" },

	{ "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" },

	{ "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" },

	{ "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -2874,8 +3035,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 


	{ "Stereo2 ADC MIXL", NULL, "Stereo2 ADC LR Mux" },

	{ "Stereo2 ADC MIXL", NULL, "adc stereo2 filter" },

	{ "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "Stereo2 ADC MIXR", NULL, "Sto2 ADC MIXR" },

	{ "Stereo2 ADC MIXR", NULL, "adc stereo2 filter" },

	{ "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -2890,8 +3049,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 


	{ "Stereo3 ADC MIXL", NULL, "Sto3 ADC MIXL" },

	{ "Stereo3 ADC MIXL", NULL, "adc stereo3 filter" },

	{ "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "Stereo3 ADC MIXR", NULL, "Sto3 ADC MIXR" },

	{ "Stereo3 ADC MIXR", NULL, "adc stereo3 filter" },

	{ "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -2906,8 +3063,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 


	{ "Stereo4 ADC MIXL", NULL, "Sto4 ADC MIXL" },

	{ "Stereo4 ADC MIXL", NULL, "adc stereo4 filter" },

	{ "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "Stereo4 ADC MIXR", NULL, "Sto4 ADC MIXR" },

	{ "Stereo4 ADC MIXR", NULL, "adc stereo4 filter" },

	{ "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -3456,10 +3611,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 


	{ "DAC1 MIXL", "Stereo ADC Switch", "ADDA1 Mux" },

	{ "DAC1 MIXL", "DAC1 Switch", "DAC1 Mux" },

	{ "DAC1 MIXL", NULL, "dac stereo1 filter" },

	{ "DAC1 MIXR", "Stereo ADC Switch", "ADDA1 Mux" },

	{ "DAC1 MIXR", "DAC1 Switch", "DAC1 Mux" },

	{ "DAC1 MIXR", NULL, "dac stereo1 filter" },



	{ "DAC1 FS", NULL, "DAC1 MIXL" },

	{ "DAC1 FS", NULL, "DAC1 MIXR" },
@@ -3526,35 +3679,46 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 
	{ "Stereo DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },

	{ "Stereo DAC MIXR", "DAC1 L Switch", "DAC1 MIXL" },

	{ "Stereo DAC MIXR", NULL, "dac stereo1 filter" },

	{ "dac stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "Mono DAC MIXL", "ST L Switch", "Sidetone Mux" },

	{ "Mono DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" },

	{ "Mono DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" },

	{ "Mono DAC MIXL", "DAC2 R Switch", "DAC2 R Mux" },

	{ "Mono DAC MIXL", NULL, "dac mono left filter" },

	{ "Mono DAC MIXL", NULL, "dac mono2 left filter" },

	{ "dac mono2 left filter", NULL, "PLL1", is_sys_clk_from_pll },

	{ "Mono DAC MIXR", "ST R Switch", "Sidetone Mux" },

	{ "Mono DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" },

	{ "Mono DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },

	{ "Mono DAC MIXR", "DAC2 L Switch", "DAC2 L Mux" },

	{ "Mono DAC MIXR", NULL, "dac mono right filter" },

	{ "Mono DAC MIXR", NULL, "dac mono2 right filter" },

	{ "dac mono2 right filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "DD1 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },

	{ "DD1 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },

	{ "DD1 MIXL", "DAC3 L Switch", "DAC3 L Mux" },

	{ "DD1 MIXL", "DAC3 R Switch", "DAC3 R Mux" },

	{ "DD1 MIXL", NULL, "dac mono3 left filter" },

	{ "dac mono3 left filter", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DD1 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },

	{ "DD1 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },

	{ "DD1 MIXR", "DAC3 L Switch", "DAC3 L Mux" },

	{ "DD1 MIXR", "DAC3 R Switch", "DAC3 R Mux" },

	{ "DD1 MIXR", NULL, "dac mono3 right filter" },

	{ "dac mono3 right filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "DD2 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },

	{ "DD2 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },

	{ "DD2 MIXL", "DAC4 L Switch", "DAC4 L Mux" },

	{ "DD2 MIXL", "DAC4 R Switch", "DAC4 R Mux" },

	{ "DD2 MIXL", NULL, "dac mono4 left filter" },

	{ "dac mono4 left filter", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DD2 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },

	{ "DD2 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },

	{ "DD2 MIXR", "DAC4 L Switch", "DAC4 L Mux" },

	{ "DD2 MIXR", "DAC4 R Switch", "DAC4 R Mux" },

	{ "DD2 MIXR", NULL, "dac mono4 right filter" },

	{ "dac mono4 right filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "Stereo DAC MIX", NULL, "Stereo DAC MIXL" },

	{ "Stereo DAC MIX", NULL, "Stereo DAC MIXR" },
@@ -3576,11 +3740,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 
	{ "DAC3 SRC Mux", "DD MIX2L", "DD2 MIXL" },



	{ "DAC 1", NULL, "DAC12 SRC Mux" },

	{ "DAC 1", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC 2", NULL, "DAC12 SRC Mux" },

	{ "DAC 2", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC 3", NULL, "DAC3 SRC Mux" },

	{ "DAC 3", NULL, "PLL1", is_sys_clk_from_pll },



	{ "PDM1 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" },

	{ "PDM1 L Mux", "MONO DAC MIX", "Mono DAC MIXL" },

sound/soc/pxa/spitz.c

+0 −1
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ static int spitz_remove(struct platform_device *pdev) 
static struct platform_driver spitz_driver = {

	.driver		= {

		.name	= "spitz-audio",

		.owner	= THIS_MODULE,

		.pm     = &snd_soc_pm_ops,

	},

	.probe		= spitz_probe,

sound/soc/rockchip/rockchip_i2s.c

+4 −0
Original line number Diff line number Diff line
@@ -247,6 +247,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, 


	regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val);

	regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val);

	regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK,

			   I2S_DMACR_TDL(16));

	regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK,

			   I2S_DMACR_RDL(16));



	return 0;

}