Merge branch 'for-linus' into for-linus-3.12

[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..ce38d11f9da5bdb3baaec1821dec2a6a25ae4836 100644 (file)
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -110,6 +110,9 @@ static int __init plat_of_setup(void)
        if (of_platform_populate(NULL, of_ids, NULL, NULL))
                panic("failed to populate DT\n");
 
+       /* make sure ithat the reset controller is setup early */
+       ralink_rst_init();
+
        return 0;
 }