ARM: at91: fix ramc standby function registration
After the for_each_matching_node loop, we end up with a null value for np. Then, of_match_node() is not matching anything and we can't register the standby function and "ramc no standby function available" is printed. Fix that by selecting the first available standby function. For now, at91_pm_set_standby doesn't support multiple different standby functions and no existing SoCs have different RAM controllers. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Родитель
f55df0d654
Коммит
c8260db557
|
@ -343,25 +343,28 @@ static void at91_dt_ramc(void)
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
const struct of_device_id *of_id;
|
const struct of_device_id *of_id;
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
|
const void *standby = NULL;
|
||||||
|
|
||||||
for_each_matching_node(np, ramc_ids) {
|
for_each_matching_node_and_match(np, ramc_ids, &of_id) {
|
||||||
at91_ramc_base[idx] = of_iomap(np, 0);
|
at91_ramc_base[idx] = of_iomap(np, 0);
|
||||||
if (!at91_ramc_base[idx])
|
if (!at91_ramc_base[idx])
|
||||||
panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx);
|
panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx);
|
||||||
|
|
||||||
|
if (!standby)
|
||||||
|
standby = of_id->data;
|
||||||
|
|
||||||
idx++;
|
idx++;
|
||||||
}
|
}
|
||||||
|
|
||||||
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"));
|
||||||
|
|
||||||
of_id = of_match_node(ramc_ids, np);
|
if (!standby) {
|
||||||
if (!of_id) {
|
|
||||||
pr_warn("ramc no standby function available\n");
|
pr_warn("ramc no standby function available\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
at91_pm_set_standby(of_id->data);
|
at91_pm_set_standby(standby);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init at91rm9200_dt_initialize(void)
|
void __init at91rm9200_dt_initialize(void)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче