renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-02 18:54:10 +08:00
Code

Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2013-08-22 14:28:23 +01:00
commit e303c42da9
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/codecs/Kconfig
View File

@ -20,6 +20,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_AD73311 select SND_SOC_AD73311
select SND_SOC_ADAU1373 if I2C select SND_SOC_ADAU1373 if I2C
select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI
select SND_SOC_ADAU1701 if I2C
select SND_SOC_ADS117X select SND_SOC_ADS117X
select SND_SOC_AK4104 if SPI_MASTER select SND_SOC_AK4104 if SPI_MASTER
select SND_SOC_AK4535 if I2C select SND_SOC_AK4535 if I2C

25
sound/soc/codecs/adau1701.c
View File

@ -91,7 +91,7 @@
#define ADAU1701_OSCIPOW_OPD 0x04 #define ADAU1701_OSCIPOW_OPD 0x04
#define ADAU1701_DACSET_DACINIT 1 #define ADAU1701_DACSET_DACINIT 1
#define ADAU1707_CLKDIV_UNSET (-1UL) #define ADAU1707_CLKDIV_UNSET (-1U)
#define ADAU1701_FIRMWARE "adau1701.bin" #define ADAU1701_FIRMWARE "adau1701.bin"
@ -247,21 +247,21 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
gpio_is_valid(adau1701->gpio_pll_mode[1])) { gpio_is_valid(adau1701->gpio_pll_mode[1])) {
switch (clkdiv) { switch (clkdiv) {
case 64: case 64:
gpio_set_value(adau1701->gpio_pll_mode[0], 0); gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0);
gpio_set_value(adau1701->gpio_pll_mode[1], 0); gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0);
break; break;
case 256: case 256:
gpio_set_value(adau1701->gpio_pll_mode[0], 0); gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0);
gpio_set_value(adau1701->gpio_pll_mode[1], 1); gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1);
break; break;
case 384: case 384:
gpio_set_value(adau1701->gpio_pll_mode[0], 1); gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1);
gpio_set_value(adau1701->gpio_pll_mode[1], 0); gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0);
break; break;
case 0: /* fallback */ case 0: /* fallback */
case 512: case 512:
gpio_set_value(adau1701->gpio_pll_mode[0], 1); gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1);
gpio_set_value(adau1701->gpio_pll_mode[1], 1); gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1);
break; break;
} }
} }
@ -269,10 +269,10 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
adau1701->pll_clkdiv = clkdiv; adau1701->pll_clkdiv = clkdiv;
if (gpio_is_valid(adau1701->gpio_nreset)) { if (gpio_is_valid(adau1701->gpio_nreset)) {
gpio_set_value(adau1701->gpio_nreset, 0); gpio_set_value_cansleep(adau1701->gpio_nreset, 0);
/* minimum reset time is 20ns */ /* minimum reset time is 20ns */
udelay(1); udelay(1);
gpio_set_value(adau1701->gpio_nreset, 1); gpio_set_value_cansleep(adau1701->gpio_nreset, 1);
/* power-up time may be as long as 85ms */ /* power-up time may be as long as 85ms */
mdelay(85); mdelay(85);
} }
@ -734,7 +734,10 @@ static int adau1701_i2c_remove(struct i2c_client *client)
} }
static const struct i2c_device_id adau1701_i2c_id[] = { static const struct i2c_device_id adau1701_i2c_id[] = {
{ "adau1401", 0 },
{ "adau1401a", 0 },
{ "adau1701", 0 }, { "adau1701", 0 },
{ "adau1702", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adau1701_i2c_id); MODULE_DEVICE_TABLE(i2c, adau1701_i2c_id);