aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rx51-peripherals.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-05-31 08:21:13 -0400
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2011-07-04 11:44:02 -0400
commit4ae6df5e1018796ce260be59b2c603bd0f9faa94 (patch)
tree0a673e318826a51ce2660ed7e978eaa6e64fc6d6 /arch/arm/mach-omap2/board-rx51-peripherals.c
parent57fe7251f5bfc4332f24479376de48a1e8ca6211 (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/board-rx51-peripherals.c')
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c6
1 files changed, 3 insertions, 3 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
744struct twl4030_codec_vibra_data rx51_vibra_data __initdata = { 744struct twl4030_vibra_data rx51_vibra_data __initdata = {
745 .coexist = 0, 745 .coexist = 0,
746}; 746};
747 747
748struct twl4030_codec_data rx51_codec_data __initdata = { 748struct 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,