diff options
| author | Ryane Luo <ryanel@nvidia.com> | 2013-10-28 16:04:49 +0800 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2013-10-31 04:08:02 -0700 |
| commit | 1ff5f00e7e80b99639afd47f3f998930240e005c (patch) | |
| tree | 2bc6458be1aacc65c5962a794a9d0ec737b9de8e /arch/arm/mach-tegra/board-ardbeg-memory.c | |
| parent | 966b7565dd96884f2a2bede8ef40475b996bfc05 (diff) | |
arm: tegra: tn8-ers: dt: skip emc device register
Device will auto register by device tree.
Bug 1373423
Change-Id: I4edb790d262712d6a3daa2b9afc43b6d8b7a0325
Signed-off-by: Ryane Luo <ryanel@nvidia.com>
Reviewed-on: http://git-master/r/309554
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-ardbeg-memory.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-ardbeg-memory.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg-memory.c b/arch/arm/mach-tegra/board-ardbeg-memory.c index 92c06d636ff1..1dfa4e0b43f8 100644 --- a/arch/arm/mach-tegra/board-ardbeg-memory.c +++ b/arch/arm/mach-tegra/board-ardbeg-memory.c @@ -5454,6 +5454,7 @@ static struct tegra12_emc_pdata ardbeg_lpddr3_emc_pdata = { int __init ardbeg_emc_init(void) { struct board_info bi; + int use_dt_emc_table = 0; /* * If the EMC table is successfully read from the NCT partition, @@ -5473,6 +5474,7 @@ int __init ardbeg_emc_init(void) case BOARD_E1782: if (of_machine_is_compatible("nvidia,tn8")) { pr_info("Loading TN8 EMC tables from DeviceTree.\n"); + use_dt_emc_table = true; } else { pr_info("Loading Ardbeg EMC tables.\n"); tegra_emc_device.dev.platform_data = @@ -5491,7 +5493,9 @@ int __init ardbeg_emc_init(void) } #endif - platform_device_register(&tegra_emc_device); + if (!use_dt_emc_table) + platform_device_register(&tegra_emc_device); + tegra12_emc_init(); return 0; } |