[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-304-g9851a58

[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  9851a588f202ebcd5c01cd8457b084ec8a79cf7c (commit)
      from  4b4be023227a1322d0db618d4983177bedd9c04c (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 9851a588f202ebcd5c01cd8457b084ec8a79cf7c
Author: Eric Jarrige <eri...@ar...>
Date:   Sun May 13 00:47:21 2012 +0200

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

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

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

diff --git a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 45a4b5b..cbe0193 100644
--- a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -754,7 +754,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c	2012-01-26 10:53:41.000000000 +0100
-@@ -0,0 +1,1094 @@
+@@ -0,0 +1,1152 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -782,7 +782,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
 +#include <asm/mach/flash.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>
@@ -870,6 +873,55 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
 +#endif
 +
 +
++#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 */
@@ -1559,6 +1611,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/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