From 858e703f8c588c52ec2acffc183d7f7f9dca8aaf Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Tue, 3 Jun 2014 22:34:56 +0200 Subject: [PATCH] tegra: recognize Tegra124 in common initcalls Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/mach-tegra/tegra20.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-tegra/tegra20.c b/arch/arm/mach-tegra/tegra20.c index 0773972ae..752bbb031 100644 --- a/arch/arm/mach-tegra/tegra20.c +++ b/arch/arm/mach-tegra/tegra20.c @@ -30,7 +30,8 @@ static int tegra_add_debug_console(void) unsigned long base = 0; if (!of_machine_is_compatible("nvidia,tegra20") && - !of_machine_is_compatible("nvidia,tegra30")) + !of_machine_is_compatible("nvidia,tegra30") && + !of_machine_is_compatible("nvidia,tegra124")) return 0; /* figure out which UART to use */ @@ -74,7 +75,8 @@ mem_initcall(tegra20_mem_init); static int tegra30_mem_init(void) { - if (!of_machine_is_compatible("nvidia,tegra30")) + if (!of_machine_is_compatible("nvidia,tegra30") && + !of_machine_is_compatible("nvidia,tegra124")) return 0; arm_add_mem_device("ram0", SZ_2G, tegra30_get_ramsize());