[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-325-g75c993f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-325-g75c993f
|
From: Julien B a. A. <ar...@us...> - 2011-02-18 09:52:21
|
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 75c993f742796ed130ee404b4cacb364e77fb269 (commit)
via 92f15f6bacab1aa0eadbec3c062584beb6e307c7 (commit)
from 23e746e2efaca438aab1f5d786dfbd2b772ac71e (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 75c993f742796ed130ee404b4cacb364e77fb269
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 18 10:50:26 2011 +0100
[LINUX] 2.6.38: Adds keypad support to APF51Dev
commit 92f15f6bacab1aa0eadbec3c062584beb6e307c7
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 18 09:27:49 2011 +0100
Fixes tfp410ctrl
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 67 +++++++++++++++++--
target/packages/tfp410ctrl/tfp410ctrl.c | 6 +-
2 files changed, 63 insertions(+), 10 deletions(-)
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 80f2bf0..829a536 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,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-16 14:46:00.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-02-16 19:00:56.000000000 +0100
-@@ -167,12 +167,31 @@
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-18 10:13:10.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-02-18 10:33:41.000000000 +0100
+@@ -167,12 +167,32 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_IMX_I2C
@@ -34,6 +34,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+ select IMX_HAVE_PLATFORM_SPI_IMX
+ select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+ select IMX_HAVE_PLATFORM_IMX_SSI
++ select IMX_HAVE_PLATFORM_IMX_KEYPAD
+ help
+ This selects the APF51Dev as baseboard and adds board's specific
+ devices.
@@ -42,8 +43,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-16 14:46:00.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-02-16 19:00:56.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-18 10:13:10.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-02-18 10:33:03.000000000 +0100
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -55,8 +56,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-02-16 16:47:21.000000000 +0100
-@@ -0,0 +1,378 @@
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-02-18 10:13:10.000000000 +0100
+@@ -0,0 +1,430 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -187,6 +188,17 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_AUD3_BB_CK__AUD3_TXC,
+ MX51_PAD_AUD3_BB_FS__AUD3_TXFS,
+
++ /* KEYPAD */
++ MX51_PAD_KEY_ROW0__KEY_ROW0,
++ MX51_PAD_KEY_ROW1__KEY_ROW1,
++ MX51_PAD_KEY_ROW2__KEY_ROW2,
++ MX51_PAD_KEY_ROW3__KEY_ROW3,
++ MX51_PAD_KEY_COL0__KEY_COL0,
++ MX51_PAD_KEY_COL1__KEY_COL1,
++ MX51_PAD_KEY_COL2__KEY_COL2,
++ MX51_PAD_KEY_COL3__KEY_COL3,
++ MX51_PAD_KEY_COL4__KEY_COL4,
++ MX51_PAD_KEY_COL5__KEY_COL5,
+
+ /* ONEWIRE */
+
@@ -408,6 +420,43 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ return 0;
+}
+
++#if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
++static int apf51dev_keymap[] = {
++ KEY(0, 0, KEY_1),
++ KEY(0, 1, KEY_2),
++ KEY(0, 2, KEY_3),
++ KEY(0, 3, KEY_F1),
++ KEY(0, 4, KEY_UP),
++ KEY(0, 5, KEY_F2),
++
++ KEY(1, 0, KEY_4),
++ KEY(1, 1, KEY_5),
++ KEY(1, 2, KEY_6),
++ KEY(1, 3, KEY_LEFT),
++ KEY(1, 4, KEY_SELECT),
++ KEY(1, 5, KEY_RIGHT),
++
++ KEY(2, 0, KEY_7),
++ KEY(2, 1, KEY_8),
++ KEY(2, 2, KEY_9),
++ KEY(2, 3, KEY_F3),
++ KEY(2, 4, KEY_DOWN),
++ KEY(2, 5, KEY_F4),
++
++ KEY(3, 0, KEY_0),
++ KEY(3, 1, KEY_OK),
++ KEY(3, 2, KEY_ESC),
++ KEY(3, 3, KEY_ENTER),
++ KEY(3, 4, KEY_MENU),
++ KEY(3, 5, KEY_BACK)
++};
++
++static const struct matrix_keymap_data apf51dev_keymap_data __initconst = {
++ .keymap = apf51dev_keymap,
++ .keymap_size = ARRAY_SIZE(apf51dev_keymap),
++};
++#endif
++
+void __init apf51_baseboard_init(void)
+{
+ mxc_iomux_v3_setup_multiple_pads(apf51dev_pads,
@@ -434,4 +483,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+
+ imx51_add_ipuv3(&apf51dev_ipu_data);
+ imx51_add_imx_ssi(0, &apf27dev_ssi_pdata);
++
++#if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
++ imx51_add_imx_keypad(&apf51dev_keymap_data);
++#endif
+}
diff --git a/target/packages/tfp410ctrl/tfp410ctrl.c b/target/packages/tfp410ctrl/tfp410ctrl.c
index 1282063..bb062c6 100644
--- a/target/packages/tfp410ctrl/tfp410ctrl.c
+++ b/target/packages/tfp410ctrl/tfp410ctrl.c
@@ -242,10 +242,10 @@ void load(int fd, char* fileName)
while (fgets(line, MAX_DUMP_LINE, fd_conf) != NULL) {
sscanf(line,"%2X%*c%4X", ®Addr, &val);
printf("reg %02x, value %04x\n", regAddr, val);
- if (regAddr > DE_TOP_REG
- write_word (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
+ if (regAddr > DE_TOP_REG)
+ write_word(fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
else
- write_byte (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
+ write_byte(fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
}
if (fd_conf != NULL)
fclose(fd_conf);
hooks/post-receive
--
armadeus
|
