ARM: Tegra: T124: Deprecate NCT for EMC Tables
Jay Bhukhanwala [Tue, 13 May 2014 21:33:48 +0000 (14:33 -0700)]
Change-Id: I0eb7cb08c4fd6e9aaa0322bacad053707b11a2eb
Signed-off-by: Jay Bhukhanwala <jbhukhanwala@nvidia.com>
Reviewed-on: http://git-master/r/408968
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Tested-by: Thomas Cherry <tcherry@nvidia.com>

arch/arm/mach-tegra/board-ardbeg-memory.c
arch/arm/mach-tegra/board-norrin-memory.c

index e0cc034..6a1f959 100644 (file)
@@ -20018,10 +20018,6 @@ static struct tegra12_emc_table pm375_ddr3_emc_table[] = {
        },
 };
 
-#ifdef CONFIG_TEGRA_USE_NCT
-static struct tegra12_emc_pdata board_emc_pdata;
-#endif
-
 static struct tegra12_emc_pdata ardbeg_ddr3_emc_pdata_pm358 = {
        .description = "ardbeg_emc_tables",
        .tables = ardbeg_ddr3_emc_table_pm358,
@@ -20082,21 +20078,8 @@ int __init ardbeg_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);
index 767d8bb..473e482 100644 (file)
@@ -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;
 }