evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Make platform data optional for TLV320AIC3x

Browse source 
Now that we don't need the I2C address for the device the platform data
is redundant so allow it to be omitted.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Chaithrika U S <chaithrika@ti.com>
This commit is contained in:
Mark Brown 2009-08-26 13:05:14 +01:00
parent bc36681fdc
commit 977d49e00d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/soc/codecs/tlv320aic3x.c
View file

@ -1385,15 +1385,14 @@ static int aic3x_probe(struct platform_device *pdev)
socdev->card->codec = codec; socdev->card->codec = codec;
setup = socdev->codec_data; setup = socdev->codec_data;
if (!setup) { if (setup) {
dev_err(&pdev->dev, "No setup data supplied\n"); /* setup GPIO functions */
return -EINVAL; aic3x_write(codec, AIC3X_GPIO1_REG,
(setup->gpio_func[0] & 0xf) << 4);
aic3x_write(codec, AIC3X_GPIO2_REG,
(setup->gpio_func[1] & 0xf) << 4);
} }
/* setup GPIO functions */
aic3x_write(codec, AIC3X_GPIO1_REG, (setup->gpio_func[0] & 0xf) << 4);
aic3x_write(codec, AIC3X_GPIO2_REG, (setup->gpio_func[1] & 0xf) << 4);
/* register pcms */ /* register pcms */
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
if (ret < 0) { if (ret < 0) {