Commit 050335db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (42 commits)
  [ARM] Fix tosa build error
  [ARM] 3610/1: Make reboot work on Versatile
  [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig
  [ARM] 3591/1: Anubis: IDE device definitions
  [ARM] Include asm/hardware.h not asm/arch/hardware.h
  [ARM] 3594/1: Poodle: Add touchscreen support + other updates
  [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters
  [ARM] 3561/1: Poodle: Correct the MMC/SD power control
  [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds
  [ARM] 3599/1: AT91RM9200 remove global variables
  [ARM] 3607/1: AT91RM9200 misc fixes
  [ARM] 3605/1: AT91RM9200 Power Management
  [ARM] 3604/1: AT91RM9200 New boards
  [ARM] 3603/1: AT91RM9200 remove old files
  [ARM] 3592/1: AT91RM9200 Serial driver update
  [ARM] 3590/1: AT91RM9200 Platform devices support
  [ARM] 3589/1: AT91RM9200 DK/EK board update
  [ARM] 3588/1: AT91RM9200 CSB337/637 board update
  [ARM] 3587/1: AT91RM9200 hardware headers
  [ARM] 3586/1: AT91RM9200 header update
  ...
parents a4cfae13 905f1467

arch/arm/Kconfig

+58 −50
Original line number Diff line number Diff line
@@ -93,15 +93,49 @@ choice 
	prompt "ARM system type"

	default ARCH_VERSATILE



config ARCH_AAEC2000

	bool "Agilent AAEC-2000 based"

	select ARM_AMBA

	help

	  This enables support for systems based on the Agilent AAEC-2000



config ARCH_INTEGRATOR

	bool "ARM Ltd. Integrator family"

	select ARM_AMBA

	select ICST525

	help

	  Support for ARM's Integrator platform.



config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select ICST307

	help

	  This enables support for ARM Ltd RealView boards.



config ARCH_VERSATILE

	bool "ARM Ltd. Versatile family"

	select ARM_AMBA

	select ARM_VIC

	select ICST307

	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_AT91RM9200

	bool "Atmel AT91RM9200"

	help

	  Say Y here if you intend to run this kernel on an Atmel

	  AT91RM9200-based board.



config ARCH_CLPS7500

	bool "Cirrus-CL-PS7500FE"

	bool "Cirrus CL-PS7500FE"

	select TIMER_ACORN

	select ISA

	help

	  Support for the Cirrus Logic PS7500FE system-on-a-chip.



config ARCH_CLPS711X

	bool "CLPS711x/EP721x-based"

	bool "Cirrus Logic CLPS711x/EP721x-based"

	help

	  Support for Cirrus Logic 711x/721x based boards.
@@ -135,12 +169,22 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_INTEGRATOR

	bool "Integrator"

	select ARM_AMBA

	select ICST525

config ARCH_NETX

	bool "Hilscher NetX based"

	select ARM_VIC

	help

	  Support for ARM's Integrator platform.

	  This enables support for systems based on the Hilscher NetX Soc



config ARCH_H720X

	bool "Hynix HMS720x-based"

	select ISA_DMA_API

	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_IMX

	bool "IMX"

	help

	  Support for Motorola's i.MX family of processors (MX1, MXL).



config ARCH_IOP3XX

	bool "IOP3xx-based"
@@ -178,6 +222,11 @@ config ARCH_L7200 
	  If you have any questions or comments about the Linux kernel port

	  to this board, send e-mail to <sjhill@cotw.com>.



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	help

	  This enables support for Philips PNX4008 mobile platform.



config ARCH_PXA

	bool "PXA2xx-based"

	select ARCH_MTD_XIP
@@ -232,49 +281,6 @@ config ARCH_OMAP 
	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).



config ARCH_VERSATILE

	bool "Versatile"

	select ARM_AMBA

	select ARM_VIC

	select ICST307

	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_REALVIEW

	bool "RealView"

	select ARM_AMBA

	select ICST307

	help

	  This enables support for ARM Ltd RealView boards.



config ARCH_IMX

	bool "IMX"

	help

	  Support for Motorola's i.MX family of processors (MX1, MXL).



config ARCH_H720X

	bool "Hynix-HMS720x-based"

	select ISA_DMA_API

	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_AAEC2000

	bool "Agilent AAEC-2000 based"

	select ARM_AMBA

	help

	  This enables support for systems based on the Agilent AAEC-2000



config ARCH_AT91RM9200

	bool "AT91RM9200"

	help

	  Say Y here if you intend to run this kernel on an Atmel

	  AT91RM9200-based board.



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	help

	  This enables support for Philips PNX4008 mobile platform.



endchoice



source "arch/arm/mach-clps711x/Kconfig"
@@ -319,6 +325,8 @@ source "arch/arm/mach-realview/Kconfig" 


source "arch/arm/mach-at91rm9200/Kconfig"



source "arch/arm/mach-netx/Kconfig"



# Definitions to make life easier

config ARCH_ACORN

	bool

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ endif 
 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200

 machine-$(CONFIG_ARCH_EP93XX)     := ep93xx

 machine-$(CONFIG_ARCH_PNX4008)    := pnx4008

 machine-$(CONFIG_ARCH_NETX)       := netx



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/boot/compressed/head-at91rm9200.S

+12 −0
Original line number Diff line number Diff line
@@ -49,6 +49,18 @@ 
		cmp	r7, r3

		beq	99f



		@ Embest ATEB9200 : 923

		mov	r3,	#(MACH_TYPE_ATEB9200 & 0xff)

		orr	r3, r3,	#(MACH_TYPE_ATEB9200 & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Sperry-Sun KAFA : 662

		mov	r3,	#(MACH_TYPE_KAFA & 0xff)

		orr	r3, r3,	#(MACH_TYPE_KAFA & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Unknown board, use the AT91RM9200DK board

		@ mov	r7, #MACH_TYPE_AT91RM9200

		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)

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/configs/ateb9200_defconfig

0 → 100644
+1312 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE