From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2016 21:57:08 +0000 (-0700)
Subject: Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33b3d2e88c9efd701b6153ca4714d4aa6e9f5af0;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'armsoc-soc' of git://git./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
  ...
---

33b3d2e88c9efd701b6153ca4714d4aa6e9f5af0
diff --cc MAINTAINERS
index 871818cf9409,4dd493d7a354..6e0ed0a263f7
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -944,13 -929,19 +944,23 @@@ N:	meso
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>
 +M:	Antoine Tenart <antoine.tenart@free-electrons.com>
  S:	Maintained
  F:	arch/arm/mach-alpine/
 +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>
diff --cc arch/arm/mach-exynos/Kconfig
index 5189bcecad12,c4989c2bcad8..207fa2c737a6
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -25,9 -26,9 +26,10 @@@ menuconfig ARCH_EXYNO
  	select PINCTRL_EXYNOS
  	select PM_GENERIC_DOMAINS if PM
  	select S5P_DEV_MFC
+ 	select SOC_SAMSUNG
  	select SRAM
  	select THERMAL
 +	select THERMAL_OF
  	select MFD_SYSCON
  	select CLKSRC_EXYNOS_MCT
  	select POWER_RESET