diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
| commit | f4845bd61300c2b5013bd4fa28c83975a85069bc (patch) | |
| tree | 974925d5ec1d615a748d37dab2e41c823e38f5c5 /arch/arm/mach-omap2/pdata-quirks.c | |
| parent | 3985b18650bf2365debb142624f877007b31ada2 (diff) | |
| parent | a852cc89cffb65272be77785b9eb2682e38ed53f (diff) | |
Merge branch 'tracking-ilp32' into merge-linux-linaro-extralinux-linaro-extra-20151104.0linux-linaro-extra
Diffstat (limited to 'arch/arm/mach-omap2/pdata-quirks.c')
| -rw-r--r-- | arch/arm/mach-omap2/pdata-quirks.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index ea56397599c2..1dfe34654c43 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -559,7 +559,14 @@ static void pdata_quirks_check(struct pdata_init *quirks) void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table) { - omap_sdrc_init(NULL, NULL); + /* + * We still need this for omap2420 and omap3 PM to work, others are + * using drivers/misc/sram.c already. + */ + if (of_machine_is_compatible("ti,omap2420") || + of_machine_is_compatible("ti,omap3")) + omap_sdrc_init(NULL, NULL); + pdata_quirks_check(auxdata_quirks); of_platform_populate(NULL, omap_dt_match_table, omap_auxdata_lookup, NULL); |