diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-16 19:24:53 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-16 19:24:53 -0700 |
commit | d1226e8f98f130918265fb5b4dddcb60b783eb34 (patch) | |
tree | 5272a7828311a9b336d15c005704cf27b083d41c /arch/arm/plat-omap/include/plat | |
parent | cccc277ba840f32d252a785ab1df686fdc0f49f5 (diff) | |
parent | 47d85ec2a23552fd3d8b56778a23a5a843c5b9b1 (diff) | |
download | kernel_replicant_linux-d1226e8f98f130918265fb5b4dddcb60b783eb34.tar.gz kernel_replicant_linux-d1226e8f98f130918265fb5b4dddcb60b783eb34.tar.bz2 kernel_replicant_linux-d1226e8f98f130918265fb5b4dddcb60b783eb34.zip |
Merge tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Kevin Hilman <khilman@ti.com>:
Updates for omap_device layer for v3.7.
Allows omap_device layer to keep track of driver bound status in order
to make more intelligent decisions about idling unused devices.
* tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: omap_device: idle devices with no driver bound
ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
ARM: OMAP: omap_device: keep track of driver bound status
+ sync to 3.6-rc5
Diffstat (limited to 'arch/arm/plat-omap/include/plat')
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap_device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h index 4327b2c90c3d..e7259c0d33ec 100644 --- a/arch/arm/plat-omap/include/plat/omap_device.h +++ b/arch/arm/plat-omap/include/plat/omap_device.h @@ -60,6 +60,7 @@ extern struct dev_pm_domain omap_device_pm_domain; * @_dev_wakeup_lat_limit: dev wakeup latency limit in nsec - set by OMAP PM * @_state: one of OMAP_DEVICE_STATE_* (see above) * @flags: device flags + * @_driver_status: one of BUS_NOTIFY_*_DRIVER from <linux/device.h> * * Integrates omap_hwmod data into Linux platform_device. * @@ -73,6 +74,7 @@ struct omap_device { struct omap_device_pm_latency *pm_lats; u32 dev_wakeup_lat; u32 _dev_wakeup_lat_limit; + unsigned long _driver_status; u8 pm_lats_cnt; s8 pm_lat_level; u8 hwmods_cnt; |