summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-02-26 14:43:43 -0800
committerOlof Johansson <olof@lixom.net>2012-02-26 14:43:43 -0800
commit0f830e5c902106e7fe51460fd1e3263bea72bf41 (patch)
treeb83090bb272fce3ebda9aac311f2185ce78be7a3 /arch/arm/mach-tegra/common.c
parent9335e9199bd059fc4f5e4e6fcfb9fca1d482e460 (diff)
parentbdc93a77da75ee421125896ce4bbd91afff63809 (diff)
downloadblackbird-op-linux-0f830e5c902106e7fe51460fd1e3263bea72bf41.tar.gz
blackbird-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/common.c')
-rw-r--r--arch/arm/mach-tegra/common.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 029558114236..1cdcda13a0f7 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -32,6 +32,24 @@
#include "board.h"
#include "clock.h"
#include "fuse.h"
+#include "pmc.h"
+
+/*
+ * Storage for debug-macro.S's state.
+ *
+ * This must be in .data not .bss so that it gets initialized each time the
+ * kernel is loaded. The data is declared here rather than debug-macro.S so
+ * that multiple inclusions of debug-macro.S point at the same data.
+ */
+#define TEGRA_DEBUG_UART_OFFSET (TEGRA_DEBUG_UART_BASE & 0xFFFF)
+u32 tegra_uart_config[3] = {
+ /* Debug UART initialization required */
+ 1,
+ /* Debug UART physical address */
+ (u32)(IO_APB_PHYS + TEGRA_DEBUG_UART_OFFSET),
+ /* Debug UART virtual address */
+ (u32)(IO_APB_VIRT + TEGRA_DEBUG_UART_OFFSET),
+};
#ifdef CONFIG_OF
static const struct of_device_id tegra_dt_irq_match[] __initconst = {
@@ -100,6 +118,7 @@ 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
@@ -107,5 +126,6 @@ void __init tegra30_init_early(void)
{
tegra30_init_clocks();
tegra_init_cache(0x441, 0x551);
+ tegra_pmc_init();
}
#endif
OpenPOWER on IntegriCloud