diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-01-25 06:43:29 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-02-07 19:12:21 -0500 |
commit | 129cee1020d8031df1e3986673c64ca9eb7a2617 (patch) | |
tree | 29008c05a9fc695547e915d46531482534438de3 | |
parent | d3b8bdd5f9bc538fb17466cbb7af43209b55cb93 (diff) |
ARM: tegra: Remove duplicate PMU interrupt inversion code
The new PMC driver now configures the PMU interrupt inversion, so board
files don't need to poke the PMC registers directly to achieve this.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-tegra/board-harmony-power.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index 21d1285731b3..976edfb05912 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c | |||
@@ -18,18 +18,13 @@ | |||
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
21 | #include <linux/io.h> | ||
22 | #include <linux/regulator/machine.h> | 21 | #include <linux/regulator/machine.h> |
23 | #include <linux/mfd/tps6586x.h> | 22 | #include <linux/mfd/tps6586x.h> |
24 | 23 | ||
25 | #include <mach/iomap.h> | ||
26 | #include <mach/irqs.h> | 24 | #include <mach/irqs.h> |
27 | 25 | ||
28 | #include "board-harmony.h" | 26 | #include "board-harmony.h" |
29 | 27 | ||
30 | #define PMC_CTRL 0x0 | ||
31 | #define PMC_CTRL_INTR_LOW (1 << 17) | ||
32 | |||
33 | static struct regulator_consumer_supply tps658621_ldo0_supply[] = { | 28 | static struct regulator_consumer_supply tps658621_ldo0_supply[] = { |
34 | REGULATOR_SUPPLY("pex_clk", NULL), | 29 | REGULATOR_SUPPLY("pex_clk", NULL), |
35 | }; | 30 | }; |
@@ -114,16 +109,6 @@ static struct i2c_board_info __initdata harmony_regulators[] = { | |||
114 | 109 | ||
115 | int __init harmony_regulator_init(void) | 110 | int __init harmony_regulator_init(void) |
116 | { | 111 | { |
117 | void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); | ||
118 | u32 pmc_ctrl; | ||
119 | |||
120 | /* | ||
121 | * Configure the power management controller to trigger PMU | ||
122 | * interrupts when low | ||
123 | */ | ||
124 | pmc_ctrl = readl(pmc + PMC_CTRL); | ||
125 | writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); | ||
126 | |||
127 | i2c_register_board_info(3, harmony_regulators, 1); | 112 | i2c_register_board_info(3, harmony_regulators, 1); |
128 | 113 | ||
129 | return 0; | 114 | return 0; |