[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-66-g55e93b4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-66-g55e93b4
|
From: Julien B a. A. <ar...@us...> - 2009-09-16 17:35:09
|
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 55e93b404fdde9655d6820590e2251d3bfb6eac6 (commit)
from 83b7997a3a955c02f1d9a46c331b4f38da349fe2 (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 55e93b404fdde9655d6820590e2251d3bfb6eac6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Sep 16 19:35:01 2009 +0200
[LINUX] Separates module and baseboard power management parts
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 144 +++++++++++---------
1 files changed, 77 insertions(+), 67 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 0ddfef9..e4d113e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-15 10:27:06.000000000 +0200
-@@ -0,0 +1,1277 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-16 19:28:56.000000000 +0200
+@@ -0,0 +1,1221 @@
+ /*
+ * apf27.c
+ *
@@ -95,6 +95,10 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#include "crm_regs.h"
+
+extern void apf27_baseboard_init(void);
++#ifdef CONFIG_PM
++extern void apf27_baseboard_resume(void);
++extern void apf27_baseboard_suspend(void);
++#endif
+
+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
+#define CONFIG_IMX_BACKLIGHT
@@ -966,42 +970,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+
+/* APF27 power management stuff */
+
-+#define APF27DEV_USER_SWITCH (GPIO_PORTF | 13)
-+#define APF27DEV_USER_SWITCH_IRQ (IRQ_GPIOF(13))
-+#define APF27DEV_USER_LED (GPIO_PORTF | 14)
-+#define APF27DEV_POWER_DOWN_NOT (GPIO_PORTF | 16)
-+
-+static int apf27dev_pwr_ctl_pins[] = {
-+ (APF27DEV_POWER_DOWN_NOT | GPIO_OUT | GPIO_GPIO),
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ (APF27DEV_USER_SWITCH | GPIO_IN | GPIO_GPIO),
-+#endif
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ (APF27DEV_USER_LED | GPIO_OUT | GPIO_GPIO),
-+#endif
-+};
-+
-+static void apf27dev_power_up(void)
-+{
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
-+}
-+
-+static void apf27dev_power_down(void)
-+{
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
-+}
-+
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+static irqreturn_t apf27dev_user_switch_irq_handler(int irq, void *dev_id)
-+{
-+ return IRQ_HANDLED;
-+}
-+#endif
-+
-+static int gpio_pwr_ctl_active(void)
++static void gpio_pwr_ctl_active(void)
+{
-+ int err;
-+
+#ifdef CONFIG_FB_MXC
+ int i;
+ /* force LCD data/control lines to 0 before powering the LCD
@@ -1015,28 +985,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ /* wait a few milli */
+ mdelay(100);
+#endif
-+
-+ err = mxc_gpio_setup_multiple_pins(apf27dev_pwr_ctl_pins,
-+ ARRAY_SIZE(apf27dev_pwr_ctl_pins), "pwr-ctl");
-+ if (err < 0)
-+ pr_err("Failed to register power control pins !\n");
-+
-+ apf27dev_power_up();
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 0);
-+#endif
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ err = request_irq(APF27DEV_USER_SWITCH_IRQ, apf27dev_user_switch_irq_handler,
-+ IRQF_TRIGGER_FALLING,
-+ "PM irq", NULL);
-+ if (err < 0)
-+ pr_err("Failed to register PM irq !\n");
-+#endif
-+
-+ return err;
+}
+
-+
+#ifdef CONFIG_PM
+
+#ifdef APF27_PM_DEBUG
@@ -1120,10 +1070,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+#ifdef CONFIG_USB_EHCI_MXC
+ isp1504_suspend((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
+#endif
-+ apf27dev_power_down();
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 1);
-+#endif
++ apf27_baseboard_suspend();
+#ifdef APF27_PM_DEBUG
+ apf27_force_gpios();
+ dump_clocks();
@@ -1138,10 +1085,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+{
+ printk("___ %s\n", __func__);
+
-+ apf27dev_power_up();
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 0);
-+#endif
++ apf27_baseboard_resume();
+
+ return 0;
+}
@@ -1291,8 +1235,8 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-15 10:21:40.000000000 +0200
-@@ -0,0 +1,576 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-16 19:18:59.000000000 +0200
+@@ -0,0 +1,642 @@
+ /*
+ * apf27-dev.c
+ * Support of AFP27 module's development baseboard
@@ -1837,10 +1781,76 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_VIDEO_OV96xx */
+
+
++/* APF27Dev power management stuff */
++
++#define APF27DEV_USER_SWITCH (GPIO_PORTF | 13)
++#define APF27DEV_USER_SWITCH_IRQ (IRQ_GPIOF(13))
++#define APF27DEV_USER_LED (GPIO_PORTF | 14)
++#define APF27DEV_POWER_DOWN_NOT (GPIO_PORTF | 16)
++
++static int apf27dev_pwr_ctl_pins[] = {
++ (APF27DEV_POWER_DOWN_NOT | GPIO_OUT | GPIO_GPIO),
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
++ (APF27DEV_USER_SWITCH | GPIO_IN | GPIO_GPIO),
++#endif
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ (APF27DEV_USER_LED | GPIO_OUT | GPIO_GPIO),
++#endif
++};
++
++void apf27_baseboard_resume(void)
++{
++ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ gpio_set_value(GPIO_PORTF | 14, 0);
++#endif
++}
++
++void apf27_baseboard_suspend(void)
++{
++ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ gpio_set_value(GPIO_PORTF | 14, 1);
++#endif
++}
++
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
++static irqreturn_t apf27dev_user_switch_irq_handler(int irq, void *dev_id)
++{
++ return IRQ_HANDLED;
++}
++#endif
++
++static int apf27dev_pwr_ctrl_gpio_active(void)
++{
++ int err;
++
++ err = mxc_gpio_setup_multiple_pins(apf27dev_pwr_ctl_pins,
++ ARRAY_SIZE(apf27dev_pwr_ctl_pins), "pwr-ctl");
++ if (err < 0)
++ pr_err("Failed to register power control pins !\n");
++
++ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
++#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
++ gpio_set_value(GPIO_PORTF | 14, 0);
++#endif
++#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
++ err = request_irq(APF27DEV_USER_SWITCH_IRQ, apf27dev_user_switch_irq_handler,
++ IRQF_TRIGGER_FALLING,
++ "PM irq", NULL);
++ if (err < 0)
++ pr_err("Failed to register PM irq !\n");
++#endif
++
++ return err;
++}
++
+void __init apf27_baseboard_init(void)
+{
+ printk(" Registering APF27_Dev ressources:");
+
++ apf27dev_pwr_ctrl_gpio_active();
++
+#ifdef CONFIG_GSM
+ mxc_register_device(&mxc_uart_device1, &uart1_pdata);
+#endif
hooks/post-receive
--
armadeus
|
