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

Commit 55b93c32 authored by Tarun Kanti DebBarma's avatar Tarun Kanti DebBarma
Browse files

gpio/omap: use pm-runtime framework 



Call runtime pm APIs pm_runtime_get_sync() and pm_runtime_put()
for enabling/disabling clocks appropriately. Remove syscore_ops and
instead use SET_RUNTIME_PM_OPS macro.

There is no more need to call omap_device_disable_idle_on_suspend
since driver is PM runtime adapted now.

Signed-off-by: default avatarCharulatha V <charu@ti.com>
Signed-off-by: default avatarTarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent ec9af5d9

arch/arm/mach-omap2/gpio.c

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		return PTR_ERR(pdev);

	}



	omap_device_disable_idle_on_suspend(pdev);



	return 0;

}

drivers/gpio/gpio-omap.c

+44 −24
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/io.h>

#include <linux/slab.h>

#include <linux/pm_runtime.h>

#include <linux/pm.h>



#include <mach/hardware.h>

#include <asm/irq.h>
@@ -483,8 +484,14 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) 
	struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip);

	unsigned long flags;



	spin_lock_irqsave(&bank->lock, flags);

	/*

	 * If this is the first gpio_request for the bank,

	 * enable the bank module.

	 */

	if (!bank->mod_usage)

		pm_runtime_get_sync(bank->dev);



	spin_lock_irqsave(&bank->lock, flags);

	/* Set trigger to none. You need to enable the desired trigger with

	 * request_irq() or set_irq_type().

	 */
@@ -540,6 +547,13 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) 


	_reset_gpio(bank, bank->chip.base + offset);

	spin_unlock_irqrestore(&bank->lock, flags);



	/*

	 * If this is the last gpio to be freed in the bank,

	 * disable the bank module.

	 */

	if (!bank->mod_usage)

		pm_runtime_put(bank->dev);

}



/*
@@ -565,6 +579,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) 


	bank = irq_get_handler_data(irq);

	isr_reg = bank->base + bank->regs->irqstatus;

	pm_runtime_get_sync(bank->dev);



	if (WARN_ON(!isr_reg))

		goto exit;
@@ -625,6 +640,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) 
exit:

	if (!unmasked)

		chained_irq_exit(chip, desc);

	pm_runtime_put(bank->dev);

}



static void gpio_irq_shutdown(struct irq_data *d)
@@ -1037,6 +1053,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) 
	}



	pm_runtime_enable(bank->dev);

	pm_runtime_irq_safe(bank->dev);

	pm_runtime_get_sync(bank->dev);



	if (bank->is_mpuio)
@@ -1046,6 +1063,8 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) 
	omap_gpio_chip_init(bank);

	omap_gpio_show_rev(bank);



	pm_runtime_put(bank->dev);



	list_add_tail(&bank->node, &omap_gpio_list);



	return ret;
@@ -1056,7 +1075,10 @@ err_exit: 
	return ret;

}



static int omap_gpio_suspend(void)

#ifdef CONFIG_ARCH_OMAP2PLUS



#if defined(CONFIG_PM_SLEEP)

static int omap_gpio_suspend(struct device *dev)

{

	struct gpio_bank *bank;
@@ -1080,7 +1102,7 @@ static int omap_gpio_suspend(void) 
	return 0;

}



static void omap_gpio_resume(void)

static int omap_gpio_resume(struct device *dev)

{

	struct gpio_bank *bank;
@@ -1089,21 +1111,17 @@ static void omap_gpio_resume(void) 
		unsigned long flags;



		if (!bank->regs->wkup_en)

			return;

			return 0;



		spin_lock_irqsave(&bank->lock, flags);

		_gpio_rmw(base, bank->regs->wkup_en, 0xffffffff, 0);

		_gpio_rmw(base, bank->regs->wkup_en, bank->saved_wakeup, 1);

		spin_unlock_irqrestore(&bank->lock, flags);

	}

}



static struct syscore_ops omap_gpio_syscore_ops = {

	.suspend	= omap_gpio_suspend,

	.resume		= omap_gpio_resume,

};



#ifdef CONFIG_ARCH_OMAP2PLUS

	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static void omap_gpio_save_context(struct gpio_bank *bank);

static void omap_gpio_restore_context(struct gpio_bank *bank);
@@ -1145,11 +1163,15 @@ void omap2_gpio_prepare_for_idle(int off_mode) 
		__raw_writel(l2, bank->base + bank->regs->risingdetect);



save_gpio_context:



		if (bank->get_context_loss_count)

			bank->context_loss_count =

				bank->get_context_loss_count(bank->dev);



		omap_gpio_save_context(bank);



		if (!pm_runtime_suspended(bank->dev))

			pm_runtime_put(bank->dev);

	}

}
@@ -1168,6 +1190,9 @@ void omap2_gpio_resume_after_idle(void) 
		for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)

			clk_enable(bank->dbck);



		if (pm_runtime_suspended(bank->dev))

			pm_runtime_get_sync(bank->dev);



		if (bank->get_context_loss_count) {

			context_lost_cnt_after =

				bank->get_context_loss_count(bank->dev);
@@ -1274,12 +1299,20 @@ static void omap_gpio_restore_context(struct gpio_bank *bank) 
				bank->base + bank->regs->fallingdetect);

	__raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);

}

#else

#define omap_gpio_suspend NULL

#define omap_gpio_resume NULL

#endif



static const struct dev_pm_ops gpio_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(omap_gpio_suspend, omap_gpio_resume)

};



static struct platform_driver omap_gpio_driver = {

	.probe		= omap_gpio_probe,

	.driver		= {

		.name	= "omap_gpio",

		.pm	= &gpio_pm_ops,

	},

};
@@ -1293,16 +1326,3 @@ static int __init omap_gpio_drv_reg(void) 
	return platform_driver_register(&omap_gpio_driver);

}

postcore_initcall(omap_gpio_drv_reg);
 


static int __init omap_gpio_sysinit(void)

{



#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)

	if (cpu_is_omap16xx() || cpu_class_is_omap2())

		register_syscore_ops(&omap_gpio_syscore_ops);

#endif



	return 0;

}



arch_initcall(omap_gpio_sysinit);