diff options
| author | Lucas Stach <dev@lynxeye.de> | 2014-06-03 22:34:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-05 08:01:14 +0200 |
| commit | 858e703f8c588c52ec2acffc183d7f7f9dca8aaf (patch) | |
| tree | d6d63c3c2f83ff339a840d932ea85b3b11988c8a /arch/arm/mach-tegra | |
| parent | e11e7d9a152a37db49eed4535b2611d69c985e96 (diff) | |
| download | barebox-858e703f8c588c52ec2acffc183d7f7f9dca8aaf.tar.gz barebox-858e703f8c588c52ec2acffc183d7f7f9dca8aaf.tar.xz | |
tegra: recognize Tegra124 in common initcalls
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/tegra20.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra20.c b/arch/arm/mach-tegra/tegra20.c index 0773972ae7..752bbb0311 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()); |