hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This pull request contains Broadcom ARM-based SoCs changes for 5.7, 

please pull the following:
 
 - Geert drops redundant selects for Broadcom SoCs which are already
   implied by ARCH_MULTI_V6_V7
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl5pVXsACgkQh9CWnEQH
 BwTCLg//XPWtz+8kxTb5YFD4OyMiDQS5fftBQcsYaoesxhxnf04kudjWmKJtsi2a
 ZQhN3sbJj9BIKndwgPDPClVb2zv2pCflK6e+4fWQVRdngWfspWsnYpd2bATZ2c63
 mnug9gda1zWIYcdArQZ7OpywGOGQewnJSXxz30919WiYcwBlKzWvSu3rvBFDNSUa
 bo1MkEYhkzkVQXr4rL3ZK9zK2mWeoDKp556vJXIwaszIT/9fXkXQQ5V0TmRI23Gb
 gh+CUdHRpdvvTjPT+z9nWAptnGpLvo/fPOB4xDZH2JyFOftsRvdyh2RfyJOUkiX0
 QP4bhfgez7K7JufhQasgZBnodTVoIR125nNeKTSttLC9/SGfKgceI32D788DTfCX
 GDXtd0G7D517Am7Zkzz4BnaMkA1up9NQuOWeIXOvBbOa0FJZLAJeoCYZn5bDkljg
 NXRUx957MPtZaixH8J4EWGFI8HXyD27gF73Up1RbSWG/YCPmbdflYmHvyv1hpVcH
 mFRs3780WCzyieqJTNhjWBmPplDkqcG7zr1EiosqgvyYvnQK/oCxG8iwuVXI5Mt+
 /SvsJb9Cm5JJ0R55xxQAop8oHc4zLPqWZppwlGv00vXdzHGU2fEmjsLGQ3IdtRsh
 5nixfHNGupbTGeN9jXkKHIqpDb+mlxWb/+yD/OW0R5t8k+bSaxw=
 =ytnq
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.7/soc' of https://github.com/Broadcom/stblinux into arm/soc

This pull request contains Broadcom ARM-based SoCs changes for 5.7,
please pull the following:

- Geert drops redundant selects for Broadcom SoCs which are already
  implied by ARCH_MULTI_V6_V7

* tag 'arm-soc/for-5.7/soc' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Drop unneeded select of PCI_DOMAINS_GENERIC, HAVE_SMP, TIMER_OF

Link: https://lore.kernel.org/r/20200311212012.9418-3-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-03-25 20:54:38 +01:00
parent f40969fb56 824ca3a2cc
commit 27262a7544
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@ config ARCH_BCM_IPROC
select GPIOLIB
select ARM_AMBA
select PINCTRL
select PCI_DOMAINS_GENERIC if PCI
help
This enables support for systems based on Broadcom IPROC architected SoCs.
The IPROC complex contains one or more ARM CPUs along with common
@ -54,7 +53,6 @@ config ARCH_BCM_NSP
select ARM_ERRATA_754322
select ARM_ERRATA_775420
select ARM_ERRATA_764369 if SMP
select HAVE_SMP
select THERMAL
select THERMAL_OF
help
@ -73,7 +71,6 @@ config ARCH_BCM_5301X
select ARM_ERRATA_754322
select ARM_ERRATA_775420
select ARM_ERRATA_764369 if SMP
select HAVE_SMP
help
Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.
@ -109,7 +106,6 @@ config ARCH_BCM_281XX
bool "Broadcom BCM281XX SoC family"
depends on ARCH_MULTI_V7
select ARCH_BCM_MOBILE
select HAVE_SMP
help
Enable support for the BCM281XX family, which includes
BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155
@ -119,7 +115,6 @@ config ARCH_BCM_21664
bool "Broadcom BCM21664 SoC family"
depends on ARCH_MULTI_V7
select ARCH_BCM_MOBILE
select HAVE_SMP
help
Enable support for the BCM21664 family, which includes
BCM21663 and BCM21664 variants.
@ -128,7 +123,6 @@ config ARCH_BCM_23550
bool "Broadcom BCM23550 SoC"
depends on ARCH_MULTI_V7
select ARCH_BCM_MOBILE
select HAVE_SMP
help
Enable support for the BCM23550.
@ -165,7 +159,6 @@ config ARCH_BCM2835
select ZONE_DMA if ARCH_MULTI_V7
select ARM_TIMER_SP804
select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
select TIMER_OF
select BCM2835_TIMER
select PINCTRL
select PINCTRL_BCM2835
@ -201,7 +194,6 @@ config ARCH_BCM_63XX
select HAVE_ARM_ARCH_TIMER
select HAVE_ARM_TWD if SMP
select HAVE_ARM_SCU if SMP
select HAVE_SMP
help
This enables support for systems based on Broadcom DSL SoCs.
It currently supports the 'BCM63XX' ARM-based family, which includes