MIPS: ralink: mt7621: Fix soc_device introduction

Depending on selected SMP config options soc_device didn't get
initialised at all. With UP config vmlinux didn't link because
of missing soc bus.

Fixes: 71b9b5e0130d ("MIPS: ralink: mt7621: introduce 'soc_device' initialization")
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Tested-by: René van Dorst <opensource@vdorst.com>

diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 94e9ce9944944e4b655d79168e31bab96190ace1..35c2ebd8f0945f345a0eae35a7d42295d00a2758 100644 (file)
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -52,6 +52,7 @@ choice
                select COMMON_CLK
                select CLKSRC_MIPS_GIC
                select HAVE_PCI if PCI_MT7621
+               select SOC_BUS
 endchoice
 
 choice

diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c
index 905460aeeb1f1b35e795c4965eea5811109e4301..0accb80db7098be048eabc8d1308f3a18032cf15 100644 (file)
--- a/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
@@ -243,12 +243,12 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
 
        rt2880_pinmux_data = mt7621_pinmux_data;
 
+       soc_dev_init(soc_info, rev);
+
        if (!register_cps_smp_ops())
                return;
        if (!register_cmp_smp_ops())
                return;
        if (!register_vsmp_smp_ops())
                return;
-
-       soc_dev_init(soc_info, rev);
 }