[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-66-g5242483
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-66-g5242483
|
From: Julien B a. A. <ar...@us...> - 2012-02-16 21:35:33
|
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 5242483cc6196b5bffed4f3a4f419c803d36548a (commit)
via 2fea885a25b130458d6668220ca64257623d566b (commit)
via 3b3dab06d9b73eb25adfc6b5a7a56e51639677cc (commit)
via 27858bd0f4c19cf8d1d72e31d73fe743825c354d (commit)
via 3ff74ca52dca19fe36ed51d29514457022bb6e2e (commit)
from 65df65b6125757685f8140754b6786d6700b23ff (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 5242483cc6196b5bffed4f3a4f419c803d36548a
Merge: 2fea885 65df65b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:34:53 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2fea885a25b130458d6668220ca64257623d566b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:34:20 2012 +0100
[LINUX] 2.6.35 / APF28Dev : add mmc/sd support
commit 3b3dab06d9b73eb25adfc6b5a7a56e51639677cc
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:10:29 2012 +0100
[TOOLS] Add LRADC registers to imx28regs
commit 27858bd0f4c19cf8d1d72e31d73fe743825c354d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:08:41 2012 +0100
[TOOLS] scripts/export_linux_config.sh can't be used on 2.6.35
commit 3ff74ca52dca19fe36ed51d29514457022bb6e2e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:07:17 2012 +0100
[BUILDROOT] Add group n°20 name (dialout) in target_skeleton /etc/group
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-2.6.35.config | 4 +-
.../armadeus/rootfs/target_skeleton/etc/group | 1 +
...1-armadeus-add_apf28dev_baseboard_support.patch | 155 ++++++++++++++++++--
scripts/export_linux_config.sh | 2 +-
target/linux/debug/imxregs/imx28regs.h | 25 +++
5 files changed, 172 insertions(+), 15 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 4974b27..e1d78c1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.3
-# Fri Feb 3 12:55:29 2012
+# Tue Feb 14 19:36:30 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1602,7 +1602,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_SDHCI is not set
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_IMX_ESDHCI_PIO_MODE is not set
-# CONFIG_MMC_MXS is not set
+CONFIG_MMC_MXS=y
# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group
index f78c22c..e27cba7 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group
@@ -6,6 +6,7 @@ adm:x:4:
tty:x:5:
disk:x:6:
wheel:x:10:root
+dialout:x:20:
utmp:x:43:
staff:x:50:
haldaemon:x:68:
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 53eb53d..331017e 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/Kconfig 2012-02-06 12:10:27.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/Kconfig 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/Kconfig 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/Kconfig 2012-02-15 14:43:35.000000000 +0100
@@ -16,6 +16,22 @@
endchoice
@@ -31,8 +31,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
default 0
Index: linux-2.6.35.3/arch/arm/mach-mx28/Makefile
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/Makefile 2012-02-06 12:10:27.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/Makefile 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/Makefile 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/Makefile 2012-02-15 14:43:35.000000000 +0100
@@ -6,6 +6,7 @@
# Board select
obj-$(CONFIG_MACH_MX28EVK) += mx28evk.o mx28evk_pins.o
@@ -44,8 +44,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/Makefile
Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-06 12:56:06.000000000 +0100
-@@ -0,0 +1,242 @@
++++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-15 15:51:09.000000000 +0100
+@@ -0,0 +1,313 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -270,6 +270,77 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ },
+*/
+#endif
++ /* SSP0 SD/MMC port pins */
++ {
++ .name = "SSP0_DATA0",
++ .id = PINID_SSP0_DATA0,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_DATA1",
++ .id = PINID_SSP0_DATA1,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_DATA2",
++ .id = PINID_SSP0_DATA2,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_DATA3",
++ .id = PINID_SSP0_DATA3,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_CMD",
++ .id = PINID_SSP0_CMD,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_SCK",
++ .id = PINID_SSP0_SCK,
++ .fun = PIN_FUN1,
++ .strength = PAD_12MA,
++ .voltage = PAD_3_3V,
++ .pullup = 0,
++ .drive = 2,
++ .pull = 0,
++ },
++ {
++ .name = "SSP0_DETECT",
++ .id = PINID_SSP0_DETECT,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 0,
++ .drive = 1,
++ .pull = 0,
++ },
+};
+
+static void __init apf28dev_device_init(void)
@@ -290,8 +361,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+
Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
===================================================================
---- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig 2012-02-06 12:10:08.000000000 +0100
-+++ linux-2.6.35.3/drivers/video/mxs/Kconfig 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/Kconfig 2012-02-15 14:43:35.000000000 +0100
@@ -21,6 +21,20 @@
---help---
Use LMS430 dotclock LCD panel for MXS
@@ -315,8 +386,8 @@ Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
bool "TVENC"
Index: linux-2.6.35.3/drivers/video/mxs/Makefile
===================================================================
---- linux-2.6.35.3.orig/drivers/video/mxs/Makefile 2012-02-06 12:10:08.000000000 +0100
-+++ linux-2.6.35.3/drivers/video/mxs/Makefile 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/drivers/video/mxs/Makefile 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/Makefile 2012-02-15 14:43:35.000000000 +0100
@@ -2,5 +2,7 @@
obj-$(CONFIG_FB_MXS) += mxsfb.o
obj-$(CONFIG_FB_MXS_LCD_43WVF1G) += lcd_43wvf1g.o
@@ -328,7 +399,7 @@ Index: linux-2.6.35.3/drivers/video/mxs/Makefile
Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c 2012-02-06 12:10:27.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c 2012-02-15 14:43:35.000000000 +0100
@@ -0,0 +1,305 @@
+/*
+ * Tianma TM035 LCD panel initialization for Armadeus APF28Dev
@@ -638,7 +709,7 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c 2012-02-06 12:10:27.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c 2012-02-15 14:43:35.000000000 +0100
@@ -0,0 +1,297 @@
+/*
+ * Freescale MX28 Densitron LW700 LCD panel driver
@@ -937,3 +1008,63 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
+}
+
+subsys_initcall(register_devices);
+Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
+===================================================================
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/device.c 2012-02-15 14:43:59.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/device.c 2012-02-15 14:52:10.000000000 +0100
+@@ -426,7 +426,6 @@
+ #define MMC1_POWER MXS_PIN_TO_GPIO(PINID_PWM4)
+ #define MMC0_WP MXS_PIN_TO_GPIO(PINID_SSP1_SCK)
+ #define MMC1_WP MXS_PIN_TO_GPIO(PINID_GPMI_RESETN)
+-#endif
+
+ static int mxs_mmc_get_wp_ssp0(void)
+ {
+@@ -467,6 +466,7 @@
+ gpio_free(MMC0_WP);
+
+ }
++#endif
+
+ static void mxs_mmc_cmd_pullup_ssp0(int enable)
+ {
+@@ -490,6 +490,7 @@
+ return hz;
+ }
+
++#if defined(CONFIG_MACH_MX28EVK)
+ static int mxs_mmc_get_wp_ssp1(void)
+ {
+ return gpio_get_value(MMC1_WP);
+@@ -528,6 +529,7 @@
+ gpio_free(MMC1_POWER);
+ gpio_free(MMC1_WP);
+ }
++#endif /* CONFIG_MACH_MX28EVK */
+
+ static void mxs_mmc_cmd_pullup_ssp1(int enable)
+ {
+@@ -552,9 +554,11 @@
+ }
+
+ static struct mxs_mmc_platform_data mmc0_data = {
++#if defined(CONFIG_MACH_MX28EVK)
+ .hw_init = mxs_mmc_hw_init_ssp0,
+ .hw_release = mxs_mmc_hw_release_ssp0,
+ .get_wp = mxs_mmc_get_wp_ssp0,
++#endif
+ .cmd_pullup = mxs_mmc_cmd_pullup_ssp0,
+ .setclock = mxs_mmc_setclock_ssp0,
+ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
+@@ -591,9 +595,11 @@
+ };
+
+ static struct mxs_mmc_platform_data mmc1_data = {
++#if defined(CONFIG_MACH_MX28EVK)
+ .hw_init = mxs_mmc_hw_init_ssp1,
+ .hw_release = mxs_mmc_hw_release_ssp1,
+ .get_wp = mxs_mmc_get_wp_ssp1,
++#endif
+ .cmd_pullup = mxs_mmc_cmd_pullup_ssp1,
+ .setclock = mxs_mmc_setclock_ssp1,
+ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
diff --git a/scripts/export_linux_config.sh b/scripts/export_linux_config.sh
index 2253751..20fd347 100755
--- a/scripts/export_linux_config.sh
+++ b/scripts/export_linux_config.sh
@@ -4,7 +4,7 @@ pwd
make shell_env
source ./armadeus_env.sh
-if [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.29" ]; then
+if [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.29" ] || [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.35" ]; then
echo "Not supported for this kernel version ($ARMADEUS_LINUX_MAIN_VERSION)"
exit 1
fi
diff --git a/target/linux/debug/imxregs/imx28regs.h b/target/linux/debug/imxregs/imx28regs.h
index 2935bb4..c19d843 100644
--- a/target/linux/debug/imxregs/imx28regs.h
+++ b/target/linux/debug/imxregs/imx28regs.h
@@ -90,4 +90,29 @@ static struct reg_info regs[] =
{ "HW_LCDIF_DEBUG0", 0x800301d0, 0, 0xffffffff, 'x', "LCD Interface Debug0 Register" },
{ "HW_LCDIF_DEBUG1", 0x800301e0, 0, 0xffffffff, 'x', "LCD Interface Debug1 Register" },
{ "HW_LCDIF_DEBUG2", 0x800301f0, 0, 0xffffffff, 'x', "LCD Interface Debug2 Register" },
+/* LRADC */
+{ "HW_LRADC_CTRL0", 0x80050000, 0, 0xffffffff, 'x', "LRADC Control Register 0" },
+{ "HW_LRADC_CTRL1", 0x80050010, 0, 0xffffffff, 'x', "LRADC Control Register 1" },
+{ "HW_LRADC_CTRL2", 0x80050020, 0, 0xffffffff, 'x', "LRADC Control Register 2" },
+{ "HW_LRADC_CTRL3", 0x80050030, 0, 0xffffffff, 'x', "LRADC Control Register 3" },
+{ "HW_LRADC_STATUS", 0x80050040, 0, 0xffffffff, 'x', "LRADC Status Register" },
+{ "HW_LRADC_CH0", 0x80050050, 0, 0xffffffff, 'x', "LRADC 0 Result Register" },
+{ "HW_LRADC_CH1", 0x80050060, 0, 0xffffffff, 'x', "LRADC 1 Result Register" },
+{ "HW_LRADC_CH2", 0x80050070, 0, 0xffffffff, 'x', "LRADC 2 Result Register" },
+{ "HW_LRADC_CH3", 0x80050080, 0, 0xffffffff, 'x', "LRADC 3 Result Register" },
+{ "HW_LRADC_CH4", 0x80050090, 0, 0xffffffff, 'x', "LRADC 4 Result Register" },
+{ "HW_LRADC_CH5", 0x800500a0, 0, 0xffffffff, 'x', "LRADC 5 Result Register" },
+{ "HW_LRADC_CH6", 0x800500b0, 0, 0xffffffff, 'x', "LRADC 6 Result Register" },
+{ "HW_LRADC_CH7", 0x800500c0, 0, 0xffffffff, 'x', "LRADC 7 (BATT) Result Register" },
+{ "HW_LRADC_DELAY0", 0x800500d0, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 0" },
+{ "HW_LRADC_DELAY1", 0x800500e0, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 1" },
+{ "HW_LRADC_DELAY2", 0x800500f0, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 2" },
+{ "HW_LRADC_DELAY3", 0x80050100, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 3" },
+{ "HW_LRADC_DEBUG0", 0x80050110, 0, 0xffffffff, 'x', "LRADC Debug Register 0" },
+{ "HW_LRADC_DEBUG1", 0x80050120, 0, 0xffffffff, 'x', "LRADC Debug Register 1" },
+{ "HW_LRADC_CONVERSION", 0x80050130, 0, 0xffffffff, 'x', "LRADC Battery Conversion Register" },
+{ "HW_LRADC_CTRL4", 0x80050140, 0, 0xffffffff, 'x', "LRADC Control Register 4" },
+{ "HW_LRADC_THRESHOLD0", 0x80050150, 0, 0xffffffff, 'x', "LRADC Theshold0 Register" },
+{ "HW_LRADC_THRESHOLD1", 0x80050160, 0, 0xffffffff, 'x', "LRADC Theshold1 Register" },
+{ "HW_LRADC_VERSION", 0x80050170, 0, 0xffffffff, 'x', "LRADC Version Register" },
};
hooks/post-receive
--
armadeus
|
