diff options
author | Furquan Shaikh <furquan@google.com> | 2015-10-15 15:50:30 -0700 |
---|---|---|
committer | Julius Werner <jwerner@chromium.org> | 2015-11-07 03:29:35 +0100 |
commit | fdb3a8d07d46c0011555029e041890dc668ec7f0 (patch) | |
tree | 18594c3e21c1d153865360d09f727a0cad63e82e /src/soc/nvidia/tegra132/soc.c | |
parent | b3f6ad35221984419ee0998f47b778d669d1636e (diff) |
arm64: Remove cpu intialization through device-tree
Since, SMP support is removed for ARM64, there is no need for CPU
initialization to be performed via device-tree.
Change-Id: I0534e6a93c7dc8659859eac926d17432d10243aa
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: http://review.coreboot.org/11913
Tested-by: build bot (Jenkins)
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc/nvidia/tegra132/soc.c')
-rw-r--r-- | src/soc/nvidia/tegra132/soc.c | 56 |
1 files changed, 9 insertions, 47 deletions
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c index 8eabd39f2e..40889a7e05 100644 --- a/src/soc/nvidia/tegra132/soc.c +++ b/src/soc/nvidia/tegra132/soc.c @@ -26,7 +26,6 @@ #include <soc/addressmap.h> #include <soc/clock.h> #include <soc/cpu.h> -#include <soc/mc.h> #include <soc/nvidia/tegra/apbmisc.h> #include <string.h> #include <timer.h> @@ -55,38 +54,11 @@ static void soc_read_resources(device_t dev) ram_resource(dev, index++, begin * KiB, size * KiB); } -static void lock_down_vpr(void) -{ - struct tegra_mc_regs *regs = (void *)(uintptr_t)TEGRA_MC_BASE; - - write32(®s->video_protect_bom, 0); - write32(®s->video_protect_size_mb, 0); - write32(®s->video_protect_reg_ctrl, 1); -} - -static void soc_init(device_t dev) -{ - clock_init_arm_generic_timer(); - - arch_initialize_cpu(dev); - - /* Lock down VPR */ - lock_down_vpr(); - - if (!IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) - return; - - if (display_init_required()) - display_startup(dev); - else - printk(BIOS_INFO, "Skipping display init.\n"); -} - static struct device_operations soc_ops = { .read_resources = soc_read_resources, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .init = soc_init, + .init = DEVICE_NOOP, .scan_bus = NULL, }; @@ -94,6 +66,14 @@ static void enable_tegra132_dev(device_t dev) { if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) dev->ops = &soc_ops; + + if (!IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) + return; + + if (display_init_required()) + display_startup(dev); + else + printk(BIOS_INFO, "Skipping display init.\n"); } static void tegra132_init(void *chip_info) @@ -114,24 +94,6 @@ struct chip_operations soc_nvidia_tegra132_ops = { .enable_dev = enable_tegra132_dev, }; -static void tegra132_cpu_init(device_t cpu) -{ -} - -static const struct cpu_device_id ids[] = { - { 0x4e0f0000 }, - { CPU_ID_END }, -}; - -static struct device_operations cpu_dev_ops = { - .init = tegra132_cpu_init, -}; - -static const struct cpu_driver driver __cpu_driver = { - .ops = &cpu_dev_ops, - .id_table = ids, -}; - static void enable_plld(void *unused) { /* |