diff options
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
| -rw-r--r-- | drivers/gpio/gpio-pxa.c | 26 | 
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 58a6a63a6ec..793767b0962 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -62,6 +62,7 @@ int pxa_last_gpio;  #ifdef CONFIG_OF  static struct irq_domain *domain; +static struct device_node *pxa_gpio_of_node;  #endif  struct pxa_gpio_chip { @@ -277,6 +278,24 @@ static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value)  				(value ? GPSR_OFFSET : GPCR_OFFSET));  } +#ifdef CONFIG_OF_GPIO +static int pxa_gpio_of_xlate(struct gpio_chip *gc, +			     const struct of_phandle_args *gpiospec, +			     u32 *flags) +{ +	if (gpiospec->args[0] > pxa_last_gpio) +		return -EINVAL; + +	if (gc != &pxa_gpio_chips[gpiospec->args[0] / 32].chip) +		return -EINVAL; + +	if (flags) +		*flags = gpiospec->args[1]; + +	return gpiospec->args[0] % 32; +} +#endif +  static int __devinit pxa_init_gpio_chip(int gpio_end,  					int (*set_wake)(unsigned int, unsigned int))  { @@ -304,6 +323,11 @@ static int __devinit pxa_init_gpio_chip(int gpio_end,  		c->get = pxa_gpio_get;  		c->set = pxa_gpio_set;  		c->to_irq = pxa_gpio_to_irq; +#ifdef CONFIG_OF_GPIO +		c->of_node = pxa_gpio_of_node; +		c->of_xlate = pxa_gpio_of_xlate; +		c->of_gpio_n_cells = 2; +#endif  		/* number of GPIOs on last bank may be less than 32 */  		c->ngpio = (gpio + 31 > gpio_end) ? (gpio_end - gpio + 1) : 32; @@ -505,6 +529,7 @@ static int pxa_irq_domain_map(struct irq_domain *d, unsigned int irq,  const struct irq_domain_ops pxa_irq_domain_ops = {  	.map	= pxa_irq_domain_map, +	.xlate	= irq_domain_xlate_twocell,  };  #ifdef CONFIG_OF @@ -545,6 +570,7 @@ static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)  	}  	domain = irq_domain_add_legacy(np, nr_gpios, irq_base, 0,  				       &pxa_irq_domain_ops, NULL); +	pxa_gpio_of_node = np;  	return 0;  err:  	iounmap(gpio_reg_base);  |