Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ef865bb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'spear/multiplatform' into spear/dma 



The actual SPEAr conversion to the DMA binding depends on
driver patches and the multiplatform work.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 787b0c1f bcf3e72e

arch/arm/Kconfig

+2 −10
Original line number Diff line number Diff line
@@ -933,16 +933,8 @@ config ARCH_NOMADIK 
	help

	  Support for the Nomadik platform by ST-Ericsson



config PLAT_SPEAR

config PLAT_SPEAR_SINGLE

	bool "ST SPEAr"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

	  Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
@@ -1104,7 +1096,7 @@ source "arch/arm/plat-samsung/Kconfig" 


source "arch/arm/mach-socfpga/Kconfig"



source "arch/arm/plat-spear/Kconfig"

source "arch/arm/mach-spear/Kconfig"



source "arch/arm/mach-s3c24xx/Kconfig"

arch/arm/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -191,9 +191,7 @@ machine-$(CONFIG_ARCH_VT8500) += vt8500 
machine-$(CONFIG_ARCH_W90X900)		+= w90x900

machine-$(CONFIG_FOOTBRIDGE)		+= footbridge

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_SPEAR13XX)	+= spear13xx

machine-$(CONFIG_ARCH_SPEAR3XX)		+= spear3xx

machine-$(CONFIG_MACH_SPEAR600)		+= spear6xx

machine-$(CONFIG_PLAT_SPEAR)		+= spear

machine-$(CONFIG_ARCH_VIRT)		+= virt

machine-$(CONFIG_ARCH_ZYNQ)		+= zynq

machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
@@ -207,7 +205,6 @@ plat-$(CONFIG_PLAT_ORION) += orion 
plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_S3C24XX)	+= samsung

plat-$(CONFIG_PLAT_S5P)		+= samsung

plat-$(CONFIG_PLAT_SPEAR)	+= spear

plat-$(CONFIG_PLAT_VERSATILE)	+= versatile



ifeq ($(CONFIG_ARCH_EBSA110),y)

arch/arm/configs/multi_v7_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ CONFIG_ARCH_SUNXI=y 
# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set

CONFIG_ARCH_ZYNQ=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PLAT_SPEAR=y

CONFIG_ARCH_SPEAR13XX=y

CONFIG_MACH_SPEAR1310=y

CONFIG_MACH_SPEAR1340=y

CONFIG_SMP=y

CONFIG_ARM_ARCH_TIMER=y

CONFIG_AEABI=y
@@ -23,6 +27,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_SATA_HIGHBANK=y

CONFIG_SATA_MV=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_NET_CALXEDA_XGMAC=y

CONFIG_SMSC911X=y
@@ -31,6 +36,7 @@ CONFIG_SERIO_AMBAKMI=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DW=y

CONFIG_KEYBOARD_SPEAR=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y
@@ -40,6 +46,7 @@ CONFIG_I2C=y 
CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_PL061=y

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -50,6 +57,7 @@ CONFIG_MMC=y 
CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_SPEAR=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_HIGHBANK_MC=y
@@ -58,3 +66,4 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

CONFIG_DW_DMAC=y

arch/arm/configs/spear3xx_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_PLAT_SPEAR=y

CONFIG_ARCH_SPEAR3XX=y

CONFIG_MACH_SPEAR300=y

CONFIG_MACH_SPEAR310=y

CONFIG_MACH_SPEAR320=y

arch/arm/configs/spear6xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_PLAT_SPEAR=y

CONFIG_ARCH_SPEAR6XX=y

CONFIG_BINFMT_MISC=y