[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-80-ga79dec3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-80-ga79dec3
|
From: Nicolas <th...@us...> - 2011-04-22 16:19:53
|
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 a79dec3f0bb613e8e61c81e0f354dc731a7a2496 (commit)
from aa0b902511888a2601c0442d772a9523d2ad8fad (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 a79dec3f0bb613e8e61c81e0f354dc731a7a2496
Author: Nicolas Colombain <nic...@ar...>
Date: Fri Apr 22 18:18:17 2011 +0200
[LINUX] APF51 update platform for series
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 27 ++++++++++--------
.../2.6.38/403-armadeus-set-uart2-debug.patch | 2 +-
.../408-armadeus-add_apf51-dev_baseboard.patch | 29 +++++++++----------
3 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index adf98fc..dc4741f 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -36,7 +36,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-04-18 10:20:41.000000000 +0200
-@@ -0,0 +1,441 @@
+@@ -0,0 +1,444 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems <su...@ar...>
@@ -89,14 +89,14 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+
+
+static iomux_v3_cfg_t apf51_pads[] = {
-+#ifdef APF51_PROD
-+ /* UART3 (Console) */
-+ MX51_PAD_UART3_RXD__UART3_RXD,
-+ MX51_PAD_UART3_TXD__UART3_TXD,
-+#else
++#ifdef APF51_PROTO
+ /* UART2 (Console) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
++#else
++ /* UART3 (Console) */
++ MX51_PAD_UART3_RXD__UART3_RXD,
++ MX51_PAD_UART3_TXD__UART3_TXD,
+#endif
+
+ /* USB HOST1 */
@@ -412,7 +412,11 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+
+static struct i2c_board_info apf51_i2c1_devices[] __initdata = {
+ {
++#ifdef APF51_PROTO
+ I2C_BOARD_INFO("wm8311", 0x34),
++#else
++ I2C_BOARD_INFO("wm8311", 0x36),
++#endif
+ .platform_data = &apf51_wm8311_pdata,
+ .irq = gpio_to_irq(APF51_WM8311_IRQ_GPIO),
+ },
@@ -429,11 +433,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
+ ARRAY_SIZE(apf51_pads));
+
-+#ifdef APF51_PROD
-+ TODO
-+ imx51_add_imx_uart(2, &uart_pdata);
-+#else
++#ifdef APF51_PROTO
+ imx51_add_imx_uart(1, &uart_pdata);
++#else
++ imx51_add_imx_uart(2, &uart_pdata);
+#endif
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
@@ -486,7 +489,7 @@ Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
#define MX51_UART1_BASE_ADDR 0x73fbc000
-+#define MX51_UART2_BASE_ADDR 0x73fc0000
++#define MX51_UART3_BASE_ADDR 0x7000c000
#define MX50_UART1_BASE_ADDR 0x53fbc000
#define MX53_UART1_BASE_ADDR 0x53fbc000
@@ -495,7 +498,7 @@ Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
uart_base = MX53_UART1_BASE_ADDR;
break;
+ case MACH_TYPE_APF51:
-+ uart_base = MX51_UART2_BASE_ADDR;
++ uart_base = MX51_UART3_BASE_ADDR;
+ break;
default:
break;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/403-armadeus-set-uart2-debug.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/403-armadeus-set-uart2-debug.patch
index b5e1f47..cb90fee 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/403-armadeus-set-uart2-debug.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/403-armadeus-set-uart2-debug.patch
@@ -11,7 +11,7 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/debug-macro.S
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
#endif
-#define UART_PADDR MX51_UART1_BASE_ADDR
-+#define UART_PADDR MX51_UART2_BASE_ADDR
++#define UART_PADDR MX51_UART3_BASE_ADDR
#endif
#ifdef CONFIG_ARCH_MXC91231
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 5c8869f..8dd05e3 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
@@ -57,7 +57,7 @@ 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,481 @@
+@@ -0,0 +1,480 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -123,17 +123,17 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ (_MX51_PAD_EIM_EB2__GPIO2_22 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* WIFI_PWRDN# */
+ (_MX51_PAD_EIM_EB3__GPIO2_23 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* WIFI_RESET# */
+
-+#ifdef APF51DEV_PROD
++#ifdef APF51DEV_PROTO
++ /* UART3 (Bluetooth) - Protos */
++ MX51_PAD_UART3_RXD__UART3_RXD,
++ MX51_PAD_UART3_TXD__UART3_TXD,
++ /* RTS/CTS on Keypad */
++#else
+ /* UART2 (Bluetooth) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
+ MX51_PAD_EIM_D25__UART2_CTS,
+ MX51_PAD_EIM_D26__UART2_RTS,
-+#else
-+ /* UART3 (Bluetooth) - Protos */
-+ MX51_PAD_UART3_RXD__UART3_RXD,
-+ MX51_PAD_UART3_TXD__UART3_TXD,
-+ /* RTS/CTS on Keypad */
+#endif
+
+ (_MX51_PAD_EIM_CS3__GPIO2_28 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* BT_RESET# */
@@ -207,12 +207,12 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_KEY_COL1__KEY_COL1,
+ MX51_PAD_KEY_COL2__KEY_COL2,
+ MX51_PAD_KEY_COL3__KEY_COL3,
-+#ifdef APF51DEV_PROD
-+ MX51_PAD_KEY_COL4__KEY_COL4,
-+ MX51_PAD_KEY_COL5__KEY_COL5,
-+#else
++#ifdef APF51DEV_PROTO
+ MX51_PAD_KEY_COL4__UART3_RTS,
+ MX51_PAD_KEY_COL5__UART3_CTS,
++#else
++ MX51_PAD_KEY_COL4__KEY_COL4,
++ MX51_PAD_KEY_COL5__KEY_COL5,
+#endif
+
+ /* ONEWIRE */
@@ -495,11 +495,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ ARRAY_SIZE(apf51dev_pads));
+
+ imx51_add_imx_uart(0, &apf51dev_uart_pdata);
-+#ifdef APF51DEV_PROD
-+ TODO
-+ imx51_add_imx_uart(1, &apf51dev_uart_pdata);
-+#else
++#ifdef APF51DEV_PROTO
+ imx51_add_imx_uart(2, &apf51dev_uart_pdata);
++#else
++ imx51_add_imx_uart(1, &apf51dev_uart_pdata);
+#endif
+
+ init_gpio();
hooks/post-receive
--
armadeus
|
