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

Commit 9d6163aa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'upload/fix' of git://github.com/hzhuang1/linux into fixes 

From Haojian Zhuang:

* 'upload/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa/spitz_pm: Fix hang when resuming from STR
  ARM: pxa: hx4700: Fix backlight PWM device number
parents 3d70f8c6 510fcb0d

arch/arm/mach-pxa/hx4700.c

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/mfd/asic3.h>

#include <linux/mtd/physmap.h>

#include <linux/pda_power.h>

#include <linux/pwm.h>

#include <linux/pwm_backlight.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/gpio-regulator.h>
@@ -556,7 +557,7 @@ static struct platform_device hx4700_lcd = { 
 */



static struct platform_pwm_backlight_data backlight_data = {

	.pwm_id         = 1,

	.pwm_id         = -1,	/* Superseded by pwm_lookup */

	.max_brightness = 200,

	.dft_brightness = 100,

	.pwm_period_ns  = 30923,
@@ -571,6 +572,10 @@ static struct platform_device backlight = { 
	},

};



static struct pwm_lookup hx4700_pwm_lookup[] = {

	PWM_LOOKUP("pxa27x-pwm.1", 0, "pwm-backlight", NULL),

};



/*

 * USB "Transceiver"

 */
@@ -872,6 +877,7 @@ static void __init hx4700_init(void) 
	pxa_set_stuart_info(NULL);



	platform_add_devices(devices, ARRAY_SIZE(devices));

	pwm_add_table(hx4700_pwm_lookup, ARRAY_SIZE(hx4700_pwm_lookup));



	pxa_set_ficp_info(&ficp_info);

	pxa27x_set_i2c_power_info(NULL);

arch/arm/mach-pxa/spitz_pm.c

+2 −6
Original line number Diff line number Diff line
@@ -86,10 +86,7 @@ static void spitz_discharge1(int on) 
	gpio_set_value(SPITZ_GPIO_LED_GREEN, on);

}



static unsigned long gpio18_config[] = {

	GPIO18_RDY,

	GPIO18_GPIO,

};

static unsigned long gpio18_config = GPIO18_GPIO;



static void spitz_presuspend(void)

{
@@ -112,7 +109,7 @@ static void spitz_presuspend(void) 
	PGSR3 &= ~SPITZ_GPIO_G3_STROBE_BIT;

	PGSR2 |= GPIO_bit(SPITZ_GPIO_KEY_STROBE0);



	pxa2xx_mfp_config(&gpio18_config[0], 1);

	pxa2xx_mfp_config(&gpio18_config, 1);

	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, "Unknown");

	gpio_free(18);
@@ -131,7 +128,6 @@ static void spitz_presuspend(void) 


static void spitz_postsuspend(void)

{

	pxa2xx_mfp_config(&gpio18_config[1], 1);

}



static int spitz_should_wakeup(unsigned int resume_on_alarm)