Skip to content

Commit f75410a

Browse files
committed
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: 71b9b5e ("MIPS: ralink: mt7621: introduce 'soc_device' initialization") Signed-off-by: Thomas Bogendoerfer <[email protected]> Tested-by: René van Dorst <[email protected]>
1 parent aebdc6f commit f75410a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/mips/ralink/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ choice
5252
select COMMON_CLK
5353
select CLKSRC_MIPS_GIC
5454
select HAVE_PCI if PCI_MT7621
55+
select SOC_BUS
5556
endchoice
5657

5758
choice

arch/mips/ralink/mt7621.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
243243

244244
rt2880_pinmux_data = mt7621_pinmux_data;
245245

246+
soc_dev_init(soc_info, rev);
247+
246248
if (!register_cps_smp_ops())
247249
return;
248250
if (!register_cmp_smp_ops())
249251
return;
250252
if (!register_vsmp_smp_ops())
251253
return;
252-
253-
soc_dev_init(soc_info, rev);
254254
}

0 commit comments

Comments
 (0)