linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] mx31moboard: Add MC13783 power button support
Date: Thu, 3 Jun 2010 10:31:55 +0200	[thread overview]
Message-ID: <20100603083155.GW26820@pengutronix.de> (raw)
In-Reply-To: <1275334140-29339-3-git-send-email-philippe.retornaz@epfl.ch>

Hi Philippe,

Please ping me once the LED/Power button support is merged. I'll take
care of the platform patches.

Sascha

On Mon, May 31, 2010 at 09:29:00PM +0200, Philippe R?tornaz wrote:
> Add the power-on button on mx31moboard using MC13783 PMIC.
> 
> Signed-off-by: Philippe R?tornaz <philippe.retornaz@epfl.ch>
> ---
>  arch/arm/mach-mx3/mach-mx31moboard.c |   10 +++++++++-
>  1 files changed, 9 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
> index 62b5e40..7a8f078 100644
> --- a/arch/arm/mach-mx3/mach-mx31moboard.c
> +++ b/arch/arm/mach-mx3/mach-mx31moboard.c
> @@ -31,6 +31,7 @@
>  #include <linux/mfd/mc13783.h>
>  #include <linux/spi/spi.h>
>  #include <linux/types.h>
> +#include <linux/input.h>
>  
>  #include <linux/usb/otg.h>
>  #include <linux/usb/ulpi.h>
> @@ -262,12 +263,19 @@ static struct mc13783_leds_platform_data moboard_leds = {
>  	.tc2_period = MC13783_LED_PERIOD_10MS,
>  };
>  
> +static struct mc13783_buttons_platform_data moboard_buttons = {
> +	.b1on_flags = MC13783_BUTTON_DBNC_750MS | MC13783_BUTTON_ENABLE |
> +			MC13783_BUTTON_POL_INVERT | MC13783_BUTTON_EMUL_CAD,
> +	.b1on_key = KEY_POWER,
> +};
> +
>  static struct mc13783_platform_data moboard_pmic = {
>  	.regulators = moboard_regulators,
>  	.num_regulators = ARRAY_SIZE(moboard_regulators),
>  	.leds = &moboard_leds,
> +	.buttons = &moboard_buttons,
>  	.flags = MC13783_USE_REGULATOR | MC13783_USE_RTC |
> -		MC13783_USE_ADC | MC13783_USE_LED,
> +		MC13783_USE_ADC | MC13783_USE_LED | MC13783_USE_BUTTON,
>  };
>  
>  static struct spi_board_info moboard_spi_board_info[] __initdata = {
> -- 
> 1.6.3.3
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

  reply	other threads:[~2010-06-03  8:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-31 19:28 [PATCH 0/2] mc13783: add pwr button support Philippe Rétornaz
2010-05-31 19:28 ` [PATCH 1/2] mc13783: add power " Philippe Rétornaz
2010-05-31 19:29   ` [PATCH 2/2] mx31moboard: Add MC13783 " Philippe Rétornaz
2010-06-03  8:31     ` Sascha Hauer [this message]
2010-06-03  9:23       ` Philippe Rétornaz
2010-06-02  7:52   ` [PATCH 1/2] mc13783: add " Dmitry Torokhov
  -- strict thread matches above, loose matches on Subject: below --
2011-07-08 14:23 [PATCH v2 0/2] mc13783: add pwr " Philippe Rétornaz
2011-07-08 14:23 ` [PATCH 1/2] mc13783: add power " Philippe Rétornaz
2011-07-08 14:23   ` [PATCH 2/2] mx31moboard: Add MC13783 " Philippe Rétornaz

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=20100603083155.GW26820@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).