| Message ID | 1305546104-1511-5-git-send-email-tarun.kanti@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Tarun Kanti DebBarma <tarun.kanti@ti.com> writes: > From: Charulatha V <charu@ti.com> > > gpio_bank_count is the count of number of GPIO devices > in a SoC. Remove this dependency from the driver. Also remove > the dependency on array of pointers to gpio_bank struct of > all GPIO devices. > > The cpu_is*() checks used in omap2_gpio_prepare_for_idle() and > omap2_gpio_resume_after_idle() would be removed in one of the > patches in this series > > Signed-off-by: Charulatha V <charu@ti.com> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > Cc: Kevin Hilman <khilman@ti.com> > Cc: Tony Lindgren <tony@atomide.com> Nice. I like this direction.... Some minor comments below... > --- > arch/arm/mach-omap1/gpio15xx.c | 1 - > arch/arm/mach-omap1/gpio16xx.c | 2 - > arch/arm/mach-omap1/gpio7xx.c | 2 - > arch/arm/mach-omap2/gpio.c | 1 - > arch/arm/plat-omap/gpio.c | 157 ++++++++++++++++--------------- > arch/arm/plat-omap/include/plat/gpio.h | 3 - > 6 files changed, 81 insertions(+), 85 deletions(-) > > diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c > index c3caf25..7a15f69 100644 > --- a/arch/arm/mach-omap1/gpio15xx.c > +++ b/arch/arm/mach-omap1/gpio15xx.c > @@ -117,7 +117,6 @@ static int __init omap15xx_gpio_init(void) > platform_device_register(&omap15xx_mpu_gpio); > platform_device_register(&omap15xx_gpio); > > - gpio_bank_count = 2; > return 0; > } > postcore_initcall(omap15xx_gpio_init); > diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c > index f62eaf3..43718ec 100644 > --- a/arch/arm/mach-omap1/gpio16xx.c > +++ b/arch/arm/mach-omap1/gpio16xx.c > @@ -223,8 +223,6 @@ static int __init omap16xx_gpio_init(void) > for (i = 0; i < ARRAY_SIZE(omap16xx_gpio_dev); i++) > platform_device_register(omap16xx_gpio_dev[i]); > > - gpio_bank_count = ARRAY_SIZE(omap16xx_gpio_dev); > - > return 0; > } > postcore_initcall(omap16xx_gpio_init); > diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c > index 0fc2557..c7684ce 100644 > --- a/arch/arm/mach-omap1/gpio7xx.c > +++ b/arch/arm/mach-omap1/gpio7xx.c > @@ -284,8 +284,6 @@ static int __init omap7xx_gpio_init(void) > for (i = 0; i < ARRAY_SIZE(omap7xx_gpio_dev); i++) > platform_device_register(omap7xx_gpio_dev[i]); > > - gpio_bank_count = ARRAY_SIZE(omap7xx_gpio_dev); > - > return 0; > } > postcore_initcall(omap7xx_gpio_init); > diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c > index 6cd26b4..487b49a 100644 > --- a/arch/arm/mach-omap2/gpio.c > +++ b/arch/arm/mach-omap2/gpio.c > @@ -143,7 +143,6 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) > return PTR_ERR(od); > } > > - gpio_bank_count++; > return 0; > } > > diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c > index 12deb1c..0b76475 100644 > --- a/arch/arm/plat-omap/gpio.c > +++ b/arch/arm/plat-omap/gpio.c > @@ -30,7 +30,10 @@ > #include <mach/gpio.h> > #include <asm/mach/irq.h> > > +static LIST_HEAD(omap_gpio_list); > + > struct gpio_bank { > + struct list_head node; > unsigned long pbase; > void __iomem *base; > u16 irq; > @@ -57,6 +60,7 @@ struct gpio_bank { > bool dbck_flag; > int stride; > u32 width; > + u16 id; > > void (*set_dataout)(struct gpio_bank *bank, int gpio, int enable); > > @@ -80,15 +84,6 @@ struct omap3_gpio_regs { > static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS]; > #endif > > -/* > - * TODO: Cleanup gpio_bank usage as it is having information > - * related to all instances of the device > - */ > -static struct gpio_bank *gpio_bank; > - > -/* TODO: Analyze removing gpio_bank_count usage from driver code */ > -int gpio_bank_count; > - > #define GPIO_INDEX(bank, gpio) (gpio % bank->width) > #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) > #define GPIO_MOD_CTRL_BIT BIT(0) > @@ -859,23 +854,29 @@ static struct platform_device omap_mpuio_device = { > /* could list the /proc/iomem resources */ > }; > > -static inline void mpuio_init(void) > +static inline void mpuio_init(struct gpio_bank *bank) > { > - struct gpio_bank *bank = &gpio_bank[0]; > + static int mpuio_init_done; Why is this flag needed? isn't the bank->method check enough? > + if (mpuio_init_done || (bank->method != METHOD_MPUIO)) > + return; > + > platform_set_drvdata(&omap_mpuio_device, bank); > > if (platform_driver_register(&omap_mpuio_driver) == 0) > (void) platform_device_register(&omap_mpuio_device); > + > + mpuio_init_done = 1; > } > > #else > -static inline void mpuio_init(void) {} > +static inline void mpuio_init(struct gpio_bank *bank) {} > #endif /* 16xx */ > > #else > > #define bank_is_mpuio(bank) 0 > -static inline void mpuio_init(void) {} > +static inline void mpuio_init(struct gpio_bank *bank) {} > > #endif > > @@ -997,18 +998,6 @@ static void __init omap_gpio_show_rev(struct gpio_bank *bank) > */ > static struct lock_class_key gpio_lock_class; > > -static inline int init_gpio_info(struct platform_device *pdev) > -{ > - /* TODO: Analyze removing gpio_bank_count usage from driver code */ > - gpio_bank = kzalloc(gpio_bank_count * sizeof(struct gpio_bank), > - GFP_KERNEL); > - if (!gpio_bank) { > - dev_err(&pdev->dev, "Memory alloc failed for gpio_bank\n"); > - return -ENOMEM; > - } > - return 0; > -} > - > /* TODO: Cleanup cpu_is_* checks */ > static void omap_gpio_mod_init(struct gpio_bank *bank) > { > @@ -1140,36 +1129,37 @@ static void __init omap_gpio_chip_init(struct gpio_bank *bank) > > static int __devinit omap_gpio_probe(struct platform_device *pdev) > { > - static int gpio_init_done; > struct omap_gpio_platform_data *pdata; > struct resource *res; > - int id; > struct gpio_bank *bank; > + int ret = 0; > > - if (!pdev->dev.platform_data) > - return -EINVAL; > - > - pdata = pdev->dev.platform_data; > - > - if (!gpio_init_done) { > - int ret; > - > - ret = init_gpio_info(pdev); > - if (ret) > - return ret; > + if (!pdev->dev.platform_data) { > + ret = -EINVAL; > + goto err_exit; > } > > - id = pdev->id; > - bank = &gpio_bank[id]; > + bank = kzalloc(sizeof(struct gpio_bank), GFP_KERNEL); > + if (!bank) { > + dev_err(&pdev->dev, "Memory alloc failed for gpio_bank\n"); > + ret = -ENOMEM; > + goto err_exit; > + } > > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (unlikely(!res)) { > - dev_err(&pdev->dev, "GPIO Bank %i Invalid IRQ resource\n", id); > - return -ENODEV; > + dev_err(&pdev->dev, "GPIO Bank %i Invalid IRQ resource\n", > + pdev->id); > + ret = -ENODEV; > + goto err_free; > } > > bank->irq = res->start; > + bank->id = pdev->id; > + > + pdata = pdev->dev.platform_data; > bank->virtual_irq_start = pdata->virtual_irq_start; > + > bank->method = pdata->bank_type; > bank->dev = &pdev->dev; > bank->dbck_flag = pdata->dbck_flag; > @@ -1189,39 +1179,47 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) > /* Static mapping, never released */ > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (unlikely(!res)) { > - dev_err(&pdev->dev, "GPIO Bank %i Invalid mem resource\n", id); > - return -ENODEV; > + dev_err(&pdev->dev, "GPIO Bank %i Invalid mem resource\n", > + pdev->id); > + ret = -ENODEV; > + goto err_free; > } > > bank->base = ioremap(res->start, resource_size(res)); > if (!bank->base) { > - dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", id); > - return -ENOMEM; > + dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", > + pdev->id); > + ret = -ENOMEM; > + goto err_free; > } > > pm_runtime_enable(bank->dev); > pm_runtime_get_sync(bank->dev); > > + mpuio_init(bank); How about moving this call into _mod_init(), and call it only when ->method = MPUIO. > omap_gpio_mod_init(bank); > omap_gpio_chip_init(bank); > omap_gpio_show_rev(bank); [...] Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Tarun Kanti DebBarma <tarun.kanti@ti.com> writes: > From: Charulatha V <charu@ti.com> > > gpio_bank_count is the count of number of GPIO devices > in a SoC. Remove this dependency from the driver. Also remove > the dependency on array of pointers to gpio_bank struct of > all GPIO devices. > > The cpu_is*() checks used in omap2_gpio_prepare_for_idle() and > omap2_gpio_resume_after_idle() would be removed in one of the > patches in this series > > Signed-off-by: Charulatha V <charu@ti.com> This is all in the right direction, but some comments about the save/restore context... [...] > @@ -1497,11 +1494,16 @@ void omap2_gpio_resume_after_idle(void) > /* save the registers of bank 2-6 */ > void omap_gpio_save_context(void) > { > - int i; > + struct gpio_bank *bank; > + int i = 0; > > /* saving banks from 2-6 only since GPIO1 is in WKUP */ > - for (i = 1; i < gpio_bank_count; i++) { > - struct gpio_bank *bank = &gpio_bank[i]; > + list_for_each_entry(bank, &omap_gpio_list, node) { > + i++; > + > + if (bank->id == 0) > + continue; > + Rather than add a list iterator here, I'd rather see the save_context called from the prepare_for_idle, only for the specific banks needed (and then gpio_save_context can be removed from pm34xx.c.) Similar for restore. If you prefer, you can do that in an additional patch on top of this one. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Kevin, On Thu, May 19, 2011 at 21:12, Kevin Hilman <khilman@ti.com> wrote: > Tarun Kanti DebBarma <tarun.kanti@ti.com> writes: > >> From: Charulatha V <charu@ti.com> >> >> gpio_bank_count is the count of number of GPIO devices >> in a SoC. Remove this dependency from the driver. Also remove >> the dependency on array of pointers to gpio_bank struct of >> all GPIO devices. >> >> The cpu_is*() checks used in omap2_gpio_prepare_for_idle() and >> omap2_gpio_resume_after_idle() would be removed in one of the >> patches in this series >> >> Signed-off-by: Charulatha V <charu@ti.com> >> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> >> Cc: Kevin Hilman <khilman@ti.com> >> Cc: Tony Lindgren <tony@atomide.com> > > > Nice. I like this direction.... Some minor comments below... > >> --- >> arch/arm/mach-omap1/gpio15xx.c | 1 - >> arch/arm/mach-omap1/gpio16xx.c | 2 - >> arch/arm/mach-omap1/gpio7xx.c | 2 - >> arch/arm/mach-omap2/gpio.c | 1 - >> arch/arm/plat-omap/gpio.c | 157 ++++++++++++++++--------------- >> arch/arm/plat-omap/include/plat/gpio.h | 3 - >> 6 files changed, 81 insertions(+), 85 deletions(-) >> [...] >> >> diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c >> index 12deb1c..0b76475 100644 >> --- a/arch/arm/plat-omap/gpio.c >> +++ b/arch/arm/plat-omap/gpio.c >> @@ -30,7 +30,10 @@ >> #include <mach/gpio.h> >> #include <asm/mach/irq.h> >> >> +static LIST_HEAD(omap_gpio_list); >> + >> struct gpio_bank { >> + struct list_head node; >> unsigned long pbase; >> void __iomem *base; >> u16 irq; >> @@ -57,6 +60,7 @@ struct gpio_bank { >> bool dbck_flag; >> int stride; >> u32 width; >> + u16 id; >> >> void (*set_dataout)(struct gpio_bank *bank, int gpio, int enable); >> >> @@ -80,15 +84,6 @@ struct omap3_gpio_regs { >> static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS]; >> #endif >> >> -/* >> - * TODO: Cleanup gpio_bank usage as it is having information >> - * related to all instances of the device >> - */ >> -static struct gpio_bank *gpio_bank; >> - >> -/* TODO: Analyze removing gpio_bank_count usage from driver code */ >> -int gpio_bank_count; >> - >> #define GPIO_INDEX(bank, gpio) (gpio % bank->width) >> #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) >> #define GPIO_MOD_CTRL_BIT BIT(0) >> @@ -859,23 +854,29 @@ static struct platform_device omap_mpuio_device = { >> /* could list the /proc/iomem resources */ >> }; >> >> -static inline void mpuio_init(void) >> +static inline void mpuio_init(struct gpio_bank *bank) >> { >> - struct gpio_bank *bank = &gpio_bank[0]; >> + static int mpuio_init_done; > > Why is this flag needed? isn't the bank->method check enough? Correct. This flag is not required. > >> + if (mpuio_init_done || (bank->method != METHOD_MPUIO)) >> + return; >> + >> platform_set_drvdata(&omap_mpuio_device, bank); >> >> if (platform_driver_register(&omap_mpuio_driver) == 0) >> (void) platform_device_register(&omap_mpuio_device); >> + >> + mpuio_init_done = 1; >> } >> [...] >> >> bank->base = ioremap(res->start, resource_size(res)); >> if (!bank->base) { >> - dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", id); >> - return -ENOMEM; >> + dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", >> + pdev->id); >> + ret = -ENOMEM; >> + goto err_free; >> } >> >> pm_runtime_enable(bank->dev); >> pm_runtime_get_sync(bank->dev); >> >> + mpuio_init(bank); > > How about moving this call into _mod_init(), and call it only when > ->method = MPUIO. Sure. Will do that. -V Charulatha > >> omap_gpio_mod_init(bank); >> omap_gpio_chip_init(bank); >> omap_gpio_show_rev(bank); > > [...] > > Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Kevin, Thanks for the comments. On Thu, May 19, 2011 at 22:09, Kevin Hilman <khilman@ti.com> wrote: > Tarun Kanti DebBarma <tarun.kanti@ti.com> writes: > >> From: Charulatha V <charu@ti.com> >> >> gpio_bank_count is the count of number of GPIO devices >> in a SoC. Remove this dependency from the driver. Also remove >> the dependency on array of pointers to gpio_bank struct of >> all GPIO devices. >> >> The cpu_is*() checks used in omap2_gpio_prepare_for_idle() and >> omap2_gpio_resume_after_idle() would be removed in one of the >> patches in this series >> >> Signed-off-by: Charulatha V <charu@ti.com> > > This is all in the right direction, but some comments about the > save/restore context... > > [...] > >> @@ -1497,11 +1494,16 @@ void omap2_gpio_resume_after_idle(void) >> /* save the registers of bank 2-6 */ >> void omap_gpio_save_context(void) >> { >> - int i; >> + struct gpio_bank *bank; >> + int i = 0; >> >> /* saving banks from 2-6 only since GPIO1 is in WKUP */ >> - for (i = 1; i < gpio_bank_count; i++) { >> - struct gpio_bank *bank = &gpio_bank[i]; >> + list_for_each_entry(bank, &omap_gpio_list, node) { >> + i++; >> + >> + if (bank->id == 0) >> + continue; >> + > > Rather than add a list iterator here, I'd rather see the save_context > called from the prepare_for_idle, only for the specific banks needed > (and then gpio_save_context can be removed from pm34xx.c.) > > Similar for restore. Okay. > > If you prefer, you can do that in an additional patch on top of this > one. Yes. I am adding a couple of more patches to this series. -V Charulatha > > Kevin > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index c3caf25..7a15f69 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c @@ -117,7 +117,6 @@ static int __init omap15xx_gpio_init(void) platform_device_register(&omap15xx_mpu_gpio); platform_device_register(&omap15xx_gpio); - gpio_bank_count = 2; return 0; } postcore_initcall(omap15xx_gpio_init); diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c index f62eaf3..43718ec 100644 --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -223,8 +223,6 @@ static int __init omap16xx_gpio_init(void) for (i = 0; i < ARRAY_SIZE(omap16xx_gpio_dev); i++) platform_device_register(omap16xx_gpio_dev[i]); - gpio_bank_count = ARRAY_SIZE(omap16xx_gpio_dev); - return 0; } postcore_initcall(omap16xx_gpio_init); diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c index 0fc2557..c7684ce 100644 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -284,8 +284,6 @@ static int __init omap7xx_gpio_init(void) for (i = 0; i < ARRAY_SIZE(omap7xx_gpio_dev); i++) platform_device_register(omap7xx_gpio_dev[i]); - gpio_bank_count = ARRAY_SIZE(omap7xx_gpio_dev); - return 0; } postcore_initcall(omap7xx_gpio_init); diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 6cd26b4..487b49a 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -143,7 +143,6 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) return PTR_ERR(od); } - gpio_bank_count++; return 0; } diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 12deb1c..0b76475 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -30,7 +30,10 @@ #include <mach/gpio.h> #include <asm/mach/irq.h> +static LIST_HEAD(omap_gpio_list); + struct gpio_bank { + struct list_head node; unsigned long pbase; void __iomem *base; u16 irq; @@ -57,6 +60,7 @@ struct gpio_bank { bool dbck_flag; int stride; u32 width; + u16 id; void (*set_dataout)(struct gpio_bank *bank, int gpio, int enable); @@ -80,15 +84,6 @@ struct omap3_gpio_regs { static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS]; #endif -/* - * TODO: Cleanup gpio_bank usage as it is having information - * related to all instances of the device - */ -static struct gpio_bank *gpio_bank; - -/* TODO: Analyze removing gpio_bank_count usage from driver code */ -int gpio_bank_count; - #define GPIO_INDEX(bank, gpio) (gpio % bank->width) #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) #define GPIO_MOD_CTRL_BIT BIT(0) @@ -859,23 +854,29 @@ static struct platform_device omap_mpuio_device = { /* could list the /proc/iomem resources */ }; -static inline void mpuio_init(void) +static inline void mpuio_init(struct gpio_bank *bank) { - struct gpio_bank *bank = &gpio_bank[0]; + static int mpuio_init_done; + + if (mpuio_init_done || (bank->method != METHOD_MPUIO)) + return; + platform_set_drvdata(&omap_mpuio_device, bank); if (platform_driver_register(&omap_mpuio_driver) == 0) (void) platform_device_register(&omap_mpuio_device); + + mpuio_init_done = 1; } #else -static inline void mpuio_init(void) {} +static inline void mpuio_init(struct gpio_bank *bank) {} #endif /* 16xx */ #else #define bank_is_mpuio(bank) 0 -static inline void mpuio_init(void) {} +static inline void mpuio_init(struct gpio_bank *bank) {} #endif @@ -997,18 +998,6 @@ static void __init omap_gpio_show_rev(struct gpio_bank *bank) */ static struct lock_class_key gpio_lock_class; -static inline int init_gpio_info(struct platform_device *pdev) -{ - /* TODO: Analyze removing gpio_bank_count usage from driver code */ - gpio_bank = kzalloc(gpio_bank_count * sizeof(struct gpio_bank), - GFP_KERNEL); - if (!gpio_bank) { - dev_err(&pdev->dev, "Memory alloc failed for gpio_bank\n"); - return -ENOMEM; - } - return 0; -} - /* TODO: Cleanup cpu_is_* checks */ static void omap_gpio_mod_init(struct gpio_bank *bank) { @@ -1140,36 +1129,37 @@ static void __init omap_gpio_chip_init(struct gpio_bank *bank) static int __devinit omap_gpio_probe(struct platform_device *pdev) { - static int gpio_init_done; struct omap_gpio_platform_data *pdata; struct resource *res; - int id; struct gpio_bank *bank; + int ret = 0; - if (!pdev->dev.platform_data) - return -EINVAL; - - pdata = pdev->dev.platform_data; - - if (!gpio_init_done) { - int ret; - - ret = init_gpio_info(pdev); - if (ret) - return ret; + if (!pdev->dev.platform_data) { + ret = -EINVAL; + goto err_exit; } - id = pdev->id; - bank = &gpio_bank[id]; + bank = kzalloc(sizeof(struct gpio_bank), GFP_KERNEL); + if (!bank) { + dev_err(&pdev->dev, "Memory alloc failed for gpio_bank\n"); + ret = -ENOMEM; + goto err_exit; + } res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (unlikely(!res)) { - dev_err(&pdev->dev, "GPIO Bank %i Invalid IRQ resource\n", id); - return -ENODEV; + dev_err(&pdev->dev, "GPIO Bank %i Invalid IRQ resource\n", + pdev->id); + ret = -ENODEV; + goto err_free; } bank->irq = res->start; + bank->id = pdev->id; + + pdata = pdev->dev.platform_data; bank->virtual_irq_start = pdata->virtual_irq_start; + bank->method = pdata->bank_type; bank->dev = &pdev->dev; bank->dbck_flag = pdata->dbck_flag; @@ -1189,39 +1179,47 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) /* Static mapping, never released */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (unlikely(!res)) { - dev_err(&pdev->dev, "GPIO Bank %i Invalid mem resource\n", id); - return -ENODEV; + dev_err(&pdev->dev, "GPIO Bank %i Invalid mem resource\n", + pdev->id); + ret = -ENODEV; + goto err_free; } bank->base = ioremap(res->start, resource_size(res)); if (!bank->base) { - dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", id); - return -ENOMEM; + dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", + pdev->id); + ret = -ENOMEM; + goto err_free; } pm_runtime_enable(bank->dev); pm_runtime_get_sync(bank->dev); + mpuio_init(bank); omap_gpio_mod_init(bank); omap_gpio_chip_init(bank); omap_gpio_show_rev(bank); - if (!gpio_init_done) - gpio_init_done = 1; + list_add_tail(&bank->node, &omap_gpio_list); - return 0; + return ret; + +err_free: + kfree(bank); +err_exit: + return ret; } #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) { - int i; + struct gpio_bank *bank; if (!cpu_class_is_omap2() && !cpu_is_omap16xx()) return 0; - for (i = 0; i < gpio_bank_count; i++) { - struct gpio_bank *bank = &gpio_bank[i]; + list_for_each_entry(bank, &omap_gpio_list, node) { void __iomem *wake_status; void __iomem *wake_clear; void __iomem *wake_set; @@ -1265,13 +1263,12 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) static int omap_gpio_resume(struct sys_device *dev) { - int i; + struct gpio_bank *bank; if (!cpu_class_is_omap2() && !cpu_is_omap16xx()) return 0; - for (i = 0; i < gpio_bank_count; i++) { - struct gpio_bank *bank = &gpio_bank[i]; + list_for_each_entry(bank, &omap_gpio_list, node) { void __iomem *wake_clear; void __iomem *wake_set; unsigned long flags; @@ -1327,17 +1324,17 @@ static int workaround_enabled; void omap2_gpio_prepare_for_idle(int off_mode) { - int i, c = 0; - int min = 0; - - if (cpu_is_omap34xx()) - min = 1; + int c = 0; + struct gpio_bank *bank; - for (i = min; i < gpio_bank_count; i++) { - struct gpio_bank *bank = &gpio_bank[i]; + list_for_each_entry(bank, &omap_gpio_list, node) { u32 l1 = 0, l2 = 0; int j; + /* TODO: Do not use cpu_is_omap34xx */ + if ((cpu_is_omap34xx()) && (bank->id == 0)) + continue; + for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) clk_disable(bank->dbck); @@ -1396,16 +1393,16 @@ void omap2_gpio_prepare_for_idle(int off_mode) void omap2_gpio_resume_after_idle(void) { - int i; - int min = 0; + struct gpio_bank *bank; - if (cpu_is_omap34xx()) - min = 1; - for (i = min; i < gpio_bank_count; i++) { - struct gpio_bank *bank = &gpio_bank[i]; + list_for_each_entry(bank, &omap_gpio_list, node) { u32 l = 0, gen, gen0, gen1; int j; + /* TODO: Do not use cpu_is_omap34xx */ + if ((cpu_is_omap34xx()) && (bank->id == 0)) + continue; + for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) clk_enable(bank->dbck); @@ -1497,11 +1494,16 @@ void omap2_gpio_resume_after_idle(void) /* save the registers of bank 2-6 */ void omap_gpio_save_context(void) { - int i; + struct gpio_bank *bank; + int i = 0; /* saving banks from 2-6 only since GPIO1 is in WKUP */ - for (i = 1; i < gpio_bank_count; i++) { - struct gpio_bank *bank = &gpio_bank[i]; + list_for_each_entry(bank, &omap_gpio_list, node) { + i++; + + if (bank->id == 0) + continue; + gpio_context[i].irqenable1 = __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE1); gpio_context[i].irqenable2 = @@ -1528,10 +1530,15 @@ void omap_gpio_save_context(void) /* restore the required registers of bank 2-6 */ void omap_gpio_restore_context(void) { - int i; + struct gpio_bank *bank; + int i = 0; + + list_for_each_entry(bank, &omap_gpio_list, node) { + i++; + + if (bank->id == 0) + continue; - for (i = 1; i < gpio_bank_count; i++) { - struct gpio_bank *bank = &gpio_bank[i]; __raw_writel(gpio_context[i].irqenable1, bank->base + OMAP24XX_GPIO_IRQENABLE1); __raw_writel(gpio_context[i].irqenable2, @@ -1578,8 +1585,6 @@ static int __init omap_gpio_sysinit(void) { int ret = 0; - mpuio_init(); - #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) if (cpu_is_omap16xx() || cpu_class_is_omap2()) { if (ret == 0) { diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h index 8014a8a..ad9e668 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h @@ -204,9 +204,6 @@ struct omap_gpio_platform_data { struct omap_gpio_reg_offs *regs; }; -/* TODO: Analyze removing gpio_bank_count usage from driver code */ -extern int gpio_bank_count; - extern void omap2_gpio_prepare_for_idle(int off_mode); extern void omap2_gpio_resume_after_idle(void); extern void omap_set_gpio_debounce(int gpio, int enable);