Unverified Commit 72c63002 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-soc-next-2019-10-15' into soc/next 



This pull request introduces the machine board code for the BCM2711,
which is placed on the Raspberry Pi 4.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents b47879aa 781fa0a9

arch/arm/mach-bcm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ config ARCH_BCM2835 
	select GPIOLIB

	select ARM_AMBA

	select ARM_ERRATA_411920 if ARCH_MULTI_V6

	select ARM_GIC if ARCH_MULTI_V7

	select ZONE_DMA if ARCH_MULTI_V7

	select ARM_TIMER_SP804

	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7

	select TIMER_OF
@@ -169,7 +171,7 @@ config ARCH_BCM2835 
	select PINCTRL_BCM2835

	select MFD_CORE

	help

	  This enables support for the Broadcom BCM2835 and BCM2836 SoCs.

	  This enables support for the Broadcom BCM2711 and BCM283x SoCs.

	  This SoC is used in the Raspberry Pi and Roku 2 devices.



config ARCH_BCM_53573

arch/arm/mach-bcm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o 
obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o



# BCM2835

obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o

ifeq ($(CONFIG_ARCH_BCM2835),y)

obj-y				+= board_bcm2835.o

obj-y				+= bcm2711.o

ifeq ($(CONFIG_ARM),y)

obj-$(CONFIG_SMP)		+= platsmp.o

endif

arch/arm/mach-bcm/bcm2711.c

0 → 100644
+24 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright (C) 2019 Stefan Wahren

 */



#include <linux/of_address.h>



#include <asm/mach/arch.h>



#include "platsmp.h"



static const char * const bcm2711_compat[] = {

#ifdef CONFIG_ARCH_MULTI_V7

	"brcm,bcm2711",

#endif

};



DT_MACHINE_START(BCM2711, "BCM2711")

#ifdef CONFIG_ZONE_DMA

	.dma_zone_size	= SZ_1G,

#endif

	.dt_compat = bcm2711_compat,

	.smp = smp_ops(bcm2836_smp_ops),

MACHINE_END

arch/arm64/Kconfig.platforms

+3 −2
Original line number Diff line number Diff line
@@ -37,11 +37,12 @@ config ARCH_BCM2835 
	select PINCTRL

	select PINCTRL_BCM2835

	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select HAVE_ARM_ARCH_TIMER

	help

	  This enables support for the Broadcom BCM2837 SoC.

	  This SoC is used in the Raspberry Pi 3 device.

	  This enables support for the Broadcom BCM2837 and BCM2711 SoC.

	  These SoCs are used in the Raspberry Pi 3 and 4 devices.



config ARCH_BCM_IPROC

	bool "Broadcom iProc SoC Family"