Commit b95ace54 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Haojian Zhuang
Browse files

ARM: pxa: fix gpio wakeup setting 



In 3.3, gpio wakeup setting was broken. The call
enable_irq_wake() didn't set up the PXA gpio registers
(PWER, ...) anymore.

Fix it at least for pxa27x. The driver doesn't seem to be
used in pxa25x (weird ...), and the fix doesn't extend to
pxa3xx and pxa95x (which don't have a gpio_set_wake()
available).

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent 66f75a5d

arch/arm/mach-pxa/pxa27x.c

+5 −1
Original line number Diff line number Diff line
@@ -421,8 +421,11 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) 
	pxa_register_device(&pxa27x_device_i2c_power, info);

}



static struct pxa_gpio_platform_data pxa27x_gpio_info __initdata = {

	.gpio_set_wake = gpio_set_wake,

};



static struct platform_device *devices[] __initdata = {

	&pxa_device_gpio,

	&pxa27x_device_udc,

	&pxa_device_pmu,

	&pxa_device_i2s,
@@ -458,6 +461,7 @@ static int __init pxa27x_init(void) 
		register_syscore_ops(&pxa2xx_mfp_syscore_ops);

		register_syscore_ops(&pxa2xx_clock_syscore_ops);



		pxa_register_device(&pxa_device_gpio, &pxa27x_gpio_info);

		ret = platform_add_devices(devices, ARRAY_SIZE(devices));

	}

drivers/gpio/gpio-pxa.c

+19 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct pxa_gpio_chip { 
	unsigned long	irq_mask;

	unsigned long	irq_edge_rise;

	unsigned long	irq_edge_fall;

	int (*set_wake)(unsigned int gpio, unsigned int on);



#ifdef CONFIG_PM

	unsigned long	saved_gplr;
@@ -269,7 +270,8 @@ static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
				(value ? GPSR_OFFSET : GPCR_OFFSET));

}



static int __devinit pxa_init_gpio_chip(int gpio_end)

static int __devinit pxa_init_gpio_chip(int gpio_end,

					int (*set_wake)(unsigned int, unsigned int))

{

	int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;

	struct pxa_gpio_chip *chips;
@@ -285,6 +287,7 @@ static int __devinit pxa_init_gpio_chip(int gpio_end) 


		sprintf(chips[i].label, "gpio-%d", i);

		chips[i].regbase = gpio_reg_base + BANK_OFF(i);

		chips[i].set_wake = set_wake;



		c->base  = gpio;

		c->label = chips[i].label;
@@ -412,6 +415,17 @@ static void pxa_mask_muxed_gpio(struct irq_data *d) 
	writel_relaxed(gfer, c->regbase + GFER_OFFSET);

}



static int pxa_gpio_set_wake(struct irq_data *d, unsigned int on)

{

	int gpio = pxa_irq_to_gpio(d->irq);

	struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);



	if (c->set_wake)

		return c->set_wake(gpio, on);

	else

		return 0;

}



static void pxa_unmask_muxed_gpio(struct irq_data *d)

{

	int gpio = pxa_irq_to_gpio(d->irq);
@@ -427,6 +441,7 @@ static struct irq_chip pxa_muxed_gpio_chip = { 
	.irq_mask	= pxa_mask_muxed_gpio,

	.irq_unmask	= pxa_unmask_muxed_gpio,

	.irq_set_type	= pxa_gpio_irq_type,

	.irq_set_wake	= pxa_gpio_set_wake,

};



static int pxa_gpio_nums(void)
@@ -471,6 +486,7 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev) 
	struct pxa_gpio_chip *c;

	struct resource *res;

	struct clk *clk;

	struct pxa_gpio_platform_data *info;

	int gpio, irq, ret;

	int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0;
@@ -516,7 +532,8 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev) 
	}



	/* Initialize GPIO chips */

	pxa_init_gpio_chip(pxa_last_gpio);

	info = dev_get_platdata(&pdev->dev);

	pxa_init_gpio_chip(pxa_last_gpio, info ? info->gpio_set_wake : NULL);



	/* clear all GPIO edge detects */

	for_each_gpio_chip(gpio, c) {

include/linux/gpio-pxa.h

+4 −0
Original line number Diff line number Diff line
@@ -13,4 +13,8 @@ extern int pxa_last_gpio; 


extern int pxa_irq_to_gpio(int irq);



struct pxa_gpio_platform_data {

	int (*gpio_set_wake)(unsigned int gpio, unsigned int on);

};



#endif /* __GPIO_PXA_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE