diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-01-25 14:43:28 -0700 | 
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-06 18:25:01 -0800 | 
| commit | d3b8bdd5f9bc538fb17466cbb7af43209b55cb93 (patch) | |
| tree | ebad05f40bd821d30c1b777000ca04999bc04b98 | |
| parent | 8bc4f556bd740789cf6fab36d1776d6d4d8bd375 (diff) | |
| download | olio-linux-3.10-d3b8bdd5f9bc538fb17466cbb7af43209b55cb93.tar.xz olio-linux-3.10-d3b8bdd5f9bc538fb17466cbb7af43209b55cb93.zip  | |
ARM: tegra: Add a simple PMC driver
This PMC driver is enough to parse the nvidia,invert-interrupt property
from device tree, and configure the PMC's to honor that.
In the future, this file could expand to centralize all other PMC accesses
within the mach-tegra code.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pmc.c | 76 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pmc.h | 23 | 
4 files changed, 103 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 23d15fba384..e0b7a4d3259 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -7,6 +7,7 @@ obj-y                                   += clock.o  obj-y                                   += timer.o  obj-y                                   += pinmux.o  obj-y					+= fuse.o +obj-y					+= pmc.o  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= powergate.o  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 76210e5df56..43da4284d86 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -32,6 +32,7 @@  #include "board.h"  #include "clock.h"  #include "fuse.h" +#include "pmc.h"  /*   * Storage for debug-macro.S's state. @@ -117,11 +118,13 @@ void __init tegra20_init_early(void)  	tegra2_init_clocks();  	tegra_clk_init_from_table(tegra20_clk_init_table);  	tegra_init_cache(0x331, 0x441); +	tegra_pmc_init();  }  #endif  #ifdef CONFIG_ARCH_TEGRA_3x_SOC  void __init tegra30_init_early(void)  {  	tegra_init_cache(0x441, 0x551); +	tegra_pmc_init();  }  #endif diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c new file mode 100644 index 00000000000..7af6a54404b --- /dev/null +++ b/arch/arm/mach-tegra/pmc.c @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program.  If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <linux/kernel.h> +#include <linux/io.h> +#include <linux/of.h> + +#include <mach/iomap.h> + +#define PMC_CTRL		0x0 +#define PMC_CTRL_INTR_LOW	(1 << 17) + +static inline u32 tegra_pmc_readl(u32 reg) +{ +	return readl(IO_ADDRESS(TEGRA_PMC_BASE + reg)); +} + +static inline void tegra_pmc_writel(u32 val, u32 reg) +{ +	writel(val, IO_ADDRESS(TEGRA_PMC_BASE + reg)); +} + +#ifdef CONFIG_OF +static const struct of_device_id matches[] __initconst = { +	{ .compatible = "nvidia,tegra20-pmc" }, +	{ } +}; +#endif + +void __init tegra_pmc_init(void) +{ +	/* +	 * For now, Harmony is the only board that uses the PMC, and it wants +	 * the signal inverted. Seaboard would too if it used the PMC. +	 * Hopefully by the time other boards want to use the PMC, everything +	 * will be device-tree, or they also want it inverted. +	 */ +	bool invert_interrupt = true; +	u32 val; + +#ifdef CONFIG_OF +	if (of_have_populated_dt()) { +		struct device_node *np; + +		invert_interrupt = false; + +		np = of_find_matching_node(NULL, matches); +		if (np) { +			if (of_find_property(np, "nvidia,invert-interrupt", +						NULL)) +				invert_interrupt = true; +		} +	} +#endif + +	val = tegra_pmc_readl(PMC_CTRL); +	if (invert_interrupt) +		val |= PMC_CTRL_INTR_LOW; +	else +		val &= ~PMC_CTRL_INTR_LOW; +	tegra_pmc_writel(val, PMC_CTRL); +} diff --git a/arch/arm/mach-tegra/pmc.h b/arch/arm/mach-tegra/pmc.h new file mode 100644 index 00000000000..8995ee4a876 --- /dev/null +++ b/arch/arm/mach-tegra/pmc.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program.  If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef __MACH_TEGRA_PMC_H +#define __MACH_TEGRA_PMC_H + +void tegra_pmc_init(void); + +#endif  |