Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_EFI_PARTITION=y

CONFIG_ARCH_BCM=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_ARPD=y

CONFIG_SYN_COOKIES=y

CONFIG_TCP_MD5SIG=y

CONFIG_IPV6=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_TEST=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_BCM_KONA=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110

CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y

CONFIG_DEBUG_INFO=y

# CONFIG_FTRACE is not set

CONFIG_CRC_CCITT=y

CONFIG_CRC_T10DIF=y

CONFIG_MACH_ARMADA_370=y

CONFIG_MACH_ARMADA_XP=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_GPIO_PCA953X=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_KEYSTONE=y

config ARCH_BCM

	bool "Broadcom SoC" if ARCH_MULTI_V7

	bool "Broadcom SoC Support"

	depends on ARCH_MULTIPLATFORM

	help

	  This enables support for Broadcom ARM based SoC

          chips

if ARCH_BCM

menu "Broadcom SoC Selection"

config ARCH_BCM_MOBILE

	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_754322

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	select GPIO_BCM

	select GPIO_BCM_KONA

	select SPARSE_IRQ

	select TICK_ONESHOT

	select CACHE_L2X0

	select HAVE_ARM_ARCH_TIMER

	help

	  This enables support for system based on Broadcom SoCs.

	  This enables support for systems based on Broadcom mobile SoCs.

	  It currently supports the 'BCM281XX' family, which includes

	  BCM11130, BCM11140, BCM11351, BCM28145 and

	  BCM28155 variants.

endmenu

endif

# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

obj-$(CONFIG_ARCH_BCM)		:= board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o

obj-$(CONFIG_ARCH_BCM_MOBILE)	:= board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o

plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_bcm_kona_smc_asm.o	:=-Wa,-march=armv7-a$(plus_sec)

static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };

DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")

DT_MACHINE_START(BCM11351_DT, "BCM281xx Broadcom Application Processor")

	.init_machine = board_init,

	.restart = bcm_kona_restart,

	.dt_compat = bcm11351_dt_compat,