[PATCH] ARM: at91: fix ramc standby function registration

From: Alexandre Belloni
Date: Wed Aug 27 2014 - 12:07:11 EST

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@xxxxxxxxxxxxxxxxxx>
arch/arm/mach-at91/setup.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 28ae63b8eb16..d2cade21ebd7 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -343,25 +343,28 @@ static void at91_dt_ramc(void)
struct device_node *np;
const struct of_device_id *of_id;
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);
if (!at91_ramc_base[idx])
panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx);

+ if (!standby)
+ standby = of_id->data;

if (!idx)
panic(pr_fmt("unable to find compatible ram controller node in dtb\n"));

- of_id = of_match_node(ramc_ids, np);
- if (!of_id) {
+ if (!standby) {
pr_warn("ramc no standby function available\n");

- at91_pm_set_standby(of_id->data);
+ at91_pm_set_standby(standby);

void __init at91rm9200_dt_initialize(void)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/