leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Move initial WM8903 identification and reset to I2C probe

Browse Source 
Get control of the device earlier and avoid trying to do an ASoC probe
on a card that won't work.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Mark Brown 2011-12-02 18:39:17 +00:00
parent ee244ce4ea
commit 7d46a528c6
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sound/soc/codecs/wm8903.c
View File

@ -244,11 +244,6 @@ static bool wm8903_volatile_register(struct device *dev, unsigned int reg)
} }
} }
static void wm8903_reset(struct snd_soc_codec *codec)
{
snd_soc_write(codec, WM8903_SW_RESET_AND_ID, 0);
}
static int wm8903_cp_event(struct snd_soc_dapm_widget *w, static int wm8903_cp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
@ -1892,19 +1887,6 @@ static int wm8903_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
val = snd_soc_read(codec, WM8903_SW_RESET_AND_ID);
if (val != 0x8903) {
dev_err(codec->dev,
"Device with ID register %x is not a WM8903\n", val);
return -ENODEV;
}
val = snd_soc_read(codec, WM8903_REVISION_NUMBER);
dev_info(codec->dev, "WM8903 revision %c\n",
(val & WM8903_CHIP_REV_MASK) + 'A');
wm8903_reset(codec);
/* Set up GPIOs and microphone detection */ /* Set up GPIOs and microphone detection */
if (pdata) { if (pdata) {
bool mic_gpio = false; bool mic_gpio = false;
@ -2058,6 +2040,7 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct wm8903_priv *wm8903; struct wm8903_priv *wm8903;
unsigned int val;
int ret; int ret;
wm8903 = devm_kzalloc(&i2c->dev, sizeof(struct wm8903_priv), wm8903 = devm_kzalloc(&i2c->dev, sizeof(struct wm8903_priv),
@ -2076,6 +2059,28 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8903); i2c_set_clientdata(i2c, wm8903);
wm8903->irq = i2c->irq; wm8903->irq = i2c->irq;
ret = regmap_read(wm8903->regmap, WM8903_SW_RESET_AND_ID, &val);
if (ret != 0) {
dev_err(&i2c->dev, "Failed to read chip ID: %d\n", ret);
goto err;
}
if (val != 0x8903) {
dev_err(&i2c->dev, "Device with ID %x is not a WM8903\n", val);
ret = -ENODEV;
goto err;
}
ret = regmap_read(wm8903->regmap, WM8903_REVISION_NUMBER, &val);
if (ret != 0) {
dev_err(&i2c->dev, "Failed to read chip revision: %d\n", ret);
goto err;
}
dev_info(&i2c->dev, "WM8903 revision %c\n",
(val & WM8903_CHIP_REV_MASK) + 'A');
/* Reset the device */
regmap_write(wm8903->regmap, WM8903_SW_RESET_AND_ID, 0x8903);
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8903, &wm8903_dai, 1); &soc_codec_dev_wm8903, &wm8903_dai, 1);
if (ret != 0) if (ret != 0)