diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 19:35:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 19:35:29 -0400 |
commit | 640414171818c6293c23e74a28d1c69b2a1a7fe5 (patch) | |
tree | cb3b10578f0ae39eac2930ce3b2c8a1616f5ba70 /arch/arm/mach-omap2/powerdomains3xxx_data.c | |
parent | fa91515cbf2375a64c8bd0a033a05b0859dff591 (diff) | |
parent | a2bdc32a527e817fdfa6c56eaa6c70f217da6c6c (diff) |
Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late changes from Kevin Hilman:
"These are changes that arrived a little late before the merge window,
or had dependencies on previous branches.
Highlights:
- ux500: misc. cleanup, fixup I2C devices
- exynos: DT updates for RTC; PM updates
- at91: DT updates for NAND; new platforms added to generic defconfig
- sunxi: DT updates: cubieboard2, pinctrl driver, gated clocks
- highbank: LPAE fixes, select necessary ARM errata
- omap: PM fixes and improvements; OMAP5 mailbox support
- omap: basic support for new DRA7xx SoCs"
* tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
ARM: dts: vexpress: Add CCI node to TC2 device-tree
ARM: EXYNOS: Skip C1 cpuidle state for exynos5440
ARM: EXYNOS: always enable PM domains support for EXYNOS4X12
ARM: highbank: clean-up some unused includes
ARM: sun7i: Enable the A20 clocks in the DTSI
ARM: sun6i: Enable clock support in the DTSI
ARM: sun5i: dt: Use the A10s gates in the DTSI
ARM: at91: at91_dt_defconfig: enable rm9200 support
ARM: dts: add ADC device tree node for exynos5420/5250
ARM: dts: Add RTC DT node to Exynos5420 SoC
ARM: dts: Update the "status" property of RTC DT node for Exynos5250 SoC
ARM: dts: Fix the RTC DT node name for Exynos5250
irqchip: mmp: avoid to include irqs head file
ARM: mmp: avoid to include head file in mach-mmp
irqchip: mmp: support irqchip
irqchip: move mmp irq driver
ARM: OMAP: AM33xx: clock: Add RNG clock data
ARM: OMAP: TI81XX: add always-on powerdomain for TI81XX
ARM: OMAP4: clock: Lock PLLs in the right sequence
ARM: OMAP: AM33XX: hwmod: Add hwmod data for debugSS
...
Diffstat (limited to 'arch/arm/mach-omap2/powerdomains3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/powerdomains3xxx_data.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c index e2d4bd804523..328c1037cb60 100644 --- a/arch/arm/mach-omap2/powerdomains3xxx_data.c +++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c | |||
@@ -336,6 +336,13 @@ static struct powerdomain dpll5_pwrdm = { | |||
336 | .voltdm = { .name = "core" }, | 336 | .voltdm = { .name = "core" }, |
337 | }; | 337 | }; |
338 | 338 | ||
339 | static struct powerdomain alwon_81xx_pwrdm = { | ||
340 | .name = "alwon_pwrdm", | ||
341 | .prcm_offs = TI81XX_PRM_ALWON_MOD, | ||
342 | .pwrsts = PWRSTS_OFF_ON, | ||
343 | .voltdm = { .name = "core" }, | ||
344 | }; | ||
345 | |||
339 | static struct powerdomain device_81xx_pwrdm = { | 346 | static struct powerdomain device_81xx_pwrdm = { |
340 | .name = "device_pwrdm", | 347 | .name = "device_pwrdm", |
341 | .prcm_offs = TI81XX_PRM_DEVICE_MOD, | 348 | .prcm_offs = TI81XX_PRM_DEVICE_MOD, |
@@ -442,6 +449,7 @@ static struct powerdomain *powerdomains_am35x[] __initdata = { | |||
442 | }; | 449 | }; |
443 | 450 | ||
444 | static struct powerdomain *powerdomains_ti81xx[] __initdata = { | 451 | static struct powerdomain *powerdomains_ti81xx[] __initdata = { |
452 | &alwon_81xx_pwrdm, | ||
445 | &device_81xx_pwrdm, | 453 | &device_81xx_pwrdm, |
446 | &active_816x_pwrdm, | 454 | &active_816x_pwrdm, |
447 | &default_816x_pwrdm, | 455 | &default_816x_pwrdm, |