summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-ventana-memory.c
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2011-03-08 14:53:06 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:46:13 -0800
commit8d0c2fa344772e5bd5e6642e040ce7e8247c63b3 (patch)
treed2561a578c63a5916bf0264bab73a7e449ddd389 /arch/arm/mach-tegra/board-ventana-memory.c
parentfa367b1a9362f817960ec437e744554e86aa8b0d (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. Original-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> Rebase-Id: R4a08df5e089081ad2420b1d5b9ea9ed71b4019e3
Diffstat (limited to 'arch/arm/mach-tegra/board-ventana-memory.c')
-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;
}