diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-08-08 20:42:47 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:44 -0800 |
| commit | de824981a77be71abd6eb8bc10643f3fb87d9739 (patch) | |
| tree | 8cd17e6847e0ad7ba0f66e51b538c6301d0e1e22 /arch | |
| parent | 89514b46d0d26ac2821d8154997846d626a5bb17 (diff) | |
ARM: tegra: cardhu: Disable EMC DFS for 2GB memory
Bug 861419
Original-Change-Id: Icff68a821f5088af62962ccadaabbd01e4b5af7b
Reviewed-on: http://git-master/r/45966
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R4cb37cd9644ed36c7ee8e2b0462ef9bf8536674d
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-memory.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.h | 5 |
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 */ |