diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 20:15:30 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 20:15:30 +0400 |
| commit | 107532920226a37e595697959b2a6a823cfa2497 (patch) | |
| tree | 7d35c84ed324e6cabeed29282f1fc97994fd204b /arch/arm/mach-tegra/board-harmony-power.c | |
| parent | 29ea35969b92a4be122a58c4aceea8c5e2c388d9 (diff) | |
| parent | ecb7b0e33e048e63d1169e6fee277430c70ddf0b (diff) | |
| download | linux-107532920226a37e595697959b2a6a823cfa2497.tar.xz | |
Merge branch 'tegra/devel' into next/devel
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony-power.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index 5ad8b2f94f8d..21d1285731b3 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c @@ -18,10 +18,11 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/gpio.h> - +#include <linux/io.h> #include <linux/regulator/machine.h> #include <linux/mfd/tps6586x.h> +#include <mach/iomap.h> #include <mach/irqs.h> #include "board-harmony.h" @@ -113,6 +114,16 @@ static struct i2c_board_info __initdata harmony_regulators[] = { int __init harmony_regulator_init(void) { + void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); + u32 pmc_ctrl; + + /* + * Configure the power management controller to trigger PMU + * interrupts when low + */ + pmc_ctrl = readl(pmc + PMC_CTRL); + writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); + i2c_register_board_info(3, harmony_regulators, 1); return 0; |