diff options
| author | Alex Frid <afrid@nvidia.com> | 2014-01-08 15:38:25 -0800 |
|---|---|---|
| committer | Thomas Cherry <tcherry@nvidia.com> | 2014-01-10 17:09:50 -0800 |
| commit | 373d6f43ac6bb6ee6384210b51806cd8152332b6 (patch) | |
| tree | 8e505297b7a1b7fef7444dc0e5ea465fc5a2d931 /arch/arm/mach-tegra/tegra12_emc.c | |
| parent | b9774d227e454af0f7275af153cca43cbdbdf904 (diff) | |
ARM: tegra12: clock: Update EMC init priorities
Assigned to EMC DVFS table from NCT or board files higher priority
than DTB-supplied table.
Change-Id: I4ef8a86c3ddf9edf3c9b2532e42f314c99765af3
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/353482
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra12_emc.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra12_emc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra12_emc.c b/arch/arm/mach-tegra/tegra12_emc.c index 57c8390cf472..23e2f2831fb5 100644 --- a/arch/arm/mach-tegra/tegra12_emc.c +++ b/arch/arm/mach-tegra/tegra12_emc.c @@ -42,6 +42,7 @@ #include "iomap.h" #include "tegra12_emc.h" #include "tegra_emc_dt_parse.h" +#include "devices.h" #ifdef CONFIG_TEGRA_EMC_SCALING_ENABLE @@ -1552,14 +1553,17 @@ static struct platform_driver tegra12_emc_driver = { .driver = { .name = "tegra-emc", .owner = THIS_MODULE, - .of_match_table = tegra12_emc_of_match, }, .probe = tegra12_emc_probe, }; int __init tegra12_emc_init(void) { - int ret = platform_driver_register(&tegra12_emc_driver); + int ret; + + if (!tegra_emc_device.dev.platform_data) + tegra12_emc_driver.driver.of_match_table = tegra12_emc_of_match; + ret = platform_driver_register(&tegra12_emc_driver); if (!ret) { tegra_emc_iso_usage_table_init(tegra12_emc_iso_usage, |