diff options
author | Jay Bhukhanwala <jbhukhanwala@nvidia.com> | 2014-05-13 14:36:18 -0700 |
---|---|---|
committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-15 12:58:29 -0700 |
commit | 8f043df3275610b1a2c7012158bce5ea02323fdd (patch) | |
tree | 51e7f1f5a7d8465c2f532e23d113dab296c36734 /arch/arm/mach-tegra/board-norrin-memory.c | |
parent | 4ebd7235d25b65a89ec92854efeebabe224b025c (diff) |
ARM: Tegra: T124: Deprecate NCT for EMC Tables
Change-Id: I0221c4172d1bbcc1b864aa041e684f10cb416909
Signed-off-by: Jay Bhukhanwala <jbhukhanwala@nvidia.com>
Reviewed-on: http://git-master/r/408970
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-norrin-memory.c')
-rw-r--r-- | arch/arm/mach-tegra/board-norrin-memory.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/arch/arm/mach-tegra/board-norrin-memory.c b/arch/arm/mach-tegra/board-norrin-memory.c index c9cdb6b7cc33..cda1ea87d06a 100644 --- a/arch/arm/mach-tegra/board-norrin-memory.c +++ b/arch/arm/mach-tegra/board-norrin-memory.c @@ -10256,10 +10256,6 @@ static struct tegra12_emc_table e1991_emc_table[] = { }, }; -#ifdef CONFIG_TEGRA_USE_NCT -static struct tegra12_emc_pdata board_emc_pdata; -#endif - static struct tegra12_emc_pdata norrin_emc_pdata = { .description = "norrin_emc_tables", .tables = norrin_emc_table, @@ -10295,23 +10291,10 @@ static struct tegra12_emc_pdata e1991_emc_pdata = { int __init norrin_emc_init(void) { - struct board_info bi; - /* - * If the EMC table is successfully read from the NCT partition, - * we do not need to check for board ids and blindly load the one - * flashed on the NCT partition. - */ - #ifdef CONFIG_TEGRA_USE_NCT - if (!tegra12_nct_emc_table_init(&board_emc_pdata)) { - tegra_emc_device.dev.platform_data = &board_emc_pdata; - pr_info("Loading EMC table read from NCT partition.\n"); - platform_device_register(&tegra_emc_device); - } else - #endif + /* If Device Tree Partition contains emc-tables, load them */ if (of_find_compatible_node(NULL, NULL, "nvidia,tegra12-emc")) { - /* If Device Tree Partition contains emc-tables, load them */ pr_info("Loading EMC tables from DeviceTree.\n"); } else { tegra_get_board_info(&bi); @@ -10348,7 +10331,6 @@ int __init norrin_emc_init(void) platform_device_register(&tegra_emc_device); } - tegra12_emc_init(); return 0; } |