diff options
| author | Ryane Luo <ryanel@nvidia.com> | 2013-09-06 15:51:23 +0800 |
|---|---|---|
| committer | Leo He <leoh@nvidia.com> | 2013-10-27 19:59:13 -0700 |
| commit | b92842ae574fec05b452badb9eccbf9b8d92539d (patch) | |
| tree | 1a820c14ed93ac481492ae79e7ae777a996b21db /arch/arm/mach-tegra/tegra12_emc.c | |
| parent | dc394424697be5a784cc461064735aab195b8e7a (diff) | |
arm: tegra: tn8-ers: dt: enable support for emc tables
Rearrange parsing of dt nodes of emc tables
Add emc dvfs tables for tn8 ers
Bug 1360455
Change-Id: I21a81a67d315bba9dd7af792ddaebe251dc505cd
Signed-off-by: Ryane Luo <ryanel@nvidia.com>
Reviewed-on: http://git-master/r/299848
GVS: Gerrit_Virtual_Submit
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra12_emc.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra12_emc.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra12_emc.c b/arch/arm/mach-tegra/tegra12_emc.c index acfee87ed6f5..17000fc24c9f 100644 --- a/arch/arm/mach-tegra/tegra12_emc.c +++ b/arch/arm/mach-tegra/tegra12_emc.c @@ -22,6 +22,7 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/of.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/platform_device.h> @@ -40,6 +41,7 @@ #include "dvfs.h" #include "iomap.h" #include "tegra12_emc.h" +#include "tegra_emc_dt_parse.h" #ifdef CONFIG_TEGRA_EMC_SCALING_ENABLE static bool emc_enable = true; @@ -1367,6 +1369,9 @@ static int tegra12_emc_probe(struct platform_device *pdev) struct tegra12_emc_pdata *pdata; struct resource *res; + if (tegra_emc_table) + return -EINVAL; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "missing register base\n"); @@ -1374,6 +1379,11 @@ static int tegra12_emc_probe(struct platform_device *pdev) } pdata = pdev->dev.platform_data; + + if (!pdata) { + pdata = tegra_emc_dt_parse_pdata(pdev); + } + if (!pdata) { dev_err(&pdev->dev, "missing platform data\n"); return -ENODATA; @@ -1382,10 +1392,16 @@ static int tegra12_emc_probe(struct platform_device *pdev) return init_emc_table(pdata->tables, pdata->num_tables); } +static struct of_device_id tegra12_emc_of_match[] = { + { .compatible = "nvidia,tegra12-emc", }, + { }, +}; + 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, }; |