Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This pull request introduces the machine board code for the BCM2711,

Browse Source 
which is placed on the Raspberry Pi 4.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJdpfhTAAoJEFXEMs9xUwyNDIIP/36IpTcRnrRF4haLvXoxAQfP
 VxmENCy8l+RfY6ybuMkFBMr12fa6dgTIIL/6q3ZG/TR2pISQF2kzDxsb1toT2J4i
 YsgPEcTC2SZaiPR0WKkzUtlnTvEBoTAVWRj5o4lXtfIlUUGcfje9MqlA4gnwOj3V
 x62bnLdzBWKLfz9cBmysK4Zy/6prYMe6vYAWiCWhAZDVE78yrB807rtwStXHbd2J
 hppeARb9XK17CDqHDd0GWCebi8C9Lta78OfBwjK7Q2bffK9fxVXj9fYrIl91y2ZT
 HGWgjV3NWH7x7zfZYDviTiws+unx7+dw/DZUTb+ykjU8g1UXgtn+qxasv/qmlJFD
 9GBE9vvlT9TF3Pvums4wJ0qXag6NyBbqXUZgTYcNCsFmoK52UZjuECjd6gl8chX1
 GYhi3OrnrWATvYpJEfNud3JkaF/Wlgq/x0n4Y75hatW9AIWCsXB0oaB9mPdWuUAI
 AKRYwvTP19z7NpyE3vbidXVKpZiyxUvnmhMZaAYZLt0aC153219YaDM3qspHGetD
 A3Pw6MCP5yP+ebAFq3CV+jjkuYYyk52rBlPjX0Bnf73+KT10lB5h7Pf+c3uy5gsB
 vh9mRGoXc5Fpacv1je68lT4JStV0fxVXCNfmlUc8RUur9pHHxDwlH7zQ/FL3FEdf
 mW5ZxpM5gVk776MJzcnP
 =Phsw
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl2nlnIACgkQh9CWnEQH
 BwSLsBAA4DEtm14Z0po2wqo054psm4t2Tott1G5Ivlt+ML68biFIF5zcdvtSP0i/
 nG9ZiN/KDt+cRpHd8xJVZWzAPcy83JTXvJFDWcG7fZ1rM6rajTltIRcv1bYekHxt
 zTnlpQWs1yUSortpP0RGgiicI5x5AxJwUk0jnSVTSu8Sz4j3eYZjMsQeXZZM81fh
 5vQnBvvsq4Qu3F40MaAjmW8roV+YIYaWEH3DC0a1ErKWMJlJ/xtdpQRRCW4eZT88
 UMv+JkLEg19SAE2nFqyXZ1+ifD4Ot3AvMWmn4xTdQXw9MFFwx/bu6dYh3RXeNrnF
 pSN4zzT11YaHeCGMsyvk30ECZdzRr9qvCFnFtm5oHUpJ1IsO3CuOE1+V887JX+KW
 tHBjb593wLfU9W66KIipYGJOmUXzKBiaTwcmfEcEE8tdkAcngd08aBI3xbOUaKeX
 /F1Lcg7ZbCuJYWT+Srbd+lqG9eb5E1ZWaIE6As6U1mW8/i/YzbtH3gm0z3+Utrqt
 019LSfqeFjLA2LzYMOOZ3Jsas3JPkE7uckmJevzoQtMTTGNVnpYwP6L9+lyWOP/Q
 dxc8b/opyIibh6amhjvoNooINoFKjSjtynZzZ4+w4fYL1+cIYD8GBd4llIozgpEB
 w3QWDmtLAo5oUbVbz3AdryKSeZj0Ar0i/KLl87Rzg65X+8aHq6Q=
 =/AKh
 -----END PGP SIGNATURE-----

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: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2019-10-16 15:15:00 -07:00
commit 72c630020b
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-bcm/Kconfig
View File

@ -161,6 +161,8 @@ config ARCH_BCM2835
select GPIOLIB select GPIOLIB
select ARM_AMBA select ARM_AMBA
select ARM_ERRATA_411920 if ARCH_MULTI_V6 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 ARM_TIMER_SP804
select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
select TIMER_OF select TIMER_OF
@ -169,7 +171,7 @@ config ARCH_BCM2835
select PINCTRL_BCM2835 select PINCTRL_BCM2835
select MFD_CORE select MFD_CORE
help 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. This SoC is used in the Raspberry Pi and Roku 2 devices.
config ARCH_BCM_53573 config ARCH_BCM_53573

3
arch/arm/mach-bcm/Makefile
View File

@ -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 obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o
# BCM2835 # BCM2835
obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o
ifeq ($(CONFIG_ARCH_BCM2835),y) ifeq ($(CONFIG_ARCH_BCM2835),y)
obj-y += board_bcm2835.o
obj-y += bcm2711.o
ifeq ($(CONFIG_ARM),y) ifeq ($(CONFIG_ARM),y)
obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_SMP) += platsmp.o
endif endif

24
arch/arm/mach-bcm/bcm2711.c Normal file
View File

@ -0,0 +1,24 @@
// 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

5
arch/arm64/Kconfig.platforms
View File

@ -37,11 +37,12 @@ config ARCH_BCM2835
select PINCTRL select PINCTRL
select PINCTRL_BCM2835 select PINCTRL_BCM2835
select ARM_AMBA select ARM_AMBA
select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
help help
This enables support for the Broadcom BCM2837 SoC. This enables support for the Broadcom BCM2837 and BCM2711 SoC.
This SoC is used in the Raspberry Pi 3 device. These SoCs are used in the Raspberry Pi 3 and 4 devices.
config ARCH_BCM_IPROC config ARCH_BCM_IPROC
bool "Broadcom iProc SoC Family" bool "Broadcom iProc SoC Family"