From: Abhijit Pagare <[email protected]> The gpio driver has been adapted for the OMAP4 way of clock calls.
Signed-off-by: Abhijit Pagare <[email protected]> --- arch/arm/plat-omap/gpio.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 6055028..5ae7a5a 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -1724,7 +1724,10 @@ static int __init _omap_gpio_init(void) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) if (cpu_is_omap34xx() || cpu_is_omap44xx()) { for (i = 0; i < OMAP34XX_NR_GPIOS; i++) { - sprintf(clk_name, "gpio%d_ick", i + 1); + if (!cpu_is_omap44xx()) + sprintf(clk_name, "gpio%d_ick", i + 1); + else + sprintf(clk_name, "gpio%d_ck", i + 1); gpio_iclks[i] = clk_get(NULL, clk_name); if (IS_ERR(gpio_iclks[i])) printk(KERN_ERR "Could not get %s\n", clk_name); @@ -1891,7 +1894,7 @@ static int __init _omap_gpio_init(void) set_irq_chained_handler(bank->irq, gpio_irq_handler); set_irq_data(bank->irq, bank); - if (cpu_is_omap34xx() || cpu_is_omap44xx()) { + if (cpu_is_omap34xx()) { sprintf(clk_name, "gpio%d_dbck", i + 1); bank->dbck = clk_get(NULL, clk_name); if (IS_ERR(bank->dbck)) -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
