diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-26 08:05:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-26 10:27:56 -0400 |
commit | 977d49e00d18d500d0bfe77500053d9df9c3db77 (patch) | |
tree | d20251521024edcf0700633ec575a91636817af2 /sound/soc | |
parent | bc36681fdc3276b9da4047c277349291c4cbad09 (diff) |
ASoC: Make platform data optional for TLV320AIC3x
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 5d547675b853..3395cf945d56 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
@@ -1385,15 +1385,14 @@ static int aic3x_probe(struct platform_device *pdev) | |||
1385 | socdev->card->codec = codec; | 1385 | socdev->card->codec = codec; |
1386 | setup = socdev->codec_data; | 1386 | setup = socdev->codec_data; |
1387 | 1387 | ||
1388 | if (!setup) { | 1388 | if (setup) { |
1389 | dev_err(&pdev->dev, "No setup data supplied\n"); | 1389 | /* setup GPIO functions */ |
1390 | return -EINVAL; | 1390 | aic3x_write(codec, AIC3X_GPIO1_REG, |
1391 | (setup->gpio_func[0] & 0xf) << 4); | ||
1392 | aic3x_write(codec, AIC3X_GPIO2_REG, | ||
1393 | (setup->gpio_func[1] & 0xf) << 4); | ||
1391 | } | 1394 | } |
1392 | 1395 | ||
1393 | /* setup GPIO functions */ | ||
1394 | aic3x_write(codec, AIC3X_GPIO1_REG, (setup->gpio_func[0] & 0xf) << 4); | ||
1395 | aic3x_write(codec, AIC3X_GPIO2_REG, (setup->gpio_func[1] & 0xf) << 4); | ||
1396 | |||
1397 | /* register pcms */ | 1396 | /* register pcms */ |
1398 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | 1397 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); |
1399 | if (ret < 0) { | 1398 | if (ret < 0) { |