diff options
| author | Robert Morell <rmorell@nvidia.com> | 2011-10-14 18:08:04 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 20:59:45 -0700 |
| commit | c8fabdee7186d345db6121cc24fd676503bad71e (patch) | |
| tree | 1d55c7034001df3bf78212556ddb9c04f7c25d28 /arch/arm/mach-tegra/board-harmony.c | |
| parent | 53cfb5d2a6a6e6e98d065515115f8a41bf62d184 (diff) | |
arm: tegra: Add Harmony nvmap, host1x devices
This is necessary to use the Tegra accelerated device drivers.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Change-Id: I6c6f10f35654793b4fb713f4ac854f72640a5fef
Reviewed-on: http://git-master/r/58253
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: Rab19f5b8a98914619ff3d43f5a7eeeed0114f86a
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index 4bcacb98268f..744580533faa 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -27,6 +27,7 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/i2c.h> +#include <linux/memblock.h> #include <sound/wm8903.h> @@ -400,10 +401,19 @@ static void __init tegra_harmony_init(void) #endif } +void __init tegra_harmony_reserve(void) +{ + if (memblock_reserve(0x0, 4096) < 0) + pr_warn("Cannot reserve first 4K of memory for safety\n"); + + tegra_reserve(SZ_128M, SZ_8M, 0); +} + MACHINE_START(HARMONY, "harmony") .atag_offset = 0x100, .fixup = tegra_harmony_fixup, .map_io = tegra_map_common_io, + .reserve = tegra_harmony_reserve, .init_early = tegra20_init_early, .init_irq = tegra_init_irq, .handle_irq = gic_handle_irq, |