Merge remote-tracking branch 'hid/for-next'

[karo-tx-linux.git] / arch / mips / ralink / of.c

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index f25ea5b45051dc8b6a28f369f7c1a5a0623cfa7f..15f21ea96121023b60d005045a3115bac48c5622 100644 (file)
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -108,7 +108,10 @@ static int __init plat_of_setup(void)
        strncpy(of_ids[1].compatible, "palmbus", len);
 
        if (of_platform_populate(NULL, of_ids, NULL, NULL))
-               panic("failed to populate DT\n");
+               panic("failed to populate DT");
+
+       /* make sure ithat the reset controller is setup early */
+       ralink_rst_init();
 
        return 0;
 }