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

4aa705b1 · Linus Torvalds <[email protected]> · 2015-06-26 11:34:35 -07:00

Pull ARM SoC platform support updates from Kevin Hilman:
 "Our SoC branch usually contains expanded support for new SoCs and
  other core platform code.  Some highlights from this round:

   - sunxi: SMP support for A23 SoC
   - socpga: big-endian support
   - pxa: conversion to common clock framework
   - bcm: SMP support for BCM63138
   - imx: support new I.MX7D SoC
   - zte: basic support for ZX296702 SoC"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits)
  ARM: zx: Add basic defconfig support for ZX296702
  ARM: dts: zx: add an initial zx296702 dts and doc
  clk: zx: add clock support to zx296702
  dt-bindings: Add #defines for ZTE ZX296702 clocks
  ARM: socfpga: fix build error due to secondary_startup
  MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS
  ARM: ep93xx: simone: support for SPI-based MMC/SD cards
  MAINTAINERS: update Shawn's email to use kernel.org one
  ARM: socfpga: support suspend to ram
  ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10
  ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5
  ARM: EXYNOS: register power domain driver from core_initcall
  ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs
  ARM: SAMSUNG: Constify platform_device_id
  ARM: EXYNOS: Constify irq_domain_ops
  ARM: EXYNOS: add coupled cpuidle support for Exynos3250
  ARM: EXYNOS: add exynos_get_boot_addr() helper
  ARM: EXYNOS: add exynos_set_boot_addr() helper
  ARM: EXYNOS: make exynos_core_restart() less verbose
  ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout
  ...

Commit: 4aa705b18bf17c4ff33ff7bbcd3f0c596443fa81
Parents: c11d7162 · 2879e43f

Merge commit. Changes below are compared with the first parent: c11d7162.

Changes

217 files changed · +6572 −2061

File	Status	Add	Del	Content
Documentation/arm/stm32/overview.txt	added	+32	−0	View file
Documentation/arm/stm32/stm32f429-overview.txt	added	+22	−0	View file
Documentation/devicetree/bindings/arm/cpus.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/arm/exynos/power_domain.txt	modified	+4	−3	View file
Documentation/devicetree/bindings/arm/fsl.txt	modified	+3	−0	View file
Documentation/devicetree/bindings/arm/zte.txt	added	+15	−0	View file
Documentation/devicetree/bindings/clock/zx296702-clk.txt	added	+35	−0	View file
Documentation/devicetree/bindings/serial/pl011.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+1	−0	View file
MAINTAINERS	modified	+36	−2	View file
arch/arm/Kconfig	modified	+53	−19	View file
arch/arm/Kconfig.debug	modified	+55	−11	View file
arch/arm/Makefile	modified	+4	−0	View file
arch/arm/boot/dts/Makefile	modified	+1	−0	View file
arch/arm/boot/dts/zx296702-ad1.dts	added	+48	−0	View file
arch/arm/boot/dts/zx296702.dtsi	added	+139	−0	View file
arch/arm/configs/efm32_defconfig	modified	+1	−0	View file
arch/arm/configs/zx_defconfig	added	+129	−0	View file
arch/arm/include/asm/firmware.h	modified	+4	−0	View file
arch/arm/include/asm/vfp.h	modified	+9	−0	View file
arch/arm/include/debug/8250.S	modified	+3	−0	View file
arch/arm/include/debug/efm32.S	modified	+1	−1	View file
arch/arm/include/debug/imx-uart.h	modified	+14	−1	View file
arch/arm/include/debug/pl01x.S	modified	+7	−0	View file
arch/arm/kernel/debug.S	modified	+1	−1	View file
arch/arm/mach-bcm/Kconfig	modified	+2	−0	View file
arch/arm/mach-bcm/Makefile	modified	+6	−1	View file
arch/arm/mach-bcm/bcm63xx_headsmp.S	added	+23	−0	View file
arch/arm/mach-bcm/bcm63xx_pmb.c	added	+221	−0	View file
arch/arm/mach-bcm/bcm63xx_smp.c	added	+169	−0	View file
arch/arm/mach-bcm/bcm63xx_smp.h	added	+9	−0	View file
arch/arm/mach-bcm/bcm_5301x.c	modified	+5	−4	View file
arch/arm/mach-bcm/board_bcm2835.c	modified	+0	−91	View file
arch/arm/mach-ep93xx/simone.c	modified	+134	−1	View file
arch/arm/mach-exynos/common.h	modified	+3	−1	View file
arch/arm/mach-exynos/exynos.c	modified	+2	−1	View file
arch/arm/mach-exynos/firmware.c	modified	+18	−0	View file
arch/arm/mach-exynos/platsmp.c	modified	+59	−27	View file
arch/arm/mach-exynos/pm.c	modified	+43	−8	View file
arch/arm/mach-exynos/pm_domains.c	modified	+33	−20	View file
arch/arm/mach-exynos/pmu.c	modified	+3	−3	View file
arch/arm/mach-exynos/suspend.c	modified	+1	−1	View file
arch/arm/mach-imx/Kconfig	modified	+31	−18	View file
arch/arm/mach-imx/Makefile	modified	+14	−17	View file
arch/arm/mach-imx/Makefile.boot	added	+0	−0	View file
arch/arm/mach-imx/anatop.c	modified	+4	−1	View file
arch/arm/mach-imx/common.h	modified	+6	−9	View file
arch/arm/mach-imx/cpu.c	modified	+3	−0	View file
arch/arm/mach-imx/cpuidle-imx6q.c	modified	+2	−2	View file
arch/arm/mach-imx/cpuidle-imx6sl.c	modified	+2	−2	View file
arch/arm/mach-imx/cpuidle-imx6sx.c	modified	+2	−2	View file
arch/arm/mach-imx/gpc.c	modified	+1	−1	View file
arch/arm/mach-imx/hardware.h	modified	+1	−0	View file
arch/arm/mach-imx/iomux-imx31.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-imx6q.c	modified	+1	−0	View file
arch/arm/mach-imx/mach-imx6sl.c	modified	+1	−0	View file
arch/arm/mach-imx/mach-imx6sx.c	modified	+1	−0	View file
arch/arm/mach-imx/mach-imx7d.c	added	+43	−0	View file
arch/arm/mach-imx/mach-vf610.c	modified	+1	−0	View file
arch/arm/mach-imx/mmdc.c	modified	+2	−0	View file
arch/arm/mach-imx/mx27.h	modified	+0	−4	View file
arch/arm/mach-imx/mx3x.h	modified	+0	−7	View file
arch/arm/mach-imx/mxc.h	modified	+7	−17	View file
arch/arm/mach-imx/pm-imx5.c	modified	+197	−8	View file
arch/arm/mach-imx/pm-imx6.c	modified	+25	−13	View file
arch/arm/mach-imx/suspend-imx53.S	added	+139	−0	View file
arch/arm/mach-imx/time.c	deleted	+0	−385	View before deletion
arch/arm/mach-lpc18xx/Makefile	added	+1	−0	View file
arch/arm/mach-lpc18xx/Makefile.boot	added	+3	−0	View file
arch/arm/mach-lpc18xx/board-dt.c	added	+22	−0	View file
arch/arm/mach-omap1/ams-delta-fiq-handler.S	modified	+1	−2	View file
arch/arm/mach-omap1/board-ams-delta.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-fsample.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-generic.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-h2.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-h3-mmc.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-h3.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-htcherald.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-innovator.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-nokia770.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-osk.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-palmte.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-palmtt.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-palmz71.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-perseus2.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-sx1.c	modified	+1	−0	View file
arch/arm/mach-omap1/board-voiceblue.c	modified	+1	−0	View file
arch/arm/mach-omap1/common.h	modified	+5	−2	View file
arch/arm/mach-omap1/dma.c	modified	+1	−1	View file
arch/arm/mach-omap1/gpio16xx.c	modified	+2	−0	View file
arch/arm/mach-omap1/gpio7xx.c	modified	+2	−0	View file
arch/arm/mach-omap1/i2c.c	modified	+1	−2	View file
arch/arm/mach-omap1/include/mach/entry-macro.S	deleted	+0	−39	View before deletion
arch/arm/mach-omap1/include/mach/irqs.h	modified	+60	−64	View file
arch/arm/mach-omap1/include/mach/memory.h	modified	+3	−1	View file
arch/arm/mach-omap1/include/mach/serial.h	modified	+0	−5	View file
arch/arm/mach-omap1/include/mach/soc.h	modified	+4	−0	View file
arch/arm/mach-omap1/irq.c	modified	+94	−63	View file
arch/arm/mach-omap1/mux.c	modified	+4	−4	View file
arch/arm/mach-omap1/pm.c	modified	+1	−0	View file
arch/arm/mach-omap1/serial.c	modified	+1	−0	View file
arch/arm/mach-omap1/timer.c	modified	+2	−2	View file
arch/arm/mach-omap2/omap_device.c	modified	+17	−13	View file
arch/arm/mach-omap2/omap_hwmod.c	modified	+6	−4	View file
arch/arm/mach-omap2/omap_hwmod.h	modified	+6	−0	View file
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c	modified	+2	−10	View file
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h	modified	+1	−0	View file
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c	modified	+15	−1	View file
arch/arm/mach-omap2/omap_hwmod_33xx_data.c	modified	+0	−13	View file
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	modified	+96	−23	View file
arch/arm/mach-omap2/omap_hwmod_43xx_data.c	modified	+22	−0	View file
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	modified	+2	−9	View file
arch/arm/mach-omap2/omap_hwmod_7xx_data.c	modified	+2	−2	View file
arch/arm/mach-omap2/omap_hwmod_81xx_data.c	modified	+2	−0	View file
arch/arm/mach-omap2/prcm43xx.h	modified	+2	−0	View file
arch/arm/mach-pxa/Makefile	modified	+4	−5	View file
arch/arm/mach-pxa/clock-pxa2xx.c	deleted	+0	−55	View before deletion
arch/arm/mach-pxa/clock-pxa3xx.c	deleted	+0	−212	View before deletion
arch/arm/mach-pxa/clock.c	deleted	+0	−86	View before deletion
arch/arm/mach-pxa/clock.h	deleted	+0	−80	View before deletion
arch/arm/mach-pxa/eseries.c	modified	+6	−21	View file
arch/arm/mach-pxa/generic.c	modified	+6	−0	View file
arch/arm/mach-pxa/generic.h	modified	+3	−0	View file
arch/arm/mach-pxa/irq.c	modified	+1	−1	View file
arch/arm/mach-pxa/lubbock.c	modified	+3	−1	View file
arch/arm/mach-pxa/pxa25x.c	modified	+0	−183	View file
arch/arm/mach-pxa/pxa27x.c	modified	+8	−174	View file
arch/arm/mach-pxa/pxa300.c	modified	+1	−19	View file
arch/arm/mach-pxa/pxa320.c	modified	+0	−10	View file
arch/arm/mach-pxa/pxa3xx.c	modified	+0	−59	View file
arch/arm/mach-pxa/raumfeld.c	modified	+0	−1	View file
arch/arm/mach-pxa/tosa.c	modified	+0	−1	View file
arch/arm/mach-shmobile/Kconfig	modified	+2	−2	View file
arch/arm/mach-socfpga/Kconfig	modified	+10	−1	View file
arch/arm/mach-socfpga/Makefile	modified	+1	−0	View file
arch/arm/mach-socfpga/core.h	modified	+7	−4	View file
arch/arm/mach-socfpga/headsmp.S	modified	+4	−1	View file
arch/arm/mach-socfpga/platsmp.c	modified	+39	−18	View file
arch/arm/mach-socfpga/pm.c	added	+149	−0	View file
arch/arm/mach-socfpga/self-refresh.S	added	+136	−0	View file
arch/arm/mach-socfpga/socfpga.c	modified	+5	−36	View file
arch/arm/mach-stm32/Makefile	added	+1	−0	View file
arch/arm/mach-stm32/Makefile.boot	added	+3	−0	View file
arch/arm/mach-stm32/board-dt.c	added	+19	−0	View file
arch/arm/mach-sunxi/platsmp.c	modified	+69	−0	View file
arch/arm/mach-tegra/cpuidle-tegra20.c	modified	+2	−3	View file
arch/arm/mach-tegra/reset-handler.S	modified	+7	−3	View file
arch/arm/mach-tegra/reset.h	modified	+4	−0	View file
arch/arm/mach-tegra/sleep-tegra20.S	modified	+21	−16	View file
arch/arm/mach-tegra/sleep.h	modified	+4	−0	View file
arch/arm/mach-tegra/tegra.c	modified	+0	−1	View file
arch/arm/mach-uniphier/Kconfig	added	+11	−0	View file
arch/arm/mach-uniphier/Makefile	added	+2	−0	View file
arch/arm/mach-uniphier/platsmp.c	added	+90	−0	View file
arch/arm/mach-uniphier/uniphier.c	added	+30	−0	View file
arch/arm/mach-zx/Kconfig	added	+18	−0	View file
arch/arm/mach-zx/Makefile	added	+2	−0	View file
arch/arm/mach-zx/core.h	added	+19	−0	View file
arch/arm/mach-zx/headsmp.S	added	+33	−0	View file
arch/arm/mach-zx/platsmp.c	added	+189	−0	View file
arch/arm/mach-zx/zx296702.c	added	+25	−0	View file
arch/arm/mach-zynq/common.c	modified	+0	−6	View file
arch/arm/mach-zynq/common.h	modified	+0	−1	View file
arch/arm/mach-zynq/slcr.c	modified	+19	−9	View file
arch/arm/plat-omap/dma.c	modified	+4	−0	View file
arch/arm/plat-samsung/adc.c	modified	+3	−3	View file
arch/arm/vfp/vfpmodule.c	modified	+13	−0	View file
arch/arm64/Kconfig	modified	+5	−0	View file
arch/arm64/configs/defconfig	modified	+1	−0	View file
drivers/bus/brcmstb_gisb.c	modified	+11	−2	View file
drivers/clk/Makefile	modified	+2	−0	View file
drivers/clk/imx/Makefile	added	+26	−0	View file
arch/arm/mach-imx/clk-busy.c → drivers/clk/imx/clk-busy.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-cpu.c → drivers/clk/imx/clk-cpu.c	renamed	+1	−0	View file
arch/arm/mach-imx/clk-fixup-div.c → drivers/clk/imx/clk-fixup-div.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-fixup-mux.c → drivers/clk/imx/clk-fixup-mux.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-gate-exclusive.c → drivers/clk/imx/clk-gate-exclusive.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-gate2.c → drivers/clk/imx/clk-gate2.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-imx1.c → drivers/clk/imx/clk-imx1.c	renamed	+11	−6	View file
arch/arm/mach-imx/clk-imx21.c → drivers/clk/imx/clk-imx21.c	renamed	+9	−5	View file
arch/arm/mach-imx/clk-imx25.c → drivers/clk/imx/clk-imx25.c	renamed	+2	−4	View file
arch/arm/mach-imx/clk-imx27.c → drivers/clk/imx/clk-imx27.c	renamed	+10	−5	View file
arch/arm/mach-imx/clk-imx31.c → drivers/clk/imx/clk-imx31.c	renamed	+26	−9	View file
arch/arm/mach-imx/clk-imx35.c → drivers/clk/imx/clk-imx35.c	renamed	+25	−11	View file
arch/arm/mach-imx/clk-imx51-imx53.c → drivers/clk/imx/clk-imx51-imx53.c	renamed	+1	−4	View file
arch/arm/mach-imx/clk-imx6q.c → drivers/clk/imx/clk-imx6q.c	renamed	+20	−16	View file
arch/arm/mach-imx/clk-imx6sl.c → drivers/clk/imx/clk-imx6sl.c	renamed	+0	−7	View file
arch/arm/mach-imx/clk-imx6sx.c → drivers/clk/imx/clk-imx6sx.c	renamed	+0	−6	View file
drivers/clk/imx/clk-imx7d.c	added	+860	−0	View file
arch/arm/mach-imx/clk-pfd.c → drivers/clk/imx/clk-pfd.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-pllv1.c → drivers/clk/imx/clk-pllv1.c	renamed	+24	−9	View file
arch/arm/mach-imx/clk-pllv2.c → drivers/clk/imx/clk-pllv2.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk-pllv3.c → drivers/clk/imx/clk-pllv3.c	renamed	+10	−3	View file
arch/arm/mach-imx/clk-vf610.c → drivers/clk/imx/clk-vf610.c	renamed	+4	−0	View file
arch/arm/mach-imx/clk.c → drivers/clk/imx/clk.c	renamed	+0	−0	View file
arch/arm/mach-imx/clk.h → drivers/clk/imx/clk.h	renamed	+12	−2	View file
drivers/clk/pxa/clk-pxa27x.c	modified	+30	−2	View file
drivers/clk/zte/Makefile	added	+2	−0	View file
drivers/clk/zte/clk-pll.c	added	+172	−0	View file
drivers/clk/zte/clk-zx296702.c	added	+657	−0	View file
drivers/clk/zte/clk.h	added	+32	−0	View file
drivers/clocksource/Kconfig	modified	+5	−0	View file
drivers/clocksource/Makefile	modified	+1	−0	View file
drivers/clocksource/timer-imx-gpt.c	added	+540	−0	View file
drivers/memory/Kconfig	modified	+8	−0	View file
drivers/memory/omap-gpmc.c	modified	+3	−3	View file
drivers/soc/tegra/fuse/fuse-tegra20.c	modified	+4	−2	View file
drivers/soc/tegra/pmc.c	modified	+17	−6	View file
drivers/watchdog/bcm2835_wdt.c	modified	+62	−0	View file
include/dt-bindings/clock/imx7d-clock.h	added	+450	−0	View file
include/dt-bindings/clock/vf610-clock.h	modified	+2	−1	View file
include/dt-bindings/clock/zx296702-clock.h	added	+170	−0	View file
include/linux/reset/bcm63xx_pmb.h	added	+88	−0	View file
include/soc/imx/revision.h	added	+37	−0	View file
include/soc/imx/timer.h	added	+26	−0	View file
include/soc/tegra/pmc.h	modified	+0	−2	View file
include/uapi/linux/serial_reg.h	modified	+3	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/stm32/overview.txt

View file

diff --git a/Documentation/arm/stm32/overview.txt b/Documentation/arm/stm32/overview.txt
new file mode 100644
index 0000000..09aed55
--- /dev/null
+++ b/Documentation/arm/stm32/overview.txt
@@ -0,0 +1,32 @@
+			STM32 ARM Linux Overview
+			========================
+
+Introduction
+------------
+
+  The STMicroelectronics family of Cortex-M based MCUs are supported by the
+  'STM32' platform of ARM Linux. Currently only the STM32F429 is supported.
+
+
+Configuration
+-------------
+
+  A generic configuration is provided for STM32 family, and can be used as the
+  default by
+	make stm32_defconfig
+
+Layout
+------
+
+  All the files for multiple machine families are located in the platform code
+  contained in arch/arm/mach-stm32
+
+  There is a generic board board-dt.c in the mach folder which support
+  Flattened Device Tree, which means, it works with any compatible board with
+  Device Trees.
+
+
+Document Author
+---------------
+
+  Maxime Coquelin <[email protected]>

Documentation/arm/stm32/stm32f429-overview.txt

View file

diff --git a/Documentation/arm/stm32/stm32f429-overview.txt b/Documentation/arm/stm32/stm32f429-overview.txt
new file mode 100644
index 0000000..5206822
--- /dev/null
+++ b/Documentation/arm/stm32/stm32f429-overview.txt
@@ -0,0 +1,22 @@
+			STM32F429 Overview
+			==================
+
+  Introduction
+  ------------
+	The STM32F429 is a Cortex-M4 MCU aimed at various applications.
+	It features:
+	- ARM Cortex-M4 up to 180MHz with FPU
+	- 2MB internal Flash Memory
+	- External memory support through FMC controller (PSRAM, SDRAM, NOR, NAND)
+	- I2C, SPI, SAI, CAN, USB OTG, Ethernet controllers
+	- LCD controller & Camera interface
+	- Cryptographic processor
+
+  Resources
+  ---------
+	Datasheet and reference manual are publicly available on ST website:
+	- http://www.st.com/web/en/catalog/mmc/FM141/SC1169/SS1577/LN1806?ecmp=stm32f429-439_pron_pr-ces2014_nov2013
+
+  Document Author
+  ---------------
+	Maxime Coquelin <[email protected]>

Documentation/devicetree/bindings/arm/cpus.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 6aa331d..d6b794c 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -188,6 +188,7 @@ nodes to be present and contain the properties described below.
 			# On ARM 32-bit systems this property is optional and
 			  can be one of:
 			    "allwinner,sun6i-a31"
+			    "allwinner,sun8i-a23"
 			    "arm,psci"
 			    "brcm,brahma-b15"
 			    "marvell,armada-375-smp"

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
index 5da38c5..e151057 100644
--- a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@ -19,9 +19,10 @@ Optional Properties:
 	domains.
 - clock-names: The following clocks can be specified:
 	- oscclk: Oscillator clock.
-	- pclkN, clkN: Pairs of parent of input clock and input clock to the
-		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
-		are supported currently.
+	- clkN: Input clocks to the devices in this power domain. These clocks
+		will be reparented to oscclk before swithing power domain off.
+		Their original parent will be brought back after turning on
+		the domain. Maximum of 4 clocks (N = 0 to 3) are supported.
 	- asbN: Clocks required by asynchronous bridges (ASB) present in
 		the power domain. These clock should be enabled during power
 		domain on/off operations.

Documentation/devicetree/bindings/arm/fsl.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index a5462b6..2a3ba73 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -81,12 +81,15 @@ Freescale Vybrid Platform Device Tree Bindings
 For the Vybrid SoC familiy all variants with DDR controller are supported,
 which is the VF5xx and VF6xx series. Out of historical reasons, in most
 places the kernel uses vf610 to refer to the whole familiy.
+The compatible string "fsl,vf610m4" is used for the secondary Cortex-M4
+core support.
 
 Required root node compatible property (one of them):
     - compatible = "fsl,vf500";
     - compatible = "fsl,vf510";
     - compatible = "fsl,vf600";
     - compatible = "fsl,vf610";
+    - compatible = "fsl,vf610m4";
 
 Freescale LS1021A Platform Device Tree Bindings
 ------------------------------------------------

Documentation/devicetree/bindings/arm/zte.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/zte.txt b/Documentation/devicetree/bindings/arm/zte.txt
new file mode 100644
index 0000000..3ff5c9e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/zte.txt
@@ -0,0 +1,15 @@
+ZTE platforms device tree bindings
+---------------------------------------
+
+-  ZX296702 board:
+    Required root node properties:
+      - compatible = "zte,zx296702-ad1", "zte,zx296702"
+
+System management required properties:
+      - compatible = "zte,sysctrl"
+
+Low power management required properties:
+      - compatible = "zte,zx296702-pcu"
+
+Bus matrix required properties:
+      - compatible = "zte,zx-bus-matrix"

Documentation/devicetree/bindings/clock/zx296702-clk.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/zx296702-clk.txt b/Documentation/devicetree/bindings/clock/zx296702-clk.txt
new file mode 100644
index 0000000..750442b
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/zx296702-clk.txt
@@ -0,0 +1,35 @@
+Device Tree Clock bindings for ZTE zx296702
+
+This binding uses the common clock binding[1].
+
+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
+
+Required properties:
+- compatible : shall be one of the following:
+	"zte,zx296702-topcrm-clk":
+		zx296702 top clock selection, divider and gating
+
+	"zte,zx296702-lsp0crpm-clk" and
+	"zte,zx296702-lsp1crpm-clk":
+		zx296702 device level clock selection and gating
+
+- reg: Address and length of the register set
+
+The clock consumer should specify the desired clock by having the clock
+ID in its "clocks" phandle cell. See include/dt-bindings/clock/zx296702-clock.h
+for the full list of zx296702 clock IDs.
+
+
+topclk: topcrm@0x09800000 {
+        compatible = "zte,zx296702-topcrm-clk";
+        reg = <0x09800000 0x1000>;
+        #clock-cells = <1>;
+};
+
+uart0: serial@0x09405000 {
+        compatible = "zte,zx296702-uart";
+        reg = <0x09405000 0x1000>;
+        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&lsp1clk ZX296702_UART0_PCLK>;
+        status = "disabled";
+};

Documentation/devicetree/bindings/serial/pl011.txt

View file

diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt
index ba3ecb8..cbae3d9 100644
--- a/Documentation/devicetree/bindings/serial/pl011.txt
+++ b/Documentation/devicetree/bindings/serial/pl011.txt
@@ -1,7 +1,7 @@
 * ARM AMBA Primecell PL011 serial UART
 
 Required properties:
-- compatible: must be "arm,primecell", "arm,pl011"
+- compatible: must be "arm,primecell", "arm,pl011", "zte,zx296702-uart"
 - reg: exactly one register range with length 0x1000
 - interrupts: exactly one interrupt specifier
 

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 7d91d12..a37ad99 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -214,3 +214,4 @@ xillybus	Xillybus Ltd.
 xlnx	Xilinx
 zyxel	ZyXEL Communications Corp.
 zarlink	Zarlink Semiconductor
+zte	ZTE Corp.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f2956c..eaa1312 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1043,7 +1043,7 @@ F:	arch/arm/include/asm/hardware/dec21285.h
 F:	arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-M:	Shawn Guo <[email protected]>
+M:	Shawn Guo <[email protected]>
 M:	Sascha Hauer <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
@@ -1052,9 +1052,11 @@ F:	arch/arm/mach-imx/
 F:	arch/arm/mach-mxs/
 F:	arch/arm/boot/dts/imx*
 F:	arch/arm/configs/imx*_defconfig
+F:	drivers/clk/imx/
+F:	include/soc/imx/
 
 ARM/FREESCALE VYBRID ARM ARCHITECTURE
-M:	Shawn Guo <[email protected]>
+M:	Shawn Guo <[email protected]>
 M:	Sascha Hauer <[email protected]>
 R:	Stefan Agner <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -1197,6 +1199,12 @@ M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 
+ARM/LPC18XX ARCHITECTURE
+M:	Joachim Eastwood <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+N:	lpc18xx
+
 ARM/MAGICIAN MACHINE SUPPORT
 M:	Philipp Zabel <[email protected]>
 S:	Maintained
@@ -1400,6 +1408,7 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/boot/dts/s3c*
 F:	arch/arm/boot/dts/exynos*
+F:	arch/arm64/boot/dts/exynos/
 F:	arch/arm/plat-samsung/
 F:	arch/arm/mach-s3c24*/
 F:	arch/arm/mach-s3c64xx/
@@ -1511,6 +1520,14 @@ F:	drivers/usb/host/ohci-st.c
 F:	drivers/watchdog/st_lpc_wdt.c
 F:	drivers/ata/ahci_st.c
 
+ARM/STM32 ARCHITECTURE
+M:	Maxime Coquelin <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
+N:	stm32
+F:	drivers/clocksource/armv7m_systick.c
+
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -1557,6 +1574,13 @@ F:	drivers/rtc/rtc-ab3100.c
 F:	drivers/rtc/rtc-coh901331.c
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
+ARM/UNIPHIER ARCHITECTURE
+M:	Masahiro Yamada <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	arch/arm/mach-uniphier/
+N:	uniphier
+
 ARM/Ux500 ARM ARCHITECTURE
 M:	Linus Walleij <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -1634,6 +1658,15 @@ S:	Maintained
 F:	arch/arm/mach-pxa/z2.c
 F:	arch/arm/mach-pxa/include/mach/z2.h
 
+ARM/ZTE ARCHITECTURE
+M:	Jun Nie <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	arch/arm/mach-zx/
+F:	drivers/clk/zte/
+F:	Documentation/devicetree/bindings/arm/zte.txt
+F:	Documentation/devicetree/bindings/clock/zx296702-clk.txt
+
 ARM/ZYNQ ARCHITECTURE
 M:	Michal Simek <[email protected]>
 R:	Sören Brinkmann <[email protected]>
@@ -2228,6 +2261,7 @@ S:	Maintained
 F:	arch/arm/mach-bcm/*brcmstb*
 F:	arch/arm/boot/dts/bcm7*.dts*
 F:	drivers/bus/brcmstb_gisb.c
+N:	brcmstb
 
 BROADCOM BMIPS MIPS ARCHITECTURE
 M:	Kevin Cernekee <[email protected]>

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 325d6f3..cf292d3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -331,6 +331,20 @@ config ARCH_MULTIPLATFORM
 	select SPARSE_IRQ
 	select USE_OF
 
+config ARM_SINGLE_ARMV7M
+	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
+	depends on !MMU
+	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select ARM_NVIC
+	select AUTO_ZRELADDR
+	select CLKSRC_OF
+	select COMMON_CLK
+	select CPU_V7M
+	select GENERIC_CLOCKEVENTS
+	select NO_IOPORT_MAP
+	select SPARSE_IRQ
+	select USE_OF
+
 config ARCH_REALVIEW
 	bool "ARM Ltd. RealView family"
 	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -400,24 +414,6 @@ config ARCH_EBSA110
 	  Ethernet interface, two PCMCIA sockets, two serial ports and a
 	  parallel port.
 
-config ARCH_EFM32
-	bool "Energy Micro efm32"
-	depends on !MMU
-	select ARCH_REQUIRE_GPIOLIB
-	select ARM_NVIC
-	select AUTO_ZRELADDR
-	select CLKSRC_OF
-	select COMMON_CLK
-	select CPU_V7M
-	select GENERIC_CLOCKEVENTS
-	select NO_DMA
-	select NO_IOPORT_MAP
-	select SPARSE_IRQ
-	select USE_OF
-	help
-	  Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
-	  processors.
-
 config ARCH_EP93XX
 	bool "EP93xx-based"
 	select ARCH_HAS_HOLES_MEMORYMODEL
@@ -608,6 +604,7 @@ config ARCH_PXA
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_CPU_SUSPEND if PM
 	select AUTO_ZRELADDR
+	select COMMON_CLK
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_OF
@@ -754,8 +751,10 @@ config ARCH_OMAP1
 	select GENERIC_IRQ_CHIP
 	select HAVE_IDE
 	select IRQ_DOMAIN
+	select MULTI_IRQ_HANDLER
 	select NEED_MACH_IO_H if PCCARD
 	select NEED_MACH_MEMORY_H
+	select SPARSE_IRQ
 	help
 	  Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
 
@@ -939,6 +938,8 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"
 
+source "arch/arm/mach-uniphier/Kconfig"
+
 source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
@@ -950,8 +951,40 @@ source "arch/arm/mach-vt8500/Kconfig"
 
 source "arch/arm/mach-w90x900/Kconfig"
 
+source "arch/arm/mach-zx/Kconfig"
+
 source "arch/arm/mach-zynq/Kconfig"
 
+# ARMv7-M architecture
+config ARCH_EFM32
+	bool "Energy Micro efm32"
+	depends on ARM_SINGLE_ARMV7M
+	select ARCH_REQUIRE_GPIOLIB
+	help
+	  Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
+	  processors.
+
+config ARCH_LPC18XX
+	bool "NXP LPC18xx/LPC43xx"
+	depends on ARM_SINGLE_ARMV7M
+	select ARCH_HAS_RESET_CONTROLLER
+	select ARM_AMBA
+	select CLKSRC_LPC32XX
+	select PINCTRL
+	help
+	  Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4
+	  high performance microcontrollers.
+
+config ARCH_STM32
+	bool "STMicrolectronics STM32"
+	depends on ARM_SINGLE_ARMV7M
+	select ARCH_HAS_RESET_CONTROLLER
+	select ARMV7M_SYSTICK
+	select CLKSRC_STM32
+	select RESET_CONTROLLER
+	help
+	  Support for STMicroelectronics STM32 processors.
+
 # Definitions to make life easier
 config ARCH_ACORN
 	bool
@@ -1479,7 +1512,8 @@ config ARM_PSCI
 # selected platforms.
 config ARCH_NR_GPIO
 	int
-	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA || ARCH_ZYNQ
+	default 1024 if ARCH_BRCMSTB || ARCH_SHMOBILE || ARCH_TEGRA || \
+		ARCH_ZYNQ
 	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \
 		SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
 	default 416 if ARCH_SUNXI

arch/arm/Kconfig.debug

View file

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 0c12ffb..a6b5d0e 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -410,6 +410,13 @@ choice
 		  Say Y here if you want kernel low-level debugging support
 		  on i.MX6SX.
 
+	config DEBUG_IMX7D_UART
+		bool "i.MX7D Debug UART"
+		depends on SOC_IMX7D
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on i.MX7D.
+
 	config DEBUG_KEYSTONE_UART0
 		bool "Kernel low-level debugging on KEYSTONE2 using UART0"
 		depends on ARCH_KEYSTONE
@@ -433,6 +440,14 @@ choice
 		  Say Y here if you want kernel low-level debugging support
 		  on KS8695.
 
+	config DEBUG_LPC18XX_UART0
+		bool "Kernel low-level debugging via LPC18xx/43xx UART0"
+		depends on ARCH_LPC18XX
+		select DEBUG_UART_8250
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on NXP LPC18xx/43xx UART0.
+
 	config DEBUG_MESON_UARTAO
 		bool "Kernel low-level debugging via Meson6 UARTAO"
 		depends on ARCH_MESON
@@ -908,13 +923,22 @@ choice
 		  on SA-11x0 UART ports. The kernel will check for the first
 		  enabled UART in a sequence 3-1-2.
 
-	config DEBUG_SOCFPGA_UART
+	config DEBUG_SOCFPGA_UART0
+		depends on ARCH_SOCFPGA
+		bool "Use SOCFPGA UART0 for low-level debug"
+		select DEBUG_UART_8250
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.
+
+	config DEBUG_SOCFPGA_UART1
 		depends on ARCH_SOCFPGA
-		bool "Use SOCFPGA UART for low-level debug"
+		bool "Use SOCFPGA UART1 for low-level debug"
 		select DEBUG_UART_8250
 		help
 		  Say Y here if you want kernel low-level debugging support
-		  on SOCFPGA based platforms.
+		  on SOCFPGA(Arria 10) based platforms.
+
 
 	config DEBUG_SUN9I_UART0
 		bool "Kernel low-level debugging messages via sun9i UART0"
@@ -1157,6 +1181,18 @@ choice
 		  For more details about semihosting, please see
 		  chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
 
+	config DEBUG_ZTE_ZX
+		bool "Use ZTE ZX UART"
+		select DEBUG_UART_PL01X
+		depends on ARCH_ZX
+		help
+		  Say Y here if you are enabling ZTE ZX296702 SOC and need
+		  debug uart support.
+
+		  This option is preferred over the platform specific
+		  options; the platform specific options are deprecated
+		  and will be soon removed.
+
 	config DEBUG_LL_UART_8250
 		bool "Kernel low-level debugging via 8250 UART"
 		help
@@ -1231,7 +1267,8 @@ config DEBUG_IMX_UART_PORT
 						DEBUG_IMX53_UART || \
 						DEBUG_IMX6Q_UART || \
 						DEBUG_IMX6SL_UART || \
-						DEBUG_IMX6SX_UART
+						DEBUG_IMX6SX_UART || \
+						DEBUG_IMX7D_UART
 	default 1
 	depends on ARCH_MXC
 	help
@@ -1281,7 +1318,8 @@ config DEBUG_LL_INCLUDE
 				 DEBUG_IMX53_UART ||\
 				 DEBUG_IMX6Q_UART || \
 				 DEBUG_IMX6SL_UART || \
-				 DEBUG_IMX6SX_UART
+				 DEBUG_IMX6SX_UART || \
+				 DEBUG_IMX7D_UART
 	default "debug/ks8695.S" if DEBUG_KS8695_UART
 	default "debug/msm.S" if DEBUG_QCOM_UARTDM
 	default "debug/netx.S" if DEBUG_NETX_UART
@@ -1337,6 +1375,7 @@ config DEBUG_UART_PHYS
 	default 0x02531000 if DEBUG_KEYSTONE_UART1
 	default 0x03010fe0 if ARCH_RPC
 	default 0x07000000 if DEBUG_SUN9I_UART0
+	default 0x09405000 if DEBUG_ZTE_ZX
 	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
 				DEBUG_VEXPRESS_UART0_CA9
 	default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
@@ -1359,6 +1398,7 @@ config DEBUG_UART_PHYS
 	default 0x20201000 if DEBUG_BCM2835
 	default 0x3e000000 if DEBUG_BCM_KONA_UART
 	default 0x4000e400 if DEBUG_LL_UART_EFM32
+	default 0x40081000 if DEBUG_LPC18XX_UART0
 	default 0x40090000 if ARCH_LPC32XX
 	default 0x40100000 if DEBUG_PXA_UART1
 	default 0x42000000 if ARCH_GEMINI
@@ -1407,7 +1447,8 @@ config DEBUG_UART_PHYS
 	default 0xfd883000 if DEBUG_ALPINE_UART0
 	default 0xfe800000 if ARCH_IOP32X
 	default 0xff690000 if DEBUG_RK32_UART2
-	default 0xffc02000 if DEBUG_SOCFPGA_UART
+	default 0xffc02000 if DEBUG_SOCFPGA_UART0
+	default 0xffc02100 if DEBUG_SOCFPGA_UART1
 	default 0xffd82340 if ARCH_IOP13XX
 	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0
 	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
@@ -1466,6 +1507,7 @@ config DEBUG_UART_VIRT
 	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
 	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
 	default 0xfc40ab00 if DEBUG_BRCMSTB_UART
+	default 0xfc705000 if DEBUG_ZTE_ZX
 	default 0xfcfe8600 if DEBUG_UART_BCM63XX
 	default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
 	default 0xfd000000 if ARCH_SPEAR13XX
@@ -1485,7 +1527,8 @@ config DEBUG_UART_VIRT
 	default 0xfeb26000 if DEBUG_RK3X_UART1
 	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
 	default 0xfeb31000 if DEBUG_KEYSTONE_UART1
-	default 0xfec02000 if DEBUG_SOCFPGA_UART
+	default 0xfec02000 if DEBUG_SOCFPGA_UART0
+	default 0xfec02100 if DEBUG_SOCFPGA_UART1
 	default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE
 	default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE
 	default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
@@ -1530,8 +1573,9 @@ config DEBUG_UART_8250_WORD
 	bool "Use 32-bit accesses for 8250 UART"
 	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 	depends on DEBUG_UART_8250_SHIFT >= 2
-	default y if DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \
-		ARCH_KEYSTONE || DEBUG_ALPINE_UART0 || \
+	default y if DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART0 || \
+		DEBUG_SOCFPGA_UART1 || ARCH_KEYSTONE || \
+		DEBUG_ALPINE_UART0 || \
 		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
 		DEBUG_DAVINCI_DA8XX_UART2 || \
 		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \
@@ -1544,7 +1588,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
 
 config DEBUG_UNCOMPRESS
 	bool
-	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG
+	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
 	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
 		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
 	help
@@ -1561,7 +1605,7 @@ config DEBUG_UNCOMPRESS
 config UNCOMPRESS_INCLUDE
 	string
 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
-					PLAT_SAMSUNG || ARCH_EFM32 || \
+					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
 					ARCH_SHMOBILE_LEGACY
 	default "mach/uncompress.h"