Commit 7ae033cc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-runtime' into for-linus 

* pm-runtime:
  OMAP: PM: disable idle on suspend for GPIO and UART
  OMAP: PM: omap_device: add API to disable idle on suspend
  OMAP: PM: omap_device: add system PM methods for PM domain handling
  OMAP: PM: omap_device: conditionally use PM domain runtime helpers
  PM / Runtime: Add new helper function: pm_runtime_status_suspended()
  PM / Runtime: Consistent utilization of deferred_resume
  PM / Runtime: Prevent runtime_resume from racing with probe
  PM / Runtime: Replace "run-time" with "runtime" in documentation
  PM / Runtime: Improve documentation of enable, disable and barrier
  PM: Limit race conditions between runtime PM and system sleep (v2)
  PCI / PM: Detect early wakeup in pci_pm_prepare()
  PM / Runtime: Return special error code if runtime PM is disabled
  PM / Runtime: Update documentation of interactions with system sleep
parents ba1389d7 c8c9fda5

Documentation/power/devices.txt

+3 −3
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ state temporarily, for example so that its system wakeup capability can be 
disabled.  This all depends on the hardware and the design of the subsystem and

device driver in question.



During system-wide resume from a sleep state it's best to put devices into the

full-power state, as explained in Documentation/power/runtime_pm.txt.  Refer to

that document for more information regarding this particular issue as well as

During system-wide resume from a sleep state it's easiest to put devices into

the full-power state, as explained in Documentation/power/runtime_pm.txt.  Refer

to that document for more information regarding this particular issue as well as

for information on the device runtime power management framework in general.

Documentation/power/runtime_pm.txt

+122 −75

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/gpio.c

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

	}



	omap_device_disable_idle_on_suspend(od);



	gpio_bank_count++;

	return 0;

}

arch/arm/mach-omap2/serial.c

+1 −0
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) 
	WARN(IS_ERR(od), "Could not build omap_device for %s: %s.\n",

	     name, oh->name);



	omap_device_disable_idle_on_suspend(od);

	oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);



	uart->irq = oh->mpu_irqs[0].irq;

arch/arm/plat-omap/include/plat/omap_device.h

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ extern struct device omap_device_parent; 
#define OMAP_DEVICE_STATE_IDLE		2

#define OMAP_DEVICE_STATE_SHUTDOWN	3



/* 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

 * @pdev: platform_device
@@ -73,6 +77,7 @@ struct omap_device { 
	s8				pm_lat_level;

	u8				hwmods_cnt;

	u8				_state;

	u8                              flags;

};



/* Device driver interface (call via platform_data fn ptrs) */
@@ -117,6 +122,10 @@ int omap_device_enable_hwmods(struct omap_device *od); 
int omap_device_disable_clocks(struct omap_device *od);

int omap_device_enable_clocks(struct omap_device *od);



static inline void omap_device_disable_idle_on_suspend(struct omap_device *od)

{

	od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;

}



/*

 * Entries should be kept in latency order ascending

CRA Git | Maintained and supported by SUSTech CRA and CCSE