diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-05-31 08:21:13 -0400 |
---|---|---|
committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-07-04 11:44:02 -0400 |
commit | 4ae6df5e1018796ce260be59b2c603bd0f9faa94 (patch) | |
tree | 0a673e318826a51ce2660ed7e978eaa6e64fc6d6 /arch/arm/mach-omap2 | |
parent | 57fe7251f5bfc4332f24479376de48a1e8ca6211 (diff) |
MFD: twl4030-audio: Rename platform data
Allign the platform data names for twl4030 audio submodule:
twl4030_audio_data: for the core MFD driver
twl4030_codec_data: for ASoC codec driver
twl4030_vibra_data: for the input/ForceFeedback driver
To avoid breakage, change all depending drivers, files
to use the new types.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-zoom-peripherals.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 6140290721a0..f52bc61f35ae 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -741,11 +741,11 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = { | |||
741 | .resource_config = twl4030_rconfig, | 741 | .resource_config = twl4030_rconfig, |
742 | }; | 742 | }; |
743 | 743 | ||
744 | struct twl4030_codec_vibra_data rx51_vibra_data __initdata = { | 744 | struct twl4030_vibra_data rx51_vibra_data __initdata = { |
745 | .coexist = 0, | 745 | .coexist = 0, |
746 | }; | 746 | }; |
747 | 747 | ||
748 | struct twl4030_codec_data rx51_codec_data __initdata = { | 748 | struct twl4030_audio_data rx51_audio_data __initdata = { |
749 | .audio_mclk = 26000000, | 749 | .audio_mclk = 26000000, |
750 | .vibra = &rx51_vibra_data, | 750 | .vibra = &rx51_vibra_data, |
751 | }; | 751 | }; |
@@ -755,7 +755,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = { | |||
755 | .gpio = &rx51_gpio_data, | 755 | .gpio = &rx51_gpio_data, |
756 | .keypad = &rx51_kp_data, | 756 | .keypad = &rx51_kp_data, |
757 | .power = &rx51_t2scripts_data, | 757 | .power = &rx51_t2scripts_data, |
758 | .codec = &rx51_codec_data, | 758 | .audio = &rx51_audio_data, |
759 | 759 | ||
760 | .vaux1 = &rx51_vaux1, | 760 | .vaux1 = &rx51_vaux1, |
761 | .vaux2 = &rx51_vaux2, | 761 | .vaux2 = &rx51_vaux2, |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 13a644233667..6d0aa4fcb7c3 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -274,12 +274,12 @@ static int __init omap_i2c_init(void) | |||
274 | TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2); | 274 | TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2); |
275 | 275 | ||
276 | if (machine_is_omap_zoom2()) { | 276 | if (machine_is_omap_zoom2()) { |
277 | struct twl4030_codec_audio_data *audio_data; | 277 | struct twl4030_codec_data *codec_data; |
278 | audio_data = zoom_twldata.codec->audio; | 278 | codec_data = zoom_twldata.audio->codec; |
279 | 279 | ||
280 | audio_data->ramp_delay_value = 3; /* 161 ms */ | 280 | codec_data->ramp_delay_value = 3; /* 161 ms */ |
281 | audio_data->hs_extmute = 1; | 281 | codec_data->hs_extmute = 1; |
282 | audio_data->set_hs_extmute = zoom2_set_hs_extmute; | 282 | codec_data->set_hs_extmute = zoom2_set_hs_extmute; |
283 | } | 283 | } |
284 | omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata); | 284 | omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata); |
285 | omap_register_i2c_bus(2, 400, NULL, 0); | 285 | omap_register_i2c_bus(2, 400, NULL, 0); |
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 = { | |||
80 | .irq_line = 1, | 80 | .irq_line = 1, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static struct twl4030_codec_audio_data omap3_audio; | 83 | static struct twl4030_codec_data omap3_codec; |
84 | 84 | ||
85 | static struct twl4030_codec_data omap3_codec_pdata = { | 85 | static struct twl4030_audio_data omap3_audio_pdata = { |
86 | .audio_mclk = 26000000, | 86 | .audio_mclk = 26000000, |
87 | .audio = &omap3_audio, | 87 | .codec = &omap3_codec, |
88 | }; | 88 | }; |
89 | 89 | ||
90 | static struct regulator_consumer_supply omap3_vdda_dac_supplies[] = { | 90 | 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, | |||
292 | if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc) | 292 | if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc) |
293 | pmic_data->madc = &omap3_madc_pdata; | 293 | pmic_data->madc = &omap3_madc_pdata; |
294 | 294 | ||
295 | if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec) | 295 | if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->audio) |
296 | pmic_data->codec = &omap3_codec_pdata; | 296 | pmic_data->audio = &omap3_audio_pdata; |
297 | 297 | ||
298 | /* Common regulator configurations */ | 298 | /* Common regulator configurations */ |
299 | if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac) | 299 | if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac) |