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

Commit 0b6c135e 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

parents 00e4acb1 c70f5a60

arch/arm/mach-pxa/corgi.c

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = { 
 * USB Device Controller

 */

static struct pxa2xx_udc_mach_info udc_info __initdata = {

	.gpio_vbus		= -1,

	/* no connect GPIO; corgi can't tell connection status */

	.gpio_pullup		= CORGI_GPIO_USB_PULLUP,

};

arch/arm/mach-pxa/include/mach/mfp-pxa25x.h

+4 −2
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ 
#define GPIO86_nSDCS2		MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH)

#define GPIO87_nSDCS3		MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH)

#define GPIO88_RDnWR		MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH)

#define GPIO89_nACRESET		MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)



/* USB */

#define GPIO9_USB_RCV		MFP_CFG_IN(GPIO9, AF1)
@@ -186,6 +185,9 @@ 
#define GPIO30_ASSP_TXD		MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW)

#define GPIO31_ASSP_SFRM_IN	MFP_CFG_IN(GPIO31, AF1)

#define GPIO31_ASSP_SFRM_OUT	MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW)

#endif



/* AC97 */

#define GPIO89_AC97_nRESET	MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)

#endif	/* CONFIG_CPU_PXA26x */



#endif /* __ASM_ARCH_MFP_PXA25X_H */

arch/arm/mach-pxa/irq.c

+10 −4
Original line number Diff line number Diff line
@@ -164,8 +164,11 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state) 
		saved_icmr[i] = _ICMR(irq);

		_ICMR(irq) = 0;

	}



	if (cpu_is_pxa27x() || cpu_is_pxa3xx()) {

		for (i = 0; i < pxa_internal_irq_nr; i++)

			saved_ipr[i] = IPR(i);

	}



	return 0;

}
@@ -174,12 +177,15 @@ static int pxa_irq_resume(struct sys_device *dev) 
{

	int i, irq = PXA_IRQ(0);



	if (cpu_is_pxa27x() || cpu_is_pxa3xx()) {

		for (i = 0; i < pxa_internal_irq_nr; i++)

			IPR(i) = saved_ipr[i];

	}



	for (i = 0; irq < PXA_IRQ(pxa_internal_irq_nr); i++, irq += 32) {

		_ICMR(irq) = saved_icmr[i];

		_ICLR(irq) = 0;

	}

	for (i = 0; i < pxa_internal_irq_nr; i++)

		IPR(i) = saved_ipr[i];



	ICCR = 1;

	return 0;