[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-307-g3f44dd9

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  3f44dd9b60a3ee5a51cd83d6307ff21fa23a1d42 (commit)
      from  caf0603970b10ef962330ec9d7f99cec19d8fd56 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f44dd9b60a3ee5a51cd83d6307ff21fa23a1d42
Author: Eric Jarrige <eri...@ar...>
Date:   Sun May 13 00:53:32 2012 +0200

    [LINUX] 2.6.38: Add gpio_key and gpio_led structures to support APF27 board user LED and SWITCH

-----------------------------------------------------------------------

Summary of changes:
 .../2.6.38/281-apf27-armadeus-add_apf27.c.patch    |   60 +++++++++++++++++++-
 1 files changed, 59 insertions(+), 1 deletions(-)

diff --git a/patches/linux/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/patches/linux/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index 2031c77..01e4d25 100644
--- a/patches/linux/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/patches/linux/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -633,7 +633,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c	2011-06-03 17:23:24.000000000 +0200
-@@ -0,0 +1,941 @@
+@@ -0,0 +1,999 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -666,7 +666,10 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
 +#include <linux/platform_device.h>
 +#include <linux/spi/spi.h>
 +#include <linux/spi/spidev.h>
++#include <linux/gpio_keys.h>
 +#include <linux/i2c.h>
++#include <linux/input.h>
++#include <linux/leds.h>
 +#include <linux/serial.h>
 +#include <linux/delay.h>
 +#include <linux/irq.h>
@@ -849,6 +852,55 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
 +};
 +
 +
++#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
++static struct gpio_keys_button apf27dev_gpio_keys[] = {
++	{
++		.code = BTN_EXTRA, /* See include/linux/input.h */
++		.gpio = (GPIO_PORTF | 13), /* GPIO number */
++		.active_low = 1,
++		.desc = "s1", /* Button description*/
++		.wakeup = 0,
++	},
++};
++
++static struct gpio_keys_platform_data apf27dev_gpio_keys_data = {
++	.buttons = apf27dev_gpio_keys,
++	.nbuttons = ARRAY_SIZE(apf27dev_gpio_keys),
++};
++
++static struct platform_device apf27dev_gpio_keys_device = {
++	.name = "gpio-keys",
++	.id = -1,
++	.dev = {
++		.platform_data = &apf27dev_gpio_keys_data,
++	},
++};
++#endif /* CONFIG_KEYBOARD_GPIO */
++
++#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
++static struct gpio_led apf27dev_led[] = {
++	{
++		.name = "apf27dev:green:led",
++		.default_trigger = "heartbeat",
++		.gpio = (GPIO_PORTF | 14),
++		.active_low = 1,
++	},
++};
++
++static struct gpio_led_platform_data apf27dev_led_data = {
++	.num_leds	= ARRAY_SIZE(apf27dev_led),
++	.leds		= apf27dev_led
++};
++
++static struct platform_device apf27dev_led_dev = {
++	.name		= "leds-gpio",
++	.id		= -1,
++	.dev		= {
++		.platform_data	= &apf27dev_led_data,
++	},
++};
++#endif /* CONFIG_LEDS_GPIO */
++
 +#ifdef CONFIG_I2C
 +
 +/* APF27Dev makes I2C1 bus available */
@@ -1262,6 +1314,12 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
 +#endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
 +
 +static struct platform_device *platform_devices[] __initdata = {
++#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
++	&apf27dev_led_dev,
++#endif
++#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
++	&apf27dev_gpio_keys_device,
++#endif
 +	ALSA_SOUND
 +};
 +


hooks/post-receive
-- 
armadeus