diff options
| author | Greg Kroah-Hartman | 2015-10-25 22:39:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 22:39:46 +0100 |
| commit | 0bbc367e21bfeea33230d893be4fa3a3ff9bcb48 (patch) | |
| tree | 50fb335648a22ac519eddb772714ba64a3e6a7ec /arch/arm/mach-omap2/pdata-quirks.c | |
| parent | USB: core: Codestyle fix in urb.c (diff) | |
| parent | Linux 4.3-rc7 (diff) | |
| download | kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.tar.gz kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.tar.xz kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.zip | |
Merge 4.3-rc7 into usb-next
We want the USB and other fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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); |