Merge Zaurus branch (3a8182bd) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/common/sharpsl_pm.c

+11 −17

Original line number	Diff line number	Diff line
		@@ -49,13 +49,6 @@
		#define SHARPSL_CHARGE_CO_CHECK_TIME 5 /* 5 msec */
		#define SHARPSL_CHARGE_RETRY_CNT 1 /* eqv. 10 min */

		#define SHARPSL_CHARGE_ON_VOLT 0x99 /* 2.9V */
		#define SHARPSL_CHARGE_ON_TEMP 0xe0 /* 2.9V */
		#define SHARPSL_CHARGE_ON_ACIN_HIGH 0x9b /* 6V */
		#define SHARPSL_CHARGE_ON_ACIN_LOW 0x34 /* 2V */
		#define SHARPSL_FATAL_ACIN_VOLT 182 /* 3.45V */
		#define SHARPSL_FATAL_NOACIN_VOLT 170 /* 3.40V */

		/*
		* Prototypes
		*/
		@@ -82,12 +75,13 @@ DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger);
		static int get_percentage(int voltage)
		{
		int i = sharpsl_pm.machinfo->bat_levels - 1;
		int bl_status = sharpsl_pm.machinfo->backlight_get_status ? sharpsl_pm.machinfo->backlight_get_status() : 0;
		struct battery_thresh *thresh;

		if (sharpsl_pm.charge_mode == CHRG_ON)
		thresh=sharpsl_pm.machinfo->bat_levels_acin;
		thresh = bl_status ? sharpsl_pm.machinfo->bat_levels_acin_bl : sharpsl_pm.machinfo->bat_levels_acin;
		else
		thresh=sharpsl_pm.machinfo->bat_levels_noac;
		thresh = bl_status ? sharpsl_pm.machinfo->bat_levels_noac_bl : sharpsl_pm.machinfo->bat_levels_noac;

		while (i > 0 && (voltage > thresh[i].voltage))
		i--;
		@@ -131,7 +125,7 @@ static void sharpsl_battery_thread(void *private_)
		sharpsl_pm.battstat.ac_status = (sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN) ? APM_AC_ONLINE : APM_AC_OFFLINE);

		/* Corgi cannot confirm when battery fully charged so periodically kick! */
		if (machine_is_corgi() && (sharpsl_pm.charge_mode == CHRG_ON)
		if (!sharpsl_pm.machinfo->batfull_irq && (sharpsl_pm.charge_mode == CHRG_ON)
		&& time_after(jiffies, sharpsl_pm.charge_start_time + SHARPSL_CHARGE_ON_TIME_INTERVAL))
		schedule_work(&toggle_charger);

		@@ -166,11 +160,11 @@ static void sharpsl_battery_thread(void *private_)
		&& ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) \|\|
		(sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
		if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
		corgibl_limit_intensity(1);
		sharpsl_pm.machinfo->backlight_limit(1);
		sharpsl_pm.flags \|= SHARPSL_BL_LIMIT;
		}
		} else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) {
		corgibl_limit_intensity(0);
		sharpsl_pm.machinfo->backlight_limit(0);
		sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;
		}

		@@ -418,7 +412,7 @@ static int sharpsl_check_battery_temp(void)
		val = get_select_val(buff);

		dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);
		if (val > SHARPSL_CHARGE_ON_TEMP)
		if (val > sharpsl_pm.machinfo->charge_on_temp)
		return -1;

		return 0;
		@@ -450,7 +444,7 @@ static int sharpsl_check_battery_voltage(void)
		val = get_select_val(buff);
		dev_dbg(sharpsl_pm.dev, "Battery Voltage: %d\n", val);

		if (val < SHARPSL_CHARGE_ON_VOLT)
		if (val < sharpsl_pm.machinfo->charge_on_volt)
		return -1;

		return 0;
		@@ -468,7 +462,7 @@ static int sharpsl_ac_check(void)
		temp = get_select_val(buff);
		dev_dbg(sharpsl_pm.dev, "AC Voltage: %d\n",temp);

		if ((temp > SHARPSL_CHARGE_ON_ACIN_HIGH) \|\| (temp < SHARPSL_CHARGE_ON_ACIN_LOW)) {
		if ((temp > sharpsl_pm.machinfo->charge_acin_high) \|\| (temp < sharpsl_pm.machinfo->charge_acin_low)) {
		dev_err(sharpsl_pm.dev, "Error: AC check failed.\n");
		return -1;
		}
		@@ -627,8 +621,8 @@ static int sharpsl_fatal_check(void)
		temp = get_select_val(buff);
		dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %d\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT));

		if ((acin && (temp < SHARPSL_FATAL_ACIN_VOLT)) \|\|
		(!acin && (temp < SHARPSL_FATAL_NOACIN_VOLT)))
		if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) \|\|
		(!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt)))
		return -1;
		return 0;
		}

arch/arm/kernel/process.c

+35 −26

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <linux/init.h>
		#include <linux/cpu.h>
		#include <linux/elfcore.h>
		#include <linux/pm.h>

		#include <asm/leds.h>
		#include <asm/processor.h>
		@@ -71,8 +72,36 @@ static int __init hlt_setup(char *__unused)
		__setup("nohlt", nohlt_setup);
		__setup("hlt", hlt_setup);

		void arm_machine_restart(char mode)
		{
		/*
		* Clean and disable cache, and turn off interrupts
		*/
		cpu_proc_fin();

		/*
		* Tell the mm system that we are going to reboot -
		* we may need it to insert some 1:1 mappings so that
		* soft boot works.
		*/
		setup_mm_for_reboot(mode);

		/*
		* Now call the architecture specific reboot code.
		*/
		arch_reset(mode);

		/*
		* Whoops - the architecture was unable to reboot.
		* Tell the user!
		*/
		mdelay(1000);
		printk("Reboot failed -- System halted\n");
		while (1);
		}

		/*
		* The following aren't currently used.
		* Function pointers to optional machine specific functions
		*/
		void (*pm_idle)(void);
		EXPORT_SYMBOL(pm_idle);
		@@ -80,6 +109,10 @@ EXPORT_SYMBOL(pm_idle);
		void (*pm_power_off)(void);
		EXPORT_SYMBOL(pm_power_off);

		void (*arm_pm_restart)(char str) = arm_machine_restart;
		EXPORT_SYMBOL_GPL(arm_pm_restart);


		/*
		* This is our default idle handler. We need to disable
		* interrupts here to ensure we don't miss a wakeup call.
		@@ -151,33 +184,9 @@ void machine_power_off(void)
		pm_power_off();
		}


		void machine_restart(char * __unused)
		{
		/*
		* Clean and disable cache, and turn off interrupts
		*/
		cpu_proc_fin();

		/*
		* Tell the mm system that we are going to reboot -
		* we may need it to insert some 1:1 mappings so that
		* soft boot works.
		*/
		setup_mm_for_reboot(reboot_mode);

		/*
		* Now call the architecture specific reboot code.
		*/
		arch_reset(reboot_mode);

		/*
		* Whoops - the architecture was unable to reboot.
		* Tell the user!
		*/
		mdelay(1000);
		printk("Reboot failed -- System halted\n");
		while (1);
		arm_pm_restart(reboot_mode);
		}

		void __show_regs(struct pt_regs *regs)

arch/arm/mach-pxa/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ config MACH_POODLE
		bool "Enable Sharp SL-5600 (Poodle) Support"
		depends PXA_SHARPSL_25x
		select SHARP_LOCOMO
		select PXA_SSP

		config MACH_CORGI
		bool "Enable Sharp SL-C700 (Corgi) Support"

arch/arm/mach-pxa/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ obj-$(CONFIG_ARCH_PXA_IDP) += idp.o
		obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o
		obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o
		obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o
		obj-$(CONFIG_MACH_POODLE) += poodle.o
		obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o
		obj-$(CONFIG_MACH_TOSA) += tosa.o

		# Support for blinky lights

arch/arm/mach-pxa/corgi.c

+25 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/fs.h>
		#include <linux/interrupt.h>
		#include <linux/mmc/host.h>
		#include <linux/pm.h>

		#include <asm/setup.h>
		#include <asm/memory.h>
		@@ -26,6 +27,7 @@
		#include <asm/hardware.h>
		#include <asm/irq.h>
		#include <asm/io.h>
		#include <asm/system.h>

		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>
		@@ -310,8 +312,31 @@ static struct platform_device *devices[] __initdata = {
		&corgiled_device,
		};

		static void corgi_poweroff(void)
		{
		RCSR = RCSR_HWR \| RCSR_WDR \| RCSR_SMR \| RCSR_GPR;

		if (!machine_is_corgi())
		/* Green LED off tells the bootloader to halt */
		reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
		arm_machine_restart('h');
		}

		static void corgi_restart(char mode)
		{
		RCSR = RCSR_HWR \| RCSR_WDR \| RCSR_SMR \| RCSR_GPR;

		if (!machine_is_corgi())
		/* Green LED on tells the bootloader to reboot */
		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
		arm_machine_restart('h');
		}

		static void __init corgi_init(void)
		{
		pm_power_off = corgi_poweroff;
		arm_pm_restart = corgi_restart;

		/* setup sleep mode values */
		PWER = 0x00000002;
		PFER = 0x00000000;