diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2011-12-19 16:35:06 -0600 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:12:02 +0800 |
| commit | fcb988e66aa3311eb434e501b366abaf93d5dbb1 (patch) | |
| tree | bf22fc2bcca64014f6e8d13462dfe72fe79f7ac1 /sound | |
| parent | e7d420f8d354b8dbd1546e957646660d2f990e46 (diff) | |
ENGR00170627 imx-cs42888: overwrite codec_name if passed as platform data
* Overwrite codec_name if passed as platform data
* Add codec_name in mxc_audio_platform_data
* Codec name follows the naming convention
<codec>.<i2c-channel>-<codec i2c address> i.e. cs42888.0-0048
* For IMX6Q-ARD this name convention doesn't follow previous settings for
imx6q platforms codec is on different i2c channel and can't be resolved
by CONFIG macros on imx_3stack_dai data structure; So we overwrite in
probe function by getting the correct value from plat_data->codec_name.
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/imx-cs42888.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/imx/imx-cs42888.c b/sound/soc/imx/imx-cs42888.c index 71d519e676e4..4e97ec246792 100644 --- a/sound/soc/imx/imx-cs42888.c +++ b/sound/soc/imx/imx-cs42888.c @@ -268,6 +268,8 @@ static int __devinit imx_3stack_cs42888_probe(struct platform_device *pdev) } mclk_freq = plat_data->sysclk; rst_gpio = plat_data->rst_gpio; + if (plat_data->codec_name) + imx_3stack_dai[0].codec_name = plat_data->codec_name; return 0; } |