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

Commit 5dbc80f6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 3ef7143d 1d3e216f

arch/arm/mach-pxa/em-x270.c

+4 −0
Original line number Diff line number Diff line
@@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = { 


static void em_x270_battery_low(void)

{

#if defined(CONFIG_APM_EMULATION)

	apm_queue_event(APM_LOW_BATTERY);

#endif

}



static void em_x270_battery_critical(void)

{

#if defined(CONFIG_APM_EMULATION)

	apm_queue_event(APM_CRITICAL_SUSPEND);

#endif

}



struct da9030_battery_info em_x270_batterty_info = {

arch/arm/mach-pxa/palmld.c

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = { 
	GPIO38_GPIO,	/* wifi ready */

	GPIO81_GPIO,	/* wifi reset */



	/* FFUART */

	GPIO34_FFUART_RXD,

	GPIO39_FFUART_TXD,



	/* HDD */

	GPIO98_GPIO,	/* HDD reset */

	GPIO115_GPIO,	/* HDD power */

arch/arm/mach-pxa/palmt5.c

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = { 
	/* PWM */

	GPIO16_PWM0_OUT,



	/* FFUART */

	GPIO34_FFUART_RXD,

	GPIO39_FFUART_TXD,



	/* MISC */

	GPIO10_GPIO,	/* hotsync button */

	GPIO90_GPIO,	/* power detect */

arch/arm/mach-pxa/palmtx.c

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = { 
	GPIO76_LCD_PCLK,

	GPIO77_LCD_BIAS,



	/* FFUART */

	GPIO34_FFUART_RXD,

	GPIO39_FFUART_TXD,



	/* MISC. */

	GPIO10_GPIO,	/* hotsync button */

	GPIO12_GPIO,	/* power detect */

arch/arm/mach-pxa/zylonite_pxa300.c

+2 −0
Original line number Diff line number Diff line
@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void) 
	for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {

		id = id << 1;

		gpio = mfp_to_gpio(lcd_detect_pins[i]);

		gpio_request(gpio, "LCD_ID_PINS");

		gpio_direction_input(gpio);



		if (gpio_get_value(gpio))

			id = id | 0x1;

		gpio_free(gpio);

	}



	/* lcd id, flush out bit 1 */