diff options
author | Olof Johansson <olof@lixom.net> | 2012-02-26 14:43:43 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-02-26 14:43:43 -0800 |
commit | 0f830e5c902106e7fe51460fd1e3263bea72bf41 (patch) | |
tree | b83090bb272fce3ebda9aac311f2185ce78be7a3 /arch/arm/mach-tegra/board-harmony-power.c | |
parent | 9335e9199bd059fc4f5e4e6fcfb9fca1d482e460 (diff) | |
parent | bdc93a77da75ee421125896ce4bbd91afff63809 (diff) | |
download | talos-op-linux-0f830e5c902106e7fe51460fd1e3263bea72bf41.tar.gz talos-op-linux-0f830e5c902106e7fe51460fd1e3263bea72bf41.zip |
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
Conflicts:
arch/arm/mach-tegra/Makefile
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-power.c')
-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 @@ #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" -#define PMC_CTRL 0x0 -#define PMC_CTRL_INTR_LOW (1 << 17) - static struct regulator_consumer_supply tps658621_ldo0_supply[] = { REGULATOR_SUPPLY("pex_clk", NULL), }; @@ -114,16 +109,6 @@ 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; |