| Message ID | 20151015181409.GJ32089@broadcom.com |
|---|---|
| State | New |
| Headers | show |
Looks good. On 15-10-15 11:14 AM, Jon Mason wrote: > ARM: BCM: Add SMP support for Broadcom 4708 > > Add SMP support for Broadcom's 4708 SoCs. > > Signed-off-by: Jon Mason <jonmason@broadcom.com> Acked-by: Scott Branden <sbranden@broadcom.com> > --- > arch/arm/boot/dts/bcm4708.dtsi | 2 ++ > arch/arm/boot/dts/bcm94708.dts | 2 +- > arch/arm/mach-bcm/Kconfig | 1 + > arch/arm/mach-bcm/Makefile | 3 +++ > 4 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/bcm4708.dtsi b/arch/arm/boot/dts/bcm4708.dtsi > index 31141e8..22a41df 100644 > --- a/arch/arm/boot/dts/bcm4708.dtsi > +++ b/arch/arm/boot/dts/bcm4708.dtsi > @@ -15,6 +15,8 @@ > cpus { > #address-cells = <1>; > #size-cells = <0>; > + enable-method = "brcm,bcm-nsp-smp"; > + secondary-boot-reg = <0xffff0400>; > > cpu@0 { > device_type = "cpu"; > diff --git a/arch/arm/boot/dts/bcm94708.dts b/arch/arm/boot/dts/bcm94708.dts > index f60bb1d..49682d6 100644 > --- a/arch/arm/boot/dts/bcm94708.dts > +++ b/arch/arm/boot/dts/bcm94708.dts > @@ -32,7 +32,7 @@ > > /dts-v1/; > > -#include "bcm5301x.dtsi" > +#include "bcm4708.dtsi" > > / { > model = "NorthStar SVK (BCM94708)"; > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig > index 2e9dbb5..4fc8fa3 100644 > --- a/arch/arm/mach-bcm/Kconfig > +++ b/arch/arm/mach-bcm/Kconfig > @@ -54,6 +54,7 @@ config ARCH_BCM_NSP > config ARCH_BCM_5301X > bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 > select ARCH_BCM_IPROC > + select HAVE_SMP > help > Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. > > diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile > index 36a4ca30..3ca1cf1 100644 > --- a/arch/arm/mach-bcm/Makefile > +++ b/arch/arm/mach-bcm/Makefile > @@ -43,6 +43,9 @@ obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o > > # BCM5301X > obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o > +ifeq ($(CONFIG_ARCH_BCM_5301X),y) > +obj-$(CONFIG_SMP) += headsmp.o platsmp.o > +endif > > # BCM63XXx > ifeq ($(CONFIG_ARCH_BCM_63XX),y) > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/bcm4708.dtsi b/arch/arm/boot/dts/bcm4708.dtsi index 31141e8..22a41df 100644 --- a/arch/arm/boot/dts/bcm4708.dtsi +++ b/arch/arm/boot/dts/bcm4708.dtsi @@ -15,6 +15,8 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "brcm,bcm-nsp-smp"; + secondary-boot-reg = <0xffff0400>; cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/bcm94708.dts b/arch/arm/boot/dts/bcm94708.dts index f60bb1d..49682d6 100644 --- a/arch/arm/boot/dts/bcm94708.dts +++ b/arch/arm/boot/dts/bcm94708.dts @@ -32,7 +32,7 @@ /dts-v1/; -#include "bcm5301x.dtsi" +#include "bcm4708.dtsi" / { model = "NorthStar SVK (BCM94708)"; diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 2e9dbb5..4fc8fa3 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -54,6 +54,7 @@ config ARCH_BCM_NSP config ARCH_BCM_5301X bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 select ARCH_BCM_IPROC + select HAVE_SMP help Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index 36a4ca30..3ca1cf1 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -43,6 +43,9 @@ obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o # BCM5301X obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o +ifeq ($(CONFIG_ARCH_BCM_5301X),y) +obj-$(CONFIG_SMP) += headsmp.o platsmp.o +endif # BCM63XXx ifeq ($(CONFIG_ARCH_BCM_63XX),y)
ARM: BCM: Add SMP support for Broadcom 4708 Add SMP support for Broadcom's 4708 SoCs. Signed-off-by: Jon Mason <jonmason@broadcom.com> --- arch/arm/boot/dts/bcm4708.dtsi | 2 ++ arch/arm/boot/dts/bcm94708.dts | 2 +- arch/arm/mach-bcm/Kconfig | 1 + arch/arm/mach-bcm/Makefile | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-)