diff options
author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2021-04-15 13:50:03 +0300 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@microchip.com> | 2021-07-19 14:32:12 +0200 |
commit | 2c26cb4d6944edf0a65a4b1fdeacdcc816261739 (patch) | |
tree | 44606eec6f810ba935d9d7185bdc987f8cf3c938 /arch | |
parent | 5b0bef872c1d131c4a4b2abdd825d4d5f548a1a1 (diff) | |
download | linux-stable-2c26cb4d6944edf0a65a4b1fdeacdcc816261739.tar.gz linux-stable-2c26cb4d6944edf0a65a4b1fdeacdcc816261739.tar.bz2 linux-stable-2c26cb4d6944edf0a65a4b1fdeacdcc816261739.zip |
ARM: at91: pm: add sama7g5 ddr controller
Add SAMA7G5 DDR controller to the list of DDR controller compatibles.
At the moment there is no standby support. Adapt the code for this.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20210415105010.569620-18-claudiu.beznea@microchip.com
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-at91/pm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 65e13769cf50..5dc942a2012d 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -548,6 +548,7 @@ static const struct of_device_id ramc_ids[] __initconst = { { .compatible = "atmel,at91sam9260-sdramc", .data = &ramc_infos[1] }, { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, { .compatible = "atmel,sama5d3-ddramc", .data = &ramc_infos[3] }, + { .compatible = "microchip,sama7g5-uddrc", }, { /*sentinel*/ } }; @@ -565,9 +566,11 @@ static __init void at91_dt_ramc(void) panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx); ramc = of_id->data; - if (!standby) - standby = ramc->idle; - soc_pm.data.memctrl = ramc->memctrl; + if (ramc) { + if (!standby) + standby = ramc->idle; + soc_pm.data.memctrl = ramc->memctrl; + } idx++; } |