diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-07-07 12:11:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-07 12:11:23 -0700 |
| commit | 345e397d841068c4ba2829a226fbe6613bac1d0d (patch) | |
| tree | 70ba905bd380876b57b5ce47fb55f198e149ee6c /arch/arm/mach-omap2/twl-common.c | |
| parent | 727e18b429e3badda12d1de74f492bfa363a2e94 (diff) | |
| parent | 21385eeb02e59cb2a72b60cd146f9c1ce3cb0acd (diff) | |
| download | talos-op-linux-345e397d841068c4ba2829a226fbe6613bac1d0d.tar.gz talos-op-linux-345e397d841068c4ba2829a226fbe6613bac1d0d.zip | |
Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio into twl-asoc
Diffstat (limited to 'arch/arm/mach-omap2/twl-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 3aaa46f6cd12..2543342dbccb 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c @@ -80,11 +80,11 @@ static struct twl4030_madc_platform_data omap3_madc_pdata = { .irq_line = 1, }; -static struct twl4030_codec_audio_data omap3_audio; +static struct twl4030_codec_data omap3_codec; -static struct twl4030_codec_data omap3_codec_pdata = { +static struct twl4030_audio_data omap3_audio_pdata = { .audio_mclk = 26000000, - .audio = &omap3_audio, + .codec = &omap3_codec, }; static struct regulator_consumer_supply omap3_vdda_dac_supplies[] = { @@ -292,8 +292,8 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data, if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc) pmic_data->madc = &omap3_madc_pdata; - if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec) - pmic_data->codec = &omap3_codec_pdata; + if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->audio) + pmic_data->audio = &omap3_audio_pdata; /* Common regulator configurations */ if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac) |
