Index: linux-2.6.12/arch/arm/mach-pxa/spitz_pm.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.12/arch/arm/mach-pxa/spitz_pm.c	2005-08-30 16:11:18.000000000 +0100
@@ -0,0 +1,211 @@
+#include <linux/module.h>
+#include <linux/stat.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <asm/apm.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/hardware.h>
+#include <asm/hardware/scoop.h>
+
+#include <asm/arch/sharpsl.h>
+#include <asm/arch/spitz.h>
+#include <asm/arch/pxa-regs.h>
+#include "sharpsl.h"
+
+//int corgi_ssp_resume(struct device *dev, u32 level);
+int scoop_resume(struct device *dev, uint32_t level);
+
+static int spitz_last_ac_status;
+
+static void spitz_charger_init(void)
+{
+	pxa_gpio_mode(SPITZ_GPIO_KEY_INT | GPIO_IN);
+	pxa_gpio_mode(SPITZ_GPIO_WAKEUP | GPIO_IN);
+	//FIXME - any additions?
+}
+
+static void spitz_charge_led(int on)
+{
+	if (on)
+		set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE);
+	else
+		reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE);
+}
+
+static void spitz_measure_temp(int on)
+{
+	if (on)
+		set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_ADC_TEMP_ON);
+	else
+		reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_ADC_TEMP_ON);
+}
+
+static void spitz_charge(int on)
+{
+	if (on) {
+		if (sharpsl_pm.suspended) {
+			set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_B);
+			reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);
+		} else {
+			reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_B);
+			reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);
+		}
+	} else {
+		reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_B);
+		set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CHRG_ON);
+	}
+}
+
+static void spitz_discharge(int on) 
+{
+	if (on)
+		set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_A);		
+	else
+		reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_JK_A);
+}
+
+static void spitz_presuspend(void) 
+{
+	spitz_last_ac_status = STATUS_AC_IN;
+
+	/* GPIO Sleep Register */
+	PGSR0 = 0x00144018;
+	PGSR1 = 0x00EF0000;
+	if (machine_is_akita()) {
+		PGSR2 = 0x2121C000;
+		PGSR3 = 0x00600400;
+	} else {
+		PGSR2 = 0x0121C000;
+		PGSR3 = 0x00600000;
+	}
+
+	PGSR0 &= ~SPITZ_GPIO_G0_STROBE_BIT;
+	PGSR1 &= ~SPITZ_GPIO_G1_STROBE_BIT;
+	PGSR2 &= ~SPITZ_GPIO_G2_STROBE_BIT;
+	PGSR3 &= ~SPITZ_GPIO_G3_STROBE_BIT;
+	PGSR2 |= GPIO_bit(SPITZ_GPIO_KEY_STROBE0);
+
+
+	pxa_gpio_mode(GPIO18_RDY|GPIO_OUT | GPIO_DFLT_HIGH);
+
+	PRER = GPIO_bit(SPITZ_GPIO_KEY_INT);
+	PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
+	PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC;
+	PKWR = GPIO_bit(SPITZ_GPIO_WAKEUP) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
+	PKSR = 0xffffffff; // clear
+
+	/* nRESET_OUT Disable */
+	PSLR |= PSLR_SL_ROD;
+
+	/* Clear reset status */
+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
+
+	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */
+	PCFR = PCFR_GPR_EN | PCFR_OPDE;
+
+}
+
+static void spitz_postsuspend(void) 
+{
+	pxa_gpio_mode(GPIO18_RDY_MD);
+	pxa_gpio_mode(10 | GPIO_IN);
+
+	//corgi_ssp_resume(&spitzssp_device.dev, RESUME_POWER_ON);
+	scoop_resume(&spitzscoop_device.dev, RESUME_POWER_ON);
+	scoop_resume(&spitzscoop2_device.dev, RESUME_POWER_ON);
+}
+
+static int spitz_should_wakeup(unsigned int resume_on_alarm)
+{
+	int is_resume = 0;
+
+	if (spitz_last_ac_status != STATUS_AC_IN) {
+		if (STATUS_AC_IN) {
+			/* charge on */
+			sharpsl_pm.offline_charge_activate = 1;
+			printk("AC Inserted\n");
+		} else {
+			/* charge off */
+			printk("AC Removed\n");
+			CHARGE_LED_OFF();
+			CHARGE_OFF();
+			sharpsl_pm.charge_mode = CHRG_OFF;
+		}
+		/* Return to suspend as this must be what we were woken for */
+		return 0;
+	}
+
+//	if ( virtual_factor & VIO_FULLCHARGED ) {
+//		sharpsl_battery_charge_hook(0);  /* charge off */
+//	}
+
+//	if ( virtual_factor & VIO_LOCKSW ) {
+//	  if ( AC_IN_STATUS ) {
+//	    // ac-in
+//	    if ( GPLR(GPIO_BAT_COVER ) & GPIO_bit(GPIO_BAT_COVER) ) {
+//	      // unlocked
+//	      // printk("unlocked: charge off\n");
+//	      sharpsl_battery_charge_hook(1);	/* charge off */	      
+//	    } else { 
+//	      // locked
+//	      // printk("locked: charge on\n");
+//	      sharpsl_battery_charge_hook(2);	/* charge on */
+//	    }
+//	  }
+//	}
+
+	if (PEDR & GPIO_bit(SPITZ_GPIO_KEY_INT))
+		is_resume |= GPIO_bit(SPITZ_GPIO_KEY_INT);
+
+	if (PKSR & GPIO_bit(SPITZ_GPIO_WAKEUP))
+		is_resume |= GPIO_bit(SPITZ_GPIO_WAKEUP);
+
+	if (resume_on_alarm && (PEDR & PWER_RTC))
+		is_resume |= PWER_RTC;
+
+	printk("is_resume: %x\n",is_resume);
+	return is_resume;
+}
+
+static unsigned long spitz_charger_wakeup(void) 
+{
+	return (~GPLR0 & GPIO_bit(SPITZ_GPIO_KEY_INT)) | (GPLR0 & GPIO_bit(SPITZ_GPIO_WAKEUP));
+	//FIXME GPIO_bit(CORGI_GPIO_AC_IN), any others?
+}
+
+static int spitz_acin_status(void)
+{
+	return (~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN);
+}
+
+struct sharpsl_charger_machinfo spitz_pm_machinfo = {
+	.init            = spitz_charger_init,
+	.gpio_batlock    = SPITZ_GPIO_BAT_COVER,
+	.gpio_acin       = SPITZ_GPIO_AC_IN,
+	.gpio_batfull    = SPITZ_GPIO_CHRG_FULL,
+	.gpio_fatal      = SPITZ_GPIO_FATAL_BAT,
+	.status_acin     = spitz_acin_status,
+	.discharge       = spitz_discharge,
+	.charge          = spitz_charge,
+	.chargeled       = spitz_charge_led,
+	.measure_temp    = spitz_measure_temp,
+	.presuspend      = spitz_presuspend,
+	.postsuspend     = spitz_postsuspend,
+	.charger_wakeup  = spitz_charger_wakeup,
+	.should_wakeup   = spitz_should_wakeup,
+	.bat_levels      = 40,
+	.bat_levels_noac = spitz_battery_levels_noac,
+	.bat_levels_acin = spitz_battery_levels_acin,
+};
+
+void spitz_mailled(int on) 
+{
+	if (on)
+		set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);		
+	else
+		reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);
+}