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)

arch/arm/configs/em_x270_defconfig

deleted100644 → 0
+0 −1265

File deleted.

Preview size limit exceeded, changes collapsed.

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

+597 −265

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+37 −22
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ endmenu 


endif



choice

	prompt "Select target board"

menu "Select target boards"



config ARCH_GUMSTIX

	bool "Gumstix XScale boards"
@@ -37,10 +36,12 @@ config ARCH_LUBBOCK 
config MACH_LOGICPD_PXA270

	bool "LogicPD PXA270 Card Engine Development Platform"

	select PXA27x

	select HAVE_PWM



config MACH_MAINSTONE

	bool "Intel HCDDBBVA0 Development Platform"

	select PXA27x

	select HAVE_PWM



config ARCH_PXA_IDP

	bool "Accelent Xscale IDP"
@@ -116,6 +117,7 @@ config MACH_COLIBRI 
config MACH_ZYLONITE

	bool "PXA3xx Development Platform"

	select PXA3xx

	select HAVE_PWM



config MACH_LITTLETON

	bool "PXA3xx Form Factor Platform (aka Littleton)"
@@ -138,7 +140,7 @@ config MACH_PCM027 
	select PXA27x

	select IWMMXT



endchoice

endmenu



choice

	prompt "Used baseboard"
@@ -146,25 +148,24 @@ choice 


config MACH_PCM990_BASEBOARD

	bool "PHYTEC PCM-990 development board"

	select HAVE_PWM



endchoice



if PXA_SHARPSL



choice

	prompt "Select target Sharp Zaurus device range"

	prompt "display on pcm990"

	depends on MACH_PCM990_BASEBOARD



config PXA_SHARPSL_25x

	bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"

	select PXA25x

config PCM990_DISPLAY_SHARP

	bool "sharp lq084v1dg21 stn display"



config PXA_SHARPSL_27x

	bool "Sharp PXA270 models (SL-Cxx00)"

	select PXA27x

config PCM990_DISPLAY_NEC

	bool "nec nl6448bc20_18d tft display"



endchoice

config PCM990_DISPLAY_NONE

	bool "no display"



endif

endchoice



if ARCH_GUMSTIX
@@ -199,28 +200,33 @@ endmenu 


config MACH_POODLE

	bool "Enable Sharp SL-5600 (Poodle) Support"

	depends on PXA_SHARPSL_25x

	depends on PXA_SHARPSL

	select PXA25x

	select SHARP_LOCOMO

	select PXA_SSP



config MACH_CORGI

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

	depends on PXA_SHARPSL_25x

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_SHEPHERD

	bool "Enable Sharp SL-C750 (Shepherd) Support"

	depends on PXA_SHARPSL_25x

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_HUSKY

	bool "Enable Sharp SL-C760 (Husky) Support"

	depends on PXA_SHARPSL_25x

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_SHARP_C7xx



config MACH_AKITA

	bool "Enable Sharp SL-1000 (Akita) Support"

	depends on PXA_SHARPSL_27x

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00

	select MACH_SPITZ

	select I2C
@@ -228,17 +234,20 @@ config MACH_AKITA 


config MACH_SPITZ

	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

	depends on PXA_SHARPSL_27x

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00



config MACH_BORZOI

	bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"

	depends on PXA_SHARPSL_27x

	depends on PXA_SHARPSL

	select PXA27x

	select PXA_SHARP_Cxx00



config MACH_TOSA

	bool "Enable Sharp SL-6000x (Tosa) Support"

	depends on PXA_SHARPSL_25x

	depends on PXA_SHARPSL

	select PXA25x



config PXA25x

	bool
@@ -273,4 +282,10 @@ config PXA_SSP 
	tristate

	help

	  Enable support for PXA2xx SSP ports



config PXA_PWM

	tristate

	default BACKLIGHT_PWM

	help

	  Enable support for PXA2xx/PXA3xx PWM controllers

endif