Commit 33b3d2e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC platform updates from Arnd Bergmann:
 "Newly added support for additional SoCs:
   - Axis Artpec-6 SoC family
   - Allwinner A83T SoC
   - Mediatek MT7623
   - NXP i.MX6QP SoC
   - ST Microelectronics stm32f469 microcontroller

  New features:
   - SMP support for Mediatek mt2701
   - Big-endian support for NXP i.MX
   - DaVinci now uses the new DMA engine dma_slave_map
   - OMAP now uses the new DMA engine dma_slave_map
   - earlyprintk support for palmchip uart on mach-tango
   - delay timer support for orion

  Other:
   - Exynos PMU driver moved out to drivers/soc/
   - Various smaller updates for Renesas, Xilinx, PXA, AT91, OMAP,
     uniphier"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: uniphier: rework SMP code to support new System Bus binding
  ARM: uniphier: add missing of_node_put()
  ARM: at91: avoid defining CONFIG_* symbols in source code
  ARM: DRA7: hwmod: Add data for eDMA tpcc, tptc0, tptc1
  ARM: imx: Make reset_control_ops const
  ARM: imx: Do L2 errata only if the L2 cache isn't enabled
  ARM: imx: select ARM_CPU_SUSPEND only for imx6
  dmaengine: pxa_dma: fix the maximum requestor line
  ARM: alpine: select the Alpine MSI controller driver
  ARM: pxa: add the number of DMA requestor lines
  dmaengine: mmp-pdma: add number of requestors
  dma: mmp_pdma: Add the #dma-requests DT property documentation
  ARM: OMAP2+: Add rtc hwmod configuration for ti81xx
  ARM: s3c24xx: Avoid warning for inb/outb
  ARM: zynq: Move early printk virtual address to vmalloc area
  ARM: DRA7: hwmod: Add custom reset handler for PCIeSS
  ARM: SAMSUNG: Remove unused register offset definition
  ARM: EXYNOS: Cleanup header files inclusion
  drivers: soc: samsung: Enable COMPILE_TEST
  MAINTAINERS: Add maintainers entry for drivers/soc/samsung
  ...
parents e88fa1b8 307d40c5

Documentation/arm/sunxi/README

+0 −1
Original line number Diff line number Diff line
@@ -72,6 +72,5 @@ SunXi family 


    * Octa ARM Cortex-A7 based SoCs

      - Allwinner A83T

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ using one of the following compatible strings: 
  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-a83t

  allwinner,sun8i-h3

  allwinner,sun9i-a80

Documentation/devicetree/bindings/dma/mmp-dma.txt

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

- #dma-channels: Number of DMA channels supported by the controller (defaults

  to 32 when not specified)

- #dma-requests: Number of DMA requestor lines supported by the controller

  (defaults to 32 when not specified)



"marvell,pdma-1.0"

Used platforms: pxa25x, pxa27x, pxa3xx, pxa93x, pxa168, pxa910, pxa688.

MAINTAINERS

+14 −2
Original line number Diff line number Diff line
@@ -951,6 +951,16 @@ F: arch/arm/boot/dts/alpine* 
F:	arch/arm64/boot/dts/al/

F:	drivers/*/*alpine*



ARM/ARTPEC MACHINE SUPPORT

M:	Jesper Nilsson <jesper.nilsson@axis.com>

M:	Lars Persson <lars.persson@axis.com>

M:	Niklas Cassel <niklas.cassel@axis.com>

S:	Maintained

L:	linux-arm-kernel@axis.com

F:	arch/arm/mach-artpec

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

F:	drivers/clk/clk-artpec6.c



ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@ -1515,6 +1525,7 @@ F: arch/arm/mach-s5p*/ 
F:	arch/arm/mach-exynos*/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*

F:	drivers/soc/samsung/*

F:	drivers/spi/spi-s3c*

F:	sound/soc/samsung/*

F:	Documentation/arm/Samsung/
@@ -2406,8 +2417,9 @@ F: arch/arm/boot/dts/bcm470* 


BROADCOM BCM63XX ARM ARCHITECTURE

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	linux-arm-kernel@lists.infradead.org

T:	git git://github.com/broadcom/arm-bcm63xx.git

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

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

F:	arch/arm/include/debug/bcm63xx.S

arch/arm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ config ARCH_PXA 
	select CLKSRC_PXA

	select CLKSRC_MMIO

	select CLKSRC_OF

	select CPU_XSCALE if !CPU_XSC3

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_IDE
@@ -724,6 +725,8 @@ source "arch/arm/mach-mvebu/Kconfig" 


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



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



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



source "arch/arm/mach-at91/Kconfig"
@@ -879,10 +882,16 @@ config ARCH_STM32 
	select ARCH_HAS_RESET_CONTROLLER

	select ARMV7M_SYSTICK

	select CLKSRC_STM32

	select PINCTRL

	select RESET_CONTROLLER

	help

	  Support for STMicroelectronics STM32 processors.



config MACH_STM32F429

	bool "STMicrolectronics STM32F429"

	depends on ARCH_STM32

	default y



# Definitions to make life easier

config ARCH_ACORN

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE