[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-99-g52dceee
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-99-g52dceee
|
From: Julien B a. A. <ar...@us...> - 2011-05-02 12:22:36
|
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 52dceeef8c0448fd76393ef989171770a3082d13 (commit)
via 51b81b4fd78929f1f2b19b0b031449294efb5eca (commit)
from 606e3cd3c8cf16b91e8e640fa2984eaff34b6675 (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 52dceeef8c0448fd76393ef989171770a3082d13
Author: Julien Boibessot <jul...@ar...>
Date: Mon May 2 14:21:48 2011 +0200
[LINUX] 2.6.38: Makes USER LED and switch accessible from userspace on APF51Dev
commit 51b81b4fd78929f1f2b19b0b031449294efb5eca
Author: Julien Boibessot <jul...@ar...>
Date: Mon May 2 14:14:53 2011 +0200
[LINUX] 2.6.38, activates gpiolib in default APF51 config
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 4 +-
.../408-armadeus-add_apf51-dev_baseboard.patch | 26 +++++--------------
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 1bbc19b..b14dd1d 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1169,7 +1169,7 @@ CONFIG_SPI_SPIDEV=m
#
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
@@ -1184,7 +1184,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_SX150X is not set
-# CONFIG_GPIO_WM831X is not set
+CONFIG_GPIO_WM831X=m
# CONFIG_GPIO_ADP5588 is not set
#
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 8dd05e3..a9ce579 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-04-05 18:28:35.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-04-05 22:56:58.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-04-26 13:49:47.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-05-02 14:03:00.000000000 +0200
@@ -167,12 +167,32 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -43,8 +43,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-04-05 18:28:35.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-04-05 22:56:58.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-04-26 13:49:47.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-05-02 14:03:00.000000000 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -56,8 +56,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-04-05 23:04:25.000000000 +0200
-@@ -0,0 +1,480 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-05-02 13:59:05.000000000 +0200
+@@ -0,0 +1,468 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -217,15 +217,11 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+ /* ONEWIRE */
+
-+ /* KEYPAD */
-+
+ /* LED */
+ (_MX51_PAD_GPIO1_2__GPIO1_2 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)),
-+
+ /* User switch */
+ (_MX51_PAD_GPIO1_3__GPIO1_3 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)),
+
-+
+ /* Other GPIOs ! TBDL ! */
+ (_MX51_PAD_I2C1_CLK__GPIO4_16 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* HDMI_RST# */
+ (_MX51_PAD_I2C1_DAT__GPIO4_17 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* HDMI_DETECT */
@@ -241,7 +237,6 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+};
+
+/* APF51Proto has a LCD connector for a 18 bits 800x480 Chimei TFT LCD */
-+
+static struct fb_videomode apf51dev_modes[] = {
+ {
+ .name = "Chimei-LW700AT9003",
@@ -395,7 +390,6 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+static int init_gpio(void)
+{
+#define USER_LED_GPIO (GPIO_PORTA | 2)
-+#define USER_SWITCH_GPIO (GPIO_PORTA | 3)
+#define WIFI_PWRDN (GPIO_PORTB | 22)
+#define WIFI_RESET (GPIO_PORTB | 23)
+#define BT_RESET (GPIO_PORTB | 28)
@@ -433,13 +427,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ return ret;
+ }
+ gpio_direction_output(USER_LED_GPIO, 1);
-+
-+ ret = gpio_request(USER_SWITCH_GPIO, "USER_SWITCH_GPIO");
-+ if (ret) {
-+ pr_warn("failed to get User Switch GPIO: %d\n", ret);
-+ return ret;
-+ }
-+ gpio_direction_input(USER_SWITCH_GPIO);
++ gpio_free(USER_LED_GPIO);
+
+ /* HDMI */
+ ret = gpio_request(HDMI_DETECT_GPIO, "HDMI_DETECT_GPIO");
hooks/post-receive
--
armadeus
|
