public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] omap: rx51: Add support for vibra
@ 2011-02-25  8:46 Ilkka Koskinen
  2011-03-03  1:02 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Ilkka Koskinen @ 2011-02-25  8:46 UTC (permalink / raw)
  To: linux-omap, tony; +Cc: ilkka.koskinen

Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
---
 arch/arm/mach-omap2/board-rx51-peripherals.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index e75e240..dcd98fa 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -699,6 +699,14 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = {
 	.resource_config = twl4030_rconfig,
 };
 
+struct twl4030_codec_vibra_data rx51_vibra_data __initdata = {
+	.coexist	= 0,
+};
+
+struct twl4030_codec_data rx51_codec_data __initdata = {
+	.audio_mclk	= 26000000,
+	.vibra		= &rx51_vibra_data,
+};
 
 static struct twl4030_platform_data rx51_twldata __initdata = {
 	.irq_base		= TWL4030_IRQ_BASE,
@@ -710,6 +718,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
 	.madc			= &rx51_madc_data,
 	.usb			= &rx51_usb_data,
 	.power			= &rx51_t2scripts_data,
+	.codec			= &rx51_codec_data,
 
 	.vaux1			= &rx51_vaux1,
 	.vaux2			= &rx51_vaux2,
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] omap: rx51: Add support for vibra
  2011-02-25  8:46 [PATCH] omap: rx51: Add support for vibra Ilkka Koskinen
@ 2011-03-03  1:02 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2011-03-03  1:02 UTC (permalink / raw)
  To: Ilkka Koskinen; +Cc: linux-omap

* Ilkka Koskinen <ilkka.koskinen@nokia.com> [110225 00:48]:

Adding for the merge window with updated description
"Add support for vibra".

Tony

> Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
> ---
>  arch/arm/mach-omap2/board-rx51-peripherals.c |    9 +++++++++
>  1 files changed, 9 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> index e75e240..dcd98fa 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -699,6 +699,14 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = {
>  	.resource_config = twl4030_rconfig,
>  };
>  
> +struct twl4030_codec_vibra_data rx51_vibra_data __initdata = {
> +	.coexist	= 0,
> +};
> +
> +struct twl4030_codec_data rx51_codec_data __initdata = {
> +	.audio_mclk	= 26000000,
> +	.vibra		= &rx51_vibra_data,
> +};
>  
>  static struct twl4030_platform_data rx51_twldata __initdata = {
>  	.irq_base		= TWL4030_IRQ_BASE,
> @@ -710,6 +718,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
>  	.madc			= &rx51_madc_data,
>  	.usb			= &rx51_usb_data,
>  	.power			= &rx51_t2scripts_data,
> +	.codec			= &rx51_codec_data,
>  
>  	.vaux1			= &rx51_vaux1,
>  	.vaux2			= &rx51_vaux2,
> -- 
> 1.7.0.4
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-03  1:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25  8:46 [PATCH] omap: rx51: Add support for vibra Ilkka Koskinen
2011-03-03  1:02 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox