diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 9a5eb87425fc..11ce4b24befd 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/gpio_keys.h> | 24 | #include <linux/gpio_keys.h> |
25 | #include <linux/mmc/host.h> | 25 | #include <linux/mmc/host.h> |
26 | #include <sound/tlv320aic3x.h> | ||
26 | 27 | ||
27 | #include <plat/mcspi.h> | 28 | #include <plat/mcspi.h> |
28 | #include <plat/board.h> | 29 | #include <plat/board.h> |
@@ -689,7 +690,6 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = { | |||
689 | }; | 690 | }; |
690 | 691 | ||
691 | 692 | ||
692 | |||
693 | static struct twl4030_platform_data rx51_twldata __initdata = { | 693 | static struct twl4030_platform_data rx51_twldata __initdata = { |
694 | .irq_base = TWL4030_IRQ_BASE, | 694 | .irq_base = TWL4030_IRQ_BASE, |
695 | .irq_end = TWL4030_IRQ_END, | 695 | .irq_end = TWL4030_IRQ_END, |
@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = { | |||
710 | .vio = &rx51_vio, | 710 | .vio = &rx51_vio, |
711 | }; | 711 | }; |
712 | 712 | ||
713 | static struct aic3x_pdata rx51_aic3x_data __initdata = { | ||
714 | .gpio_reset = 60, | ||
715 | }; | ||
716 | |||
717 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { | 713 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { |
718 | .id = TPA6130A2, | 714 | .id = TPA6130A2, |
719 | .power_gpio = 98, | 715 | .power_gpio = 98, |
@@ -728,6 +724,17 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = { | |||
728 | }, | 724 | }, |
729 | }; | 725 | }; |
730 | 726 | ||
727 | /* Audio setup data */ | ||
728 | static struct aic3x_setup_data rx51_aic34_setup = { | ||
729 | .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED, | ||
730 | .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT, | ||
731 | }; | ||
732 | |||
733 | static struct aic3x_pdata rx51_aic3x_data = { | ||
734 | .setup = &rx51_aic34_setup, | ||
735 | .gpio_reset = 60, | ||
736 | }; | ||
737 | |||
731 | static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { | 738 | static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { |
732 | { | 739 | { |
733 | I2C_BOARD_INFO("tlv320aic3x", 0x18), | 740 | I2C_BOARD_INFO("tlv320aic3x", 0x18), |