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

Commit 53ffe3b4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Merge most of the PXA work for initial merge 

This includes PXA work up to the SPI changes for the initial merge,
since e172274c depends on the SPI
tree being merged.

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
parents f0006314 cabb352a

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)

arch/arm/configs/em_x270_defconfig

deleted100644 → 0
+0 −1264

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/cm_x270_defconfig→arch/arm/configs/xm_x270_defconfig

+596 −264

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-ixp4xx/common.c

+2 −2
Original line number Diff line number Diff line
@@ -326,11 +326,11 @@ static struct resource ixp4xx_udc_resources[] = { 
};



/*

 * USB device controller. The IXP4xx uses the same controller as PXA2XX,

 * USB device controller. The IXP4xx uses the same controller as PXA25X,

 * so we just use the same device.

 */

static struct platform_device ixp4xx_udc_device = {

	.name           = "pxa2xx-udc",

	.name           = "pxa25x-udc",

	.id             = -1,

	.num_resources  = 2,

	.resource       = ixp4xx_udc_resources,