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

Commit dfc25e45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC cleanups from Arnd Bergmann:
 "These cleanup patches are mainly move stuff around and should all be
  harmless.  They are mainly split out so that other branches can be
  based on top to avoid conflicts.

  Notable changes are:

   - We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
     longer used (Uwe Kleine-König)
   - The Qualcomm MSM platform is split out into legacy mach-msm and
     new-style mach-qcom, to allow easier maintainance of the new
     hardware support without regressions (Kumar Gala)
   - A rework of some of the Kconfig logic to simplify multiplatform
     support (Rob Herring)
   - Samsung Exynos gets closer to supporting multiplatform (Sachin
     Kamat and others)
   - mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
   - at91 gains some common clock framework support (Alexandre Belloni,
     Jean-Jacques Hiblot and other French people)"

* tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (89 commits)
  ARM: hisi: select HAVE_ARM_SCU only for SMP
  ARM: efm32: allow uncompress debug output
  ARM: prima2: build reset code standalone
  ARM: at91: add PWM clock
  ARM: at91: move sam9261 SoC to common clk
  ARM: at91: prepare common clk transition for sam9261 SoC
  ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
  ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
  ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
  ARM: at91: dt: Add at91sam9261 dt SoC support
  ARM: at91: switch sam9rl to common clock framework
  ARM: at91/dt: define main clk frequency of at91sam9rlek
  ARM: at91/dt: define at91sam9rl clocks
  ARM: at91: prepare common clk transition for sam9rl SoCs
  ARM: at91: prepare sam9 dt boards transition to common clk
  ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
  ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
  ARM: at91: Add at91sam9rl DT SoC support
  ARM: at91: prepare at91sam9rl DT transition
  ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
  ...
parents 9f800363 8f881c67

Documentation/devicetree/bindings/reset/sirf,rstc.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
CSR SiRFSoC Reset Controller

======================================



Please also refer to reset.txt in this directory for common reset

controller binding usage.



Required properties:

- compatible: Should be "sirf,prima2-rstc" or "sirf,marco-rstc"

- reg: should be register base and length as documented in the

  datasheet

- #reset-cells: 1, see below



example:



rstc: reset-controller@88010000 {

	compatible = "sirf,prima2-rstc";

	reg = <0x88010000 0x1000>;

	#reset-cells = <1>;

};



Specifying reset lines connected to IP modules

==============================================



The reset controller(rstc) manages various reset sources. This module provides

reset signals for most blocks in system. Those device nodes should specify the

reset line on the rstc in their resets property, containing a phandle to the

rstc device node and a RESET_INDEX specifying which module to reset, as described

in reset.txt.



For SiRFSoC, RESET_INDEX is just reset_bit defined in SW_RST0 and SW_RST1 registers.

For modules whose rest_bit is in SW_RST0, its RESET_INDEX is 0~31. For modules whose

rest_bit is in SW_RST1, its RESET_INDEX is 32~63.



example:



vpp@90020000 {

	compatible = "sirf,prima2-vpp";

	reg = <0x90020000 0x10000>;

	interrupts = <31>;

	clocks = <&clks 35>;

	resets = <&rstc 6>;

};

Documentation/devicetree/bindings/serial/atmel-usart.txt

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ Required properties: 
Optional properties:

- atmel,use-dma-rx: use of PDC or DMA for receiving data

- atmel,use-dma-tx: use of PDC or DMA for transmitting data

- rts-gpios: specify a GPIO for RTS line. It will use specified PIO instead of the peripheral

  function pin for the USART RTS feature. If unsure, don't specify this property.

- add dma bindings for dma transfer:

	- dmas: DMA specifier, consisting of a phandle to DMA controller node,

		memory peripheral interface and USART DMA channel ID, FIFO configuration.
@@ -33,6 +35,7 @@ Example: 
		clock-names = "usart";

		atmel,use-dma-rx;

		atmel,use-dma-tx;

		rts-gpios = <&pioD 15 0>;

	};



- use DMA:

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -1175,6 +1175,14 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
W:	http://www.arm.linux.org.uk/

S:	Maintained



ARM/QUALCOMM SUPPORT

M:	Kumar Gala <galak@codeaurora.org>

M:	David Brown <davidb@codeaurora.org>

L:	linux-arm-msm@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-qcom/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git



ARM/RADISYS ENP2611 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1894,7 +1902,7 @@ M: Stephen Warren <swarren@wwwdotorg.org> 
L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git

S:	Maintained

F:	arch/arm/mach-bcm2835/

F:	arch/arm/mach-bcm/board_bcm2835.c

F:	arch/arm/boot/dts/bcm2835*

F:	arch/arm/configs/bcm2835_defconfig

F:	drivers/*/*bcm2835*

arch/arm/Kconfig

+16 −11
Original line number Diff line number Diff line
@@ -309,9 +309,11 @@ choice 
config ARCH_MULTIPLATFORM

	bool "Allow multiple platforms to be selected"

	depends on MMU

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF
@@ -425,9 +427,6 @@ config ARCH_EFM32 
	select ARCH_REQUIRE_GPIOLIB

	select AUTO_ZRELADDR

	select ARM_NVIC

	# CLKSRC_MMIO is wrong here, but needed until a proper fix is merged,

	# i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select CPU_V7M
@@ -659,9 +658,8 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_MSM_NODT

	bool "Qualcomm MSM"

	select ARCH_MSM

config ARCH_MSM

	bool "Qualcomm MSM (non-multiplatform)"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS
@@ -921,16 +919,18 @@ config ARCH_MULTI_V4_V5 
config ARCH_MULTI_V6

	bool "ARMv6 based platforms (ARM11)"

	select ARCH_MULTI_V6_V7

	select CPU_V6

	select CPU_V6K



config ARCH_MULTI_V7

	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"

	default y

	select ARCH_MULTI_V6_V7

	select CPU_V7

	select HAVE_SMP



config ARCH_MULTI_V6_V7

	bool

	select MIGHT_HAVE_CACHE_L2X0



config ARCH_MULTI_CPU_AUTO

	def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
@@ -938,6 +938,13 @@ config ARCH_MULTI_CPU_AUTO 


endmenu



config ARCH_VIRT

	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_GIC

	select ARM_PSCI

	select HAVE_ARM_ARCH_TIMER



#

# This is sorted alphabetically by mach-* pathname.  However, plat-*

# Kconfigs may be included either alphabetically (according to the
@@ -949,8 +956,6 @@ source "arch/arm/mach-at91/Kconfig" 


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



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



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



source "arch/arm/mach-clps711x/Kconfig"
@@ -1018,6 +1023,8 @@ source "arch/arm/plat-pxa/Kconfig" 


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



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



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



source "arch/arm/mach-rockchip/Kconfig"
@@ -1061,8 +1068,6 @@ source "arch/arm/mach-versatile/Kconfig" 
source "arch/arm/mach-vexpress/Kconfig"

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



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



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



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

arch/arm/Kconfig.debug

+4 −3
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ config DEBUG_STI_UART 


config DEBUG_MSM_UART

	bool

	depends on ARCH_MSM

	depends on ARCH_MSM || ARCH_QCOM



config DEBUG_LL_INCLUDE

	string
@@ -1145,7 +1145,7 @@ config DEBUG_UART_8250_FLOW_CONTROL 


config DEBUG_UNCOMPRESS

	bool

	depends on ARCH_MULTIPLATFORM || ARCH_MSM

	depends on ARCH_MULTIPLATFORM || ARCH_MSM || ARCH_EXYNOS

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)

	help
@@ -1161,7 +1161,8 @@ config DEBUG_UNCOMPRESS 


config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					ARCH_EXYNOS || ARCH_EFM32

	default "mach/uncompress.h"



config EARLY_PRINTK