MIPS: ralink: mt7621: Fix soc_device introduction
diff mbox series

Message ID 20200328102715.8309-1-tsbogend@alpha.franken.de
State Mainlined
Commit f75410a406e934e4cf31e0a7ec151799a6bf38cf
Headers show
Series
  • MIPS: ralink: mt7621: Fix soc_device introduction
Related show

Commit Message

Thomas Bogendoerfer March 28, 2020, 10:27 a.m. UTC
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>
---
 arch/mips/ralink/Kconfig  | 1 +
 arch/mips/ralink/mt7621.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

René van Dorst March 28, 2020, 12:06 p.m. UTC | #1
Hi Thomas,

Thanks for fixing the compile issue for me.
Now I can make a kernel again.

Tested-by: René van Dorst <opensource@vdorst.com>

Greats,

René

Quoting Thomas Bogendoerfer <tsbogend@alpha.franken.de>:

> 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>
> ---
>  arch/mips/ralink/Kconfig  | 1 +
>  arch/mips/ralink/mt7621.c | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
> index 94e9ce994494..35c2ebd8f094 100644
> --- 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 905460aeeb1f..0accb80db709 100644
> --- 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);
>  }
> --
> 2.16.4

Patch
diff mbox series

diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 94e9ce994494..35c2ebd8f094 100644
--- 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 905460aeeb1f..0accb80db709 100644
--- 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);
 }