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

Commit 58c72f94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "A first set of bug fixes that didn't make it for the merge window, and
  two Kconfig cleanups that still make sense at this point.

  Unfortunately, one of the two cleanups caused an unintended change in
  the original version, so we had to revert one part of it and do some
  more testing to ensure the rest is really fine.  There was also a
  last-minute rebase of the patches to remove another bad commit"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: use menuconfig for sub-arch menus
  ARM: multi_v7_defconfig: re-enable SDHCI drivers
  ARM: EXYNOS: Fix compilation warning
  ARM: exynos: move sysram info to exynos.c
  ARM: dts: Specify the NAND ECC scheme explicitly on Armada 385 DB board
  ARM: dts: Specify the NAND ECC scheme explicitly on Armada 375 DB board
  ARM: exynos: cleanup kconfig option display
  misc: vexpress: fix error handling vexpress_syscfg_regmap_init()
  ARM: Remove ARCH_HAS_CPUFREQ config option
  ARM: integrator: fix section mismatch problem
  ARM: mvebu: DT: fix OpenBlocks AX3-4 RAM size
  ARM: samsung: make SAMSUNG_DMADEV optional
  remoteproc: da8xx: don't select CMA on no-MMU
  bus/arm-cci: add dependency on OF && CPU_V7
  ARM: keystone requires ARM_PATCH_PHYS_VIRT
  ARM: omap2: fix am43xx dependency on l2x0 cache
parents 894e552c 21278aea

arch/arm/Kconfig

+1 −19
Original line number Diff line number Diff line
@@ -175,13 +175,6 @@ config ARCH_HAS_ILOG2_U32 
config ARCH_HAS_ILOG2_U64

	bool



config ARCH_HAS_CPUFREQ

	bool

	help

	  Internal node to signify that the ARCH has CPUFREQ support

	  and that the relevant menu configurations are displayed for

	  it.



config ARCH_HAS_BANDGAP

	bool
@@ -318,7 +311,6 @@ config ARCH_MULTIPLATFORM 


config ARCH_INTEGRATOR

	bool "ARM Ltd. Integrator family"

	select ARCH_HAS_CPUFREQ

	select ARM_AMBA

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR
@@ -538,7 +530,6 @@ config ARCH_DOVE 


config ARCH_KIRKWOOD

	bool "Marvell Kirkwood"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS
@@ -637,7 +628,6 @@ config ARCH_LPC32XX 
config ARCH_PXA

	bool "PXA2xx/PXA3xx-based"

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_MTD_XIP

	select ARCH_REQUIRE_GPIOLIB

	select ARM_CPU_SUSPEND if PM
@@ -707,7 +697,6 @@ config ARCH_RPC 


config ARCH_SA1100

	bool "SA1100-based"

	select ARCH_HAS_CPUFREQ

	select ARCH_MTD_XIP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_SPARSEMEM_ENABLE
@@ -725,7 +714,6 @@ config ARCH_SA1100 


config ARCH_S3C24XX

	bool "Samsung S3C24XX SoCs"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ATAGS

	select CLKDEV_LOOKUP
@@ -746,7 +734,6 @@ config ARCH_S3C24XX 


config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC
@@ -809,7 +796,6 @@ config ARCH_S5PC100 


config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_SPARSEMEM_ENABLE

	select ATAGS
@@ -845,7 +831,6 @@ config ARCH_DAVINCI 
config ARCH_OMAP1

	bool "TI OMAP1"

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select ARCH_REQUIRE_GPIOLIB
@@ -1009,8 +994,6 @@ source "arch/arm/mach-rockchip/Kconfig" 


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



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



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



source "arch/arm/mach-spear/Kconfig"
@@ -1028,6 +1011,7 @@ source "arch/arm/mach-s5pc100/Kconfig" 
source "arch/arm/mach-s5pv210/Kconfig"



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

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



source "arch/arm/mach-shmobile/Kconfig"
@@ -2109,9 +2093,7 @@ endmenu 


menu "CPU Power Management"



if ARCH_HAS_CPUFREQ

source "drivers/cpufreq/Kconfig"

endif



source "drivers/cpuidle/Kconfig"

arch/arm/boot/dts/armada-375-db.dts

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ 
				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

				nand-ecc-strength = <4>;

				nand-ecc-step-size = <512>;



				partition@0 {

					label = "U-Boot";

arch/arm/boot/dts/armada-385-db.dts

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

				nand-ecc-strength = <4>;

				nand-ecc-step-size = <512>;



				partition@0 {

					label = "U-Boot";

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


	memory {

		device_type = "memory";

		reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */

		reg = <0 0x00000000 0 0x40000000>; /* 1 GB soldered on */

	};



	soc {

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ CONFIG_MMC=y 
CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ARASAN=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y

CONFIG_MMC_SDHCI_DOVE=y