summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2011-03-08 14:53:06 +0530
committerVarun Colbert <vcolbert@nvidia.com>2011-03-08 20:56:35 -0800
commitddbc017045bc76034073c2f4837ca4e0b51641cb (patch)
treeeb5d7ac90cc2b189ee8aa36410a4eedda299fa83
parent65e096e245f843ddc1bd11e42682fd4cf2135c2e (diff)
[ARM] tegra: ventana: use emc chips while initializing emc
tegra_init_emc() has been updated to use emc chips to support generic memory vendor matching. Convert current emc tables to use emc chips. Change-Id: Idfee6b903352669d7b04dae897cb848c6a8c26a6 Reviewed-on: http://git-master/r/22042 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Amit Kamath <akamath@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-ventana-memory.c34
1 files changed, 28 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-memory.c b/arch/arm/mach-tegra/board-ventana-memory.c
index 6bb0e3189bb6..a1075ddb75a7 100644
--- a/arch/arm/mach-tegra/board-ventana-memory.c
+++ b/arch/arm/mach-tegra/board-ventana-memory.c
@@ -539,6 +539,30 @@ static const struct tegra_emc_table ventana_emc_tables_elpida_400Mhz[] = {
}
};
+static const struct tegra_emc_chip ventana_emc_chips[] = {
+ {
+ .description = "Elpida 300MHz",
+ .mem_manufacturer_id = 0x0303,
+ .mem_revision_id1 = -1,
+ .mem_revision_id2 = -1,
+ .mem_pid = -1,
+ .table = ventana_emc_tables_elpida_300Mhz,
+ .table_size = ARRAY_SIZE(ventana_emc_tables_elpida_300Mhz)
+ },
+};
+
+static const struct tegra_emc_chip ventana_t25_emc_chips[] = {
+ {
+ .description = "Elpida 400MHz",
+ .mem_manufacturer_id = 0x0303,
+ .mem_revision_id1 = -1,
+ .mem_revision_id2 = -1,
+ .mem_pid = -1,
+ .table = ventana_emc_tables_elpida_400Mhz,
+ .table_size = ARRAY_SIZE(ventana_emc_tables_elpida_400Mhz)
+ },
+};
+
#define TEGRA25_SKU 0x0B00
int ventana_emc_init(void)
@@ -547,13 +571,11 @@ int ventana_emc_init(void)
tegra_get_board_info(&BoardInfo);
if (BoardInfo.sku == TEGRA25_SKU) {
- pr_info("%s: Elpida 400 Mhz memory found\n", __func__);
- tegra_init_emc(ventana_emc_tables_elpida_400Mhz,
- ARRAY_SIZE(ventana_emc_tables_elpida_400Mhz));
+ tegra_init_emc(ventana_t25_emc_chips,
+ ARRAY_SIZE(ventana_t25_emc_chips));
} else {
- pr_info("%s: Elpida 333 Mhz memory found\n", __func__);
- tegra_init_emc(ventana_emc_tables_elpida_300Mhz,
- ARRAY_SIZE(ventana_emc_tables_elpida_300Mhz));
+ tegra_init_emc(ventana_emc_chips,
+ ARRAY_SIZE(ventana_emc_chips));
}
return 0;
}