summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-cardhu-memory.c2
-rw-r--r--arch/arm/mach-tegra/board-cardhu.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-memory.c b/arch/arm/mach-tegra/board-cardhu-memory.c
index 8f43726dea3c..6aff0f0061cc 100644
--- a/arch/arm/mach-tegra/board-cardhu-memory.c
+++ b/arch/arm/mach-tegra/board-cardhu-memory.c
@@ -2545,7 +2545,7 @@ int cardhu_emc_init(void)
if (tegra_get_revision() == TEGRA_REVISION_A01)
tegra_init_emc(cardhu_emc_tables_h5tc2g,
ARRAY_SIZE(cardhu_emc_tables_h5tc2g));
- else
+ else if (MEMORY_TYPE(board.sku) == SKU_MEMORY_CARDHU_1GB_1R)
tegra_init_emc(cardhu_emc_tables_h5tc2g_a2,
ARRAY_SIZE(cardhu_emc_tables_h5tc2g_a2));
break;
diff --git a/arch/arm/mach-tegra/board-cardhu.h b/arch/arm/mach-tegra/board-cardhu.h
index bd52b2c908b2..41ed59245bfc 100644
--- a/arch/arm/mach-tegra/board-cardhu.h
+++ b/arch/arm/mach-tegra/board-cardhu.h
@@ -46,9 +46,14 @@
#define SKU_MEMORY_TYPE_BIT 0x4
#define SKU_MEMORY_TYPE_MASK 0x3
+/* If BOARD_PM269 */
#define SKU_MEMORY_SAMSUNG_EC 0x0
#define SKU_MEMORY_ELPIDA 0x1
#define SKU_MEMORY_SAMSUNG_EB 0x2
+/* If other BOARD_ variants */
+#define SKU_MEMORY_CARDHU_1GB_1R 0x0
+#define SKU_MEMORY_CARDHU_2GB_2R 0x1
+#define SKU_MEMORY_CARDHU_2GB_1R 0x2
#define MEMORY_TYPE(sku) (((sku) >> SKU_MEMORY_TYPE_BIT) & SKU_MEMORY_TYPE_MASK)
/* Board Fab version */