Commit 044e5f45 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa' into devel 

Conflicts:

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

MAINTAINERS

+25 −0
Original line number Diff line number Diff line
@@ -475,11 +475,28 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT

P:	Mike Rapoport

M:	mike@compulab.co.il

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/CORGI MACHINE SUPPORT

P:	Richard Purdie

M:	rpurdie@rpsys.net

S:	Maintained



ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)

P:	Daniel Ribeiro

M:	drwyrm@gmail.com

P:	Stefan Schmidt

M:	stefan@openezx.org

P:	Harald Welte

M:	laforge@openezx.org

L:	openezx-devel@lists.openezx.org (subscribers-only)

W:	http://www.openezx.org/

S:	Maintained



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

P:	Lennert Buytenhek

M:	kernel@wantstofly.org
@@ -567,10 +584,18 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 
S:	Maintained



ARM/TOSA MACHINE SUPPORT

P:	Dmitry Baryshkov

M:	dbaryshkov@gmail.com

P:	Dirk Opfer

M:	dirk@opfer-online.de

S:	Maintained



ARM/PALMTX SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

W:	http://hackndev.com

S:	Maintained



ARM/PLEB SUPPORT

P:	Peter Chubb

M:	pleb@gelato.unsw.edu.au

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/sa1111.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 
	if (!sachip)

		return -ENOMEM;



	sachip->clk = clk_get(me, "GPIO27_CLK");

	sachip->clk = clk_get(me, "SA1111_CLK");

	if (!sachip->clk) {

		ret = PTR_ERR(sachip->clk);

		goto err_free;

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→arch/arm/configs/ezx_defconfig

+1614 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.