public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Cc: linux-omap@vger.kernel.org
Subject: Re: [PATCH] omap: rx51: Add support for vibra
Date: Wed, 2 Mar 2011 17:02:15 -0800	[thread overview]
Message-ID: <20110303010215.GH20560@atomide.com> (raw)
In-Reply-To: <1298623583-9743-1-git-send-email-ilkka.koskinen@nokia.com>

* 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
> 

      reply	other threads:[~2011-03-03  1:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-25  8:46 [PATCH] omap: rx51: Add support for vibra Ilkka Koskinen
2011-03-03  1:02 ` Tony Lindgren [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110303010215.GH20560@atomide.com \
    --to=tony@atomide.com \
    --cc=ilkka.koskinen@nokia.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox