diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-03 21:57:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-03 21:57:48 +0200 |
| commit | 0d1d76dd350a53c31e93442e573af8d14f89b2f0 (patch) | |
| tree | 5e2f34564ae587d3e6aae5f0592a16a98853cd7b /arch/c6x/kernel/setup.c | |
| parent | 839ab0c18fe4cf83dd99ca814f2b4cf822cd99be (diff) | |
| parent | bb0adf6ca6c78758c12b054fe3f25023033072ab (diff) | |
Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
From Tony Lindgren <tony@atomide.com>:
Here are omap driver changes for v3.6 that were agreed to be merged
via the omap tree. These changes convert omap HDQ1W driver to use
runtime PM, and finally move omap SmartReflex driver from arch/arm
to live under drivers.
* tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: do not allow SmartReflex to be built as a module
ARM: OMAP2: Use hwmod to initialize mmc for 2420
W1: OMAP HDQ1W: use runtime PM
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use 32-bit register accesses
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
ARM: OMAP2+: SmartReflex: Use per-OPP data structure
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
ARM: OMAP3: hwmod: rename the smartreflex entries
ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/c6x/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions