Commit 892e1f4a authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Nicolas Ferre

ARM: at91: pm: add sama7g5 ddr phy controller

SAMA7G5 self-refresh procedure accesses also the DDR PHY registers.
Adapt the code so that the at91_dt_ramc() to look also for DDR PHYs,
in case it is mandatory.
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20210415105010.569620-19-claudiu.beznea@microchip.com
parent 2c26cb4d
...@@ -552,7 +552,12 @@ static const struct of_device_id ramc_ids[] __initconst = { ...@@ -552,7 +552,12 @@ static const struct of_device_id ramc_ids[] __initconst = {
{ /*sentinel*/ } { /*sentinel*/ }
}; };
static __init void at91_dt_ramc(void) static const struct of_device_id ramc_phy_ids[] __initconst = {
{ .compatible = "microchip,sama7g5-ddr3phy", },
{ /* Sentinel. */ },
};
static __init void at91_dt_ramc(bool phy_mandatory)
{ {
struct device_node *np; struct device_node *np;
const struct of_device_id *of_id; const struct of_device_id *of_id;
...@@ -578,6 +583,16 @@ static __init void at91_dt_ramc(void) ...@@ -578,6 +583,16 @@ static __init void at91_dt_ramc(void)
if (!idx) if (!idx)
panic(pr_fmt("unable to find compatible ram controller node in dtb\n")); panic(pr_fmt("unable to find compatible ram controller node in dtb\n"));
/* Lookup for DDR PHY node, if any. */
for_each_matching_node_and_match(np, ramc_phy_ids, &of_id) {
soc_pm.data.ramc_phy = of_iomap(np, 0);
if (!soc_pm.data.ramc_phy)
panic(pr_fmt("unable to map ramc phy cpu registers\n"));
}
if (phy_mandatory && !soc_pm.data.ramc_phy)
panic(pr_fmt("DDR PHY is mandatory!\n"));
if (!standby) { if (!standby) {
pr_warn("ramc no standby function available\n"); pr_warn("ramc no standby function available\n");
return; return;
...@@ -936,7 +951,7 @@ void __init at91rm9200_pm_init(void) ...@@ -936,7 +951,7 @@ void __init at91rm9200_pm_init(void)
soc_pm.data.standby_mode = AT91_PM_STANDBY; soc_pm.data.standby_mode = AT91_PM_STANDBY;
soc_pm.data.suspend_mode = AT91_PM_ULP0; soc_pm.data.suspend_mode = AT91_PM_ULP0;
at91_dt_ramc(); at91_dt_ramc(false);
/* /*
* AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. * AT91RM9200 SDRAM low-power mode cannot be used with self-refresh.
...@@ -960,7 +975,7 @@ void __init sam9x60_pm_init(void) ...@@ -960,7 +975,7 @@ void __init sam9x60_pm_init(void)
at91_pm_modes_validate(modes, ARRAY_SIZE(modes)); at91_pm_modes_validate(modes, ARRAY_SIZE(modes));
at91_pm_modes_init(iomaps, ARRAY_SIZE(iomaps)); at91_pm_modes_init(iomaps, ARRAY_SIZE(iomaps));
at91_dt_ramc(); at91_dt_ramc(false);
at91_pm_init(NULL); at91_pm_init(NULL);
soc_pm.ws_ids = sam9x60_ws_ids; soc_pm.ws_ids = sam9x60_ws_ids;
...@@ -980,7 +995,7 @@ void __init at91sam9_pm_init(void) ...@@ -980,7 +995,7 @@ void __init at91sam9_pm_init(void)
soc_pm.data.standby_mode = AT91_PM_STANDBY; soc_pm.data.standby_mode = AT91_PM_STANDBY;
soc_pm.data.suspend_mode = AT91_PM_ULP0; soc_pm.data.suspend_mode = AT91_PM_ULP0;
at91_dt_ramc(); at91_dt_ramc(false);
at91_pm_init(at91sam9_idle); at91_pm_init(at91sam9_idle);
} }
...@@ -994,7 +1009,7 @@ void __init sama5_pm_init(void) ...@@ -994,7 +1009,7 @@ void __init sama5_pm_init(void)
return; return;
at91_pm_modes_validate(modes, ARRAY_SIZE(modes)); at91_pm_modes_validate(modes, ARRAY_SIZE(modes));
at91_dt_ramc(); at91_dt_ramc(false);
at91_pm_init(NULL); at91_pm_init(NULL);
} }
...@@ -1015,7 +1030,7 @@ void __init sama5d2_pm_init(void) ...@@ -1015,7 +1030,7 @@ void __init sama5d2_pm_init(void)
at91_pm_modes_validate(modes, ARRAY_SIZE(modes)); at91_pm_modes_validate(modes, ARRAY_SIZE(modes));
at91_pm_modes_init(iomaps, ARRAY_SIZE(iomaps)); at91_pm_modes_init(iomaps, ARRAY_SIZE(iomaps));
at91_dt_ramc(); at91_dt_ramc(false);
at91_pm_init(NULL); at91_pm_init(NULL);
soc_pm.ws_ids = sama5d2_ws_ids; soc_pm.ws_ids = sama5d2_ws_ids;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment