Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc614e8 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa

parents bdb08cb2 c0f7edb3 9fc697b0

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ config ARM 
	  Europe.  There is an ARM Linux project with a web page at

	  <http://www.arm.linux.org.uk/>.



config HAVE_PWM

	bool



config SYS_SUPPORTS_APM_EMULATION

	bool

arch/arm/common/sharpsl_pm.c

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/irq.h>

#include <asm/arch/pm.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/sharpsl.h>

#include <asm/hardware/sharpsl_pm.h>
@@ -157,6 +158,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) 
	dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,

			sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);



#ifdef CONFIG_BACKLIGHT_CORGI

	/* If battery is low. limit backlight intensity to save power. */

	if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)

			&& ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) ||
@@ -169,6 +171,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) 
		sharpsl_pm.machinfo->backlight_limit(0);

		sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;

	}

#endif



	/* Suspend if critical battery level */

	if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)