[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 15d8c3d8467d0a697d14d144f95b1c4aaf3dbf10
Author: Ondrej Zary <linux at rainbow-software.org>
Date:   Sun Mar 22 14:42:02 2009 -0400

    Forced shutdown for GTA02
    
    Hello,
    this patch adds "force-shutdown" feature for GTA02. When the power button is
    held pressed for 8 seconds, the power is turned off. No need to remove the
    battery anymore. Patch is against andy-tracking.
    
    Signed-off-by: Ondrej Zary <linux at rainbow-software.org>
    Signed-off-by: Nicolas Dufresne <nicolas.dufresne at gmail.com>

diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 229271b..e1f8b9b 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -459,6 +459,13 @@ static void gta02_pmu_event_callback(struct pcf50633 *pcf, int irq)
 	}
 }
 
+static void gta02_pmu_force_shutdown(struct pcf50633 *pcf)
+{
+	pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
+			PCF50633_OOCSHDWN_GOSTDBY, PCF50633_OOCSHDWN_GOSTDBY);
+}
+
+
 static void gta02_udc_vbus_draw(unsigned int ma)
 {
         if (!gta02_pcf)
@@ -685,6 +692,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
 	.probe_done = gta02_pmu_attach_child_devices,
 	.regulator_registered = gta02_pmu_regulator_registered,
 	.mbc_event_callback = gta02_pmu_event_callback,
+	.force_shutdown = gta02_pmu_force_shutdown,
 };
 
 static void mangle_pmu_pdata_by_system_rev(void)

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko