[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-155-gb48be95

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  b48be9575ae35d8ac8458566fe73d6f9a4b2ab33 (commit)
       via  83ca20c6795363c97bfd531bf8095da60c3859e9 (commit)
       via  613faa1c6ee38a891279897f98bbeacc68cee96f (commit)
      from  00aa4d97ab660d9b14063aaa8ec0f3d038010ac8 (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 b48be9575ae35d8ac8458566fe73d6f9a4b2ab33
Author: jorasse <jo...@ar...>
Date:   Tue May 31 23:52:14 2011 +0200

    [BUILDROOT] Fix parallel build issue

commit 83ca20c6795363c97bfd531bf8095da60c3859e9
Author: jorasse <jo...@ar...>
Date:   Tue May 31 23:40:32 2011 +0200

    [LINUX] apf51: add freescale PM (preliminary version)

commit 613faa1c6ee38a891279897f98bbeacc68cee96f
Author: jorasse <jo...@ar...>
Date:   Tue May 31 23:39:17 2011 +0200

    [LINUX] apf51: support user switch

-----------------------------------------------------------------------

Summary of changes:
 .../408-armadeus-add_apf51-dev_baseboard.patch     |   20 ++++-
 .../433-add_pm_mem_standby_modes_support.patch     |  115 ++++++++++++++++++++
 patches/buildroot/2010.11/040-linux-makefile.patch |    2 +-
 ...x_in_a_standalone_way_after_configuration.patch |    2 +-
 .../buildroot/2010.11/072-xenomai-package.patch    |    2 +-
 5 files changed, 137 insertions(+), 4 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/433-add_pm_mem_standby_modes_support.patch

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 1129a0b..ba137b8 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
@@ -49,7 +49,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-05-03 16:42:37.000000000 +0200
-@@ -0,0 +1,468 @@
+@@ -0,0 +1,486 @@
 + /*
 + * Support for APF51's official development baseboard (APF51Dev)
 + *
@@ -379,6 +379,22 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
 +	.no_sdio_irq = 1,	/* Temporary ! (for Wi2Wi) */
 +};
 +
++/* board key switchs */
++static struct gpio_keys_button apf51_buttons[] = {
++	{
++		.gpio		= IMX_GPIO_NR(1, 3),
++		.code		= BTN_0,
++		.desc		= "USER",
++		.active_low	= 1,
++		.wakeup		= 1, /* GPIO1_3 cannot wakeup anyway */
++	},
++};
++
++static const struct gpio_keys_platform_data imx_button_data __initconst = {
++	.buttons	= apf51_buttons,
++	.nbuttons	= ARRAY_SIZE(apf51_buttons),
++};
++
 +static int init_gpio(void)
 +{
 +#define USER_LED_GPIO		(GPIO_PORTA | 2)
@@ -483,6 +499,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
 +
 +	init_gpio();
 +
++	imx51_add_gpio_keys(&imx_button_data);
++
 +	imx51_add_sdhci_esdhc_imx(0, &edshc0_pdata);
 +	imx51_add_sdhci_esdhc_imx(1, &edshc1_pdata);
 +
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/433-add_pm_mem_standby_modes_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/433-add_pm_mem_standby_modes_support.patch
new file mode 100644
index 0000000..da45950
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/433-add_pm_mem_standby_modes_support.patch
@@ -0,0 +1,115 @@
+From: Dinh Nguyen <Din...@fr...> 
+Adds initial low power suspend functionality to MX51. 
+Supports "mem" and "standby" modes. 
+Signed-off-by: Dinh Nguyen <Din...@fr...> 
+--- 
+Â arch/arm/mach-mx5/Makefile Â  Â  Â  Â  Â  | Â  Â 1 + 
+Â arch/arm/mach-mx5/pm.c Â  Â  Â  Â  Â  Â  Â  | Â  75 ++++++++++++++++++++++++++++++++++ 
+Â arch/arm/plat-mxc/include/mach/mxc.h | Â  Â 1 + 
+Â 3 files changed, 77 insertions(+), 0 deletions(-) 
+Â create mode 100644 arch/arm/mach-mx5/pm.c 
+diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile 
+index 4f63048..7f9435d 100644 
+--- a/arch/arm/mach-mx5/Makefile 
++++ b/arch/arm/mach-mx5/Makefile 
+@@ -6,6 +6,7 @@
+ obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o
+ obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
++obj-$(CONFIG_PM) += pm.o
+ 
+ obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o
+ obj-$(CONFIG_MACH_APF51) += board-apf51.o
+ obj-$(CONFIG_MACH_APF51_DEV) += apf51dev-baseboard.o
+diff --git a/arch/arm/mach-mx5/pm.c b/arch/arm/mach-mx5/pm.c
+new file mode 100644
+index 0000000..137d204
+--- /dev/null
++++ b/arch/arm/mach-mx5/pm.c
+@@ -0,0 +1,75 @@
++/*
++ * Â Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++#include <linux/suspend.h>
++#include <asm/mach/map.h>
++#include <mach/system.h>
++#include "crm_regs.h"
++
++static int mx5_suspend_enter(suspend_state_t state)
++{
++	u32 plat_lpc, arm_srpgcr, ccm_clpcr;
++
++	/* always allow platform to issue a deep sleep mode request */
++	plat_lpc = __raw_readl(MXC_CORTEXA8_PLAT_LPC) &
++		~(MXC_CORTEXA8_PLAT_LPC_DSM);
++	ccm_clpcr = __raw_readl(MXC_CCM_CLPCR) & ~(MXC_CCM_CLPCR_LPM_MASK);
++	arm_srpgcr = __raw_readl(MXC_SRPG_ARM_SRPGCR) & ~(MXC_SRPGCR_PCR);
++
++	switch (state) {
++	case PM_SUSPEND_MEM:
++		ccm_clpcr |= (0x2 << MXC_CCM_CLPCR_LPM_OFFSET);
++		ccm_clpcr |= (0x3 << MXC_CCM_CLPCR_STBY_COUNT_OFFSET);
++		ccm_clpcr |= MXC_CCM_CLPCR_VSTBY;
++		ccm_clpcr |= MXC_CCM_CLPCR_SBYOS;
++		break;
++	case PM_SUSPEND_STANDBY:
++		ccm_clpcr |= (0x1 << MXC_CCM_CLPCR_LPM_OFFSET);
++		ccm_clpcr &= ~MXC_CCM_CLPCR_VSTBY;
++		ccm_clpcr &= ~MXC_CCM_CLPCR_SBYOS;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	plat_lpc |= MXC_CORTEXA8_PLAT_LPC_DSM
++		| MXC_CORTEXA8_PLAT_LPC_DBG_DSM;
++	arm_srpgcr |= MXC_SRPGCR_PCR;
++
++	__raw_writel(plat_lpc, MXC_CORTEXA8_PLAT_LPC);
++	__raw_writel(ccm_clpcr, MXC_CCM_CLPCR);
++	__raw_writel(arm_srpgcr, MXC_SRPG_ARM_SRPGCR);
++	__raw_writel(arm_srpgcr, MXC_SRPG_NEON_SRPGCR);
++
++	if (tzic_enable_wake(0) != 0)
++		return -EAGAIN;
++
++	cpu_do_idle();
++	return 0;
++}
++
++static int mx5_pm_valid(suspend_state_t state)
++{
++	return (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX);
++}
++
++static const struct platform_suspend_ops mx5_suspend_ops = {
++	.valid = mx5_pm_valid,
++	.enter = mx5_suspend_enter,
++};
++
++static int __init mx5_pm_init(void)
++{
++	if (cpu_is_mx51())
++		suspend_set_ops(&mx5_suspend_ops);
++
++	return 0;
++}
++device_initcall(mx5_pm_init);
+diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h 
+index 04c7a26..a72839f 100644 
+--- a/arch/arm/plat-mxc/include/mach/mxc.h 
++++ b/arch/arm/plat-mxc/include/mach/mxc.h 
+@@ -54,6 +54,7 @@
+ #ifndef __ASSEMBLY__
+ extern unsigned int __mxc_cpu_type;
++int tzic_enable_wake(int is_idle);
+ #endif
+ 
+ #ifdef CONFIG_ARCH_MX1
+
diff --git a/patches/buildroot/2010.11/040-linux-makefile.patch b/patches/buildroot/2010.11/040-linux-makefile.patch
index 7feaa1d..ca29a96 100644
--- a/patches/buildroot/2010.11/040-linux-makefile.patch
+++ b/patches/buildroot/2010.11/040-linux-makefile.patch
@@ -17,7 +17,7 @@ Index: buildroot/linux/linux.mk
  	$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
  endif
 +ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
-+	(cd $(LINUX26_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
++	(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
 +endif
  	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
  	$(Q)touch $@
diff --git a/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
index 7524141..d8f20b4 100644
--- a/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
+++ b/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
@@ -8,6 +8,6 @@ Index: buildroot/linux/linux.mk
  ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
 +	$(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(LINUX26_DIR)/Makefile
 +	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
- 	(cd $(LINUX26_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
+ 	(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
  endif
  	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index d39eb4e..f32236c 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -20,7 +20,7 @@ Index: buildroot/linux/linux.mk
 +++ buildroot/linux/linux.mk	2011-01-18 22:37:08.000000000 +0100
 @@ -117,6 +117,9 @@
  	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
- 	(cd $(LINUX26_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
+ 	(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
  endif
 +ifeq ($(BR2_PACKAGE_XENOMAI),y)
 +	make -C ../buildroot xenomai-patch-kernel


hooks/post-receive
-- 
armadeus


