Commit e3329cba authored by Russell King's avatar Russell King
Browse files

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

parents 66e1cfe6 285ca2ee

arch/arm/mach-pxa/colibri-evalboard.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void) 
			GPIO0_COLIBRI_PXA270_SD_DETECT;

	if (machine_is_colibri300())	/* PXA300 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO39_COLIBRI_PXA300_SD_DETECT;

			GPIO13_COLIBRI_PXA300_SD_DETECT;

	else				/* PXA320 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO28_COLIBRI_PXA320_SD_DETECT;

arch/arm/mach-pxa/colibri-pxa300.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = { 
	GPIO4_MMC1_DAT1,

	GPIO5_MMC1_DAT2,

	GPIO6_MMC1_DAT3,

	GPIO39_GPIO,	/* SD detect */

	GPIO13_GPIO,	/* GPIO13_COLIBRI_PXA300_SD_DETECT */



	/* UHC */

	GPIO0_2_USBH_PEN,

arch/arm/mach-pxa/include/mach/colibri.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {} 
#define GPIO113_COLIBRI_PXA270_TS_IRQ	113



/* GPIO definitions for Colibri PXA300/310 */

#define GPIO39_COLIBRI_PXA300_SD_DETECT	39

#define GPIO13_COLIBRI_PXA300_SD_DETECT	13



/* GPIO definitions for Colibri PXA320 */

#define GPIO28_COLIBRI_PXA320_SD_DETECT	28

arch/arm/mach-pxa/palm27x.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static struct platform_pwm_backlight_data palm27x_backlight_data = { 
	.pwm_id		= 0,

	.max_brightness	= 0xfe,

	.dft_brightness	= 0x7e,

	.pwm_period_ns	= 3500,

	.pwm_period_ns	= 3500 * 1024,

	.init		= palm27x_backlight_init,

	.notify		= palm27x_backlight_notify,

	.exit		= palm27x_backlight_exit,

arch/arm/mach-pxa/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int pxa_pm_enter(suspend_state_t state) 
#endif



	/* skip registers saving for standby */

	if (state != PM_SUSPEND_STANDBY) {

	if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) {

		pxa_cpu_pm_fns->save(sleep_save);

		/* before sleeping, calculate and save a checksum */

		for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
@@ -44,7 +44,7 @@ int pxa_pm_enter(suspend_state_t state) 
	pxa_cpu_pm_fns->enter(state);

	cpu_init();



	if (state != PM_SUSPEND_STANDBY) {

	if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) {

		/* after sleeping, validate the checksum */

		for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)

			checksum += sleep_save[i];

CRA Git | Maintained and supported by SUSTech CRA and CCSE