[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-306-gcaf0603
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-306-gcaf0603
|
From: jorasse <jo...@us...> - 2012-05-12 22:50:49
|
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 caf0603970b10ef962330ec9d7f99cec19d8fd56 (commit)
via 23f7118b6aa230bfb871aa0fcecf2e898dc5bd2b (commit)
from 9851a588f202ebcd5c01cd8457b084ec8a79cf7c (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 caf0603970b10ef962330ec9d7f99cec19d8fd56
Merge: 23f7118 9851a58
Author: Eric Jarrige <eri...@ar...>
Date: Sun May 13 00:50:49 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 23f7118b6aa230bfb871aa0fcecf2e898dc5bd2b
Author: Eric Jarrige <eri...@ar...>
Date: Sun May 13 00:50:27 2012 +0200
[LINUX] 2.6.38: Update gpio_key and gpio_led structures to support APF51 board LED and SWITCH
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 69 ++++++++++++++++---
1 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index d317315..714cc68 100644
--- a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -50,7 +50,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c 2012-03-19 19:01:24.000000000 +0100
-@@ -0,0 +1,500 @@
+@@ -0,0 +1,547 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -70,7 +70,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
++#include <linux/gpio_keys.h>
+#include <linux/io.h>
++#include <linux/input.h>
++#include <linux/leds.h>
+#include <linux/spi/spi.h>
+#include <linux/fb.h>
+#include <linux/mfd/imx-ipu-v3.h>
@@ -384,22 +387,55 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .no_sdio_irq = 1, /* Temporary ! (for Wi2Wi) */
+};
+
-+/* board key switchs */
-+static struct gpio_keys_button apf51_buttons[] = {
++#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
++static struct gpio_keys_button apf51dev_gpio_keys[] = {
+ {
+ .gpio = IMX_GPIO_NR(1, 3),
-+ .code = BTN_0,
-+ .desc = "USER",
++ .code = BTN_EXTRA, /* See include/linux/input.h */
++ .desc = "user",
+ .active_low = 1,
-+ .wakeup = 1, /* GPIO1_3 cannot wakeup anyway */
++ .wakeup = 1,
+ },
+};
+
-+static const struct gpio_keys_platform_data imx_button_data __initconst = {
-+ .buttons = apf51_buttons,
-+ .nbuttons = ARRAY_SIZE(apf51_buttons),
++static struct gpio_keys_platform_data apf51dev_gpio_keys_data = {
++ .buttons = apf51dev_gpio_keys,
++ .nbuttons = ARRAY_SIZE(apf51dev_gpio_keys),
+};
+
++static struct platform_device apf51dev_gpio_keys_device = {
++ .name = "gpio-keys",
++ .id = -1,
++ .dev = {
++ .platform_data = &apf51dev_gpio_keys_data,
++ },
++};
++#endif /* CONFIG_KEYBOARD_GPIO */
++
++#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
++static struct gpio_led apf51dev_led[] = {
++ {
++ .name = "apf51dev:green:led",
++ .default_trigger = "heartbeat",
++ .gpio = (GPIO_PORTA | 2),
++ .active_low = 0,
++ },
++};
++
++static struct gpio_led_platform_data apf51dev_led_data = {
++ .num_leds = ARRAY_SIZE(apf51dev_led),
++ .leds = apf51dev_led
++};
++
++static struct platform_device apf51dev_led_dev = {
++ .name = "leds-gpio",
++ .id = -1,
++ .dev = {
++ .platform_data = &apf51dev_led_data,
++ },
++};
++#endif /* CONFIG_LEDS_GPIO */
++
+static int init_gpio(void)
+{
+#define USER_LED_GPIO (GPIO_PORTA | 2)
@@ -490,6 +526,16 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+};
+#endif
+
++static struct platform_device *platform_devices[] __initdata = {
++#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
++ &apf51dev_led_dev,
++#endif
++#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
++ &apf51dev_gpio_keys_device,
++#endif
++};
++
++
+void __init apf51_baseboard_init(void)
+{
+#if defined(CONFIG_CPU_FREQ_IMX)
@@ -508,8 +554,6 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+ init_gpio();
+
-+ imx_add_gpio_keys(&imx_button_data);
-+
+ imx51_add_sdhci_esdhc_imx(0, &edshc0_pdata);
+ imx51_add_sdhci_esdhc_imx(1, &edshc1_pdata);
+
@@ -550,4 +594,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
+#ifdef APF51DEV_USE_SWITCH_AS_PWM
+ imx51_add_mxc_pwm(1);
+#endif
++
++ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
++
+}
hooks/post-receive
--
armadeus
|
