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

Commit 4b7ec5ac authored by Sourav Poddar's avatar Sourav Poddar Committed by Kevin Hilman
Browse files

arm: omap2+: omap_device: remove no_idle_on_suspend 



Remove "no_idle_on_suspend" check, since respective
driver should be able to prevent idling of an
omap device whenever required.

Driver's can get same behavior by just returning -EBUSY
from their ->runtime_suspend only during suspend.

Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Rajendra nayak <rnayak@ti.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarSourav Poddar <sourav.poddar@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 4425fb13

arch/arm/mach-omap2/omap_device.c

+2 −7
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ static int omap_device_build_from_dt(struct platform_device *pdev) 
			r->name = dev_name(&pdev->dev);

	}



	if (of_get_property(node, "ti,no_idle_on_suspend", NULL))

		omap_device_disable_idle_on_suspend(pdev);



	pdev->dev.pm_domain = &omap_device_pm_domain;



odbfd_exit1:
@@ -621,7 +618,6 @@ static int _od_suspend_noirq(struct device *dev) 


	if (!ret && !pm_runtime_status_suspended(dev)) {

		if (pm_generic_runtime_suspend(dev) == 0) {

			if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))

			omap_device_idle(pdev);

			od->flags |= OMAP_DEVICE_SUSPENDED;

		}
@@ -638,7 +634,6 @@ static int _od_resume_noirq(struct device *dev) 
	if ((od->flags & OMAP_DEVICE_SUSPENDED) &&

	    !pm_runtime_status_suspended(dev)) {

		od->flags &= ~OMAP_DEVICE_SUSPENDED;

		if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))

		omap_device_enable(pdev);

		pm_generic_runtime_resume(dev);

	}

arch/arm/mach-omap2/omap_device.h

+0 −10
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ extern struct dev_pm_domain omap_device_pm_domain; 


/* omap_device.flags values */

#define OMAP_DEVICE_SUSPENDED		BIT(0)

#define OMAP_DEVICE_NO_IDLE_ON_SUSPEND	BIT(1)



/**

 * struct omap_device - omap_device wrapper for platform_devices
@@ -101,13 +100,4 @@ static inline struct omap_device *to_omap_device(struct platform_device *pdev) 
{

	return pdev ? pdev->archdata.od : NULL;

}



static inline

void omap_device_disable_idle_on_suspend(struct platform_device *pdev)

{

	struct omap_device *od = to_omap_device(pdev);



	od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;

}



#endif