Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1172495 > unrolled thread

[GIT PULL 0/5] ARM: SoC changes for v4.2

Started byKevin Hilman <khilman@kernel.org>
First post2015-06-26 00:40 +0200
Last post2015-06-26 00:40 +0200
Articles 5 — 1 participant

Back to article view | Back to linux.kernel


Contents

  [GIT PULL 0/5] ARM: SoC changes for v4.2 Kevin Hilman <khilman@kernel.org> - 2015-06-26 00:40 +0200
    [GIT PULL 1/5] ARM: SoC: cleanups for v4.2 Kevin Hilman <khilman@kernel.org> - 2015-06-26 00:40 +0200
    [GIT PULL 2/5] ARM: SoC: platform support for v4.2 Kevin Hilman <khilman@kernel.org> - 2015-06-26 00:40 +0200
    [GIT PULL 5/5] ARM: SoC: defconfig updates for v4.2 Kevin Hilman <khilman@kernel.org> - 2015-06-26 00:40 +0200
    [GIT PULL 4/5] ARM: SoC: driver updates for v4.2 Kevin Hilman <khilman@kernel.org> - 2015-06-26 00:40 +0200

#1172495 — [GIT PULL 0/5] ARM: SoC changes for v4.2

FromKevin Hilman <khilman@kernel.org>
Date2015-06-26 00:40 +0200
Subject[GIT PULL 0/5] ARM: SoC changes for v4.2
Message-ID<pFnYl-5mM-1@gated-at.bofh.it>
Hi Linus,

As is usual of late, most of the changes are in DT contents for
various platforms, including support for new SoCs and new boards.  The
rest is spread out a bit, with more descriptions in each pull request.

No major conflicts this time, the couple simple ones that show up are
covered in each pull request.

Please merge,

Kevin (on behalf of arm-soc team: Olof, Arnd, myself)


Dirstat 
$ git diff --dirstat=0.2 v4.1..for-next
   0.8% Documentation/devicetree/bindings/arm/
   0.2% Documentation/devicetree/bindings/clock/
   0.7% Documentation/devicetree/bindings/memory-controllers/
   0.5% Documentation/devicetree/bindings/
  59.1% arch/arm/boot/dts/
   0.8% arch/arm/configs/
   0.5% arch/arm/mach-at91/include/mach/
   0.3% arch/arm/mach-at91/
   0.8% arch/arm/mach-bcm/
   0.3% arch/arm/mach-exynos/
   2.3% arch/arm/mach-imx/
   0.3% arch/arm/mach-omap1/include/mach/
   0.3% arch/arm/mach-omap1/
   3.5% arch/arm/mach-omap2/
   1.5% arch/arm/mach-pxa/
   0.6% arch/arm/mach-socfpga/
   0.2% arch/arm/mach-uniphier/
   0.2% arch/arm/mach-ux500/
   0.3% arch/arm/mach-zx/
   1.6% arch/arm/
   0.7% arch/arm64/boot/dts/arm/
   0.2% arch/arm64/boot/dts/hisilicon/
   0.2% arch/arm64/boot/dts/qcom/
   0.3% arch/sparc/kernel/
   0.4% arch/x86/kernel/cpu/
   0.2% arch/x86/
   0.4% arch/
   2.3% drivers/bus/
   4.0% drivers/clk/imx/
   1.4% drivers/clk/zte/
   0.8% drivers/clocksource/
   0.4% drivers/dma/
   1.6% drivers/firmware/
   0.2% drivers/leds/
   2.4% drivers/memory/tegra/
   0.3% drivers/net/ethernet/emulex/benet/
   0.4% drivers/net/ethernet/
   0.5% drivers/soc/qcom/
   0.3% drivers/soc/sunxi/
   0.3% drivers/staging/rtl8712/
   0.2% drivers/tty/
   0.2% drivers/usb/
   1.9% drivers/
   1.2% include/dt-bindings/clock/
   0.2% include/linux/mfd/syscon/
   0.2% include/linux/
   0.3% include/soc/
   0.3% net/
   0.2% sound/pci/hda/

Top 20 contributors by patch count (no merges)
$ git log --format=%an --no-merges v4.1..for-next  | sort | uniq -c  |sort -nr | head -n 20
     50 Krzysztof Kozlowski
     46 Maxime Ripard
     38 Geert Uytterhoeven
     30 Linus Walleij
     28 Shawn Guo
     27 Antoine Tenart
     25 Alexandre Belloni
     23 Chen-Yu Tsai
     19 Hans de Goede
     18 Lee Jones
     17 Arnd Bergmann
     15 Tony Lindgren
     15 Dinh Nguyen
     13 Stefan Agner
     13 Fabio Estevam
     12 Robert Jarzmik
     12 Gaël PORTAY
     12 Florian Fainelli
     11 Thierry Reding
     10 Heiko Stuebner
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1172499 — [GIT PULL 1/5] ARM: SoC: cleanups for v4.2

FromKevin Hilman <khilman@kernel.org>
Date2015-06-26 00:40 +0200
Subject[GIT PULL 1/5] ARM: SoC: cleanups for v4.2
Message-ID<pFnYm-5mM-15@gated-at.bofh.it>
In reply to#1172495
A relatively small setup of cleanups this time around, and similar to last time
the bulk of it is removal of legacy board support:

- OMAP: removal of legacy (non-DT) booting for several platforms
- i.MX: remove some legacy board files

Conflicts: None

----------------------------------------------------------------

The following changes since commit b953c0d234bc72e8489d3bf51a276c5c4ec85345:

  Linux 4.1

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-cleanup

for you to fetch changes up to e75ea4569d6d1d10935d74ff80bad52dc09bd062:

  Merge branch 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm into next/cleanup

----------------------------------------------------------------

Alexander Kuleshov (1):
      ARM: OMAP2+: use symbolic defines for console loglevels instead of numbers

Alexandre Belloni (8):
      ata: at91: use syscon to configure the smc
      ARM: at91: drop sam9_smc.c
      ARM: at91: declare the at91rm9200 memory controller as a syscon
      pcmcia: at91_cf: Use syscon to configure the MC/smc
      ARM: at91/pm: use the atmel-mc syscon defines
      ARM: at91: remove mach/at91_ramc.h and mach/at91rm9200_mc.h
      ARM: at91: remove at91rm9200_sdramc.h
      ARM: at91: remove useless Makefile.boot

Arnd Bergmann (6):
      Merge tag 'tegra-for-4.2-cleanup' of git://git.kernel.org/.../tegra/linux into next/cleanup
      Merge tag 'ux500-cleanup-v4.2' of git://git.kernel.org/.../linusw/linux-stericsson into next/cleanup
      Merge tag 'omap-for-v4.2/clean' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
      Merge tag 'at91-cleanup' of git://git.kernel.org/.../abelloni/linux into next/cleanup
      Merge branch 'for-arm-soc' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next/cleanup
      Merge tag 'imx-cleanup-4.2' of git://git.kernel.org/.../shawnguo/linux into next/cleanup

Boris Brezillon (1):
      mfd: syscon: Add Atmel MC (Memory Controller) registers definition

Fabio Estevam (2):
      ARM: imx: Remove eukrea_mbimxsd35 non-dt support
      ARM: imx: gpc: Remove .owner field

Kevin Hilman (1):
      Merge branch 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm into next/cleanup

Krzysztof Kozlowski (1):
      ARM: OMAP2+: Constify irq_domain_ops

Linus Walleij (11):
      ARM: ux500: get rid of static maps
      ARM: ux500: delete UART static map
      ARM: ux500: remove static maps from platsmp
      ARM: ux500: remap BB offset dynamically
      ARM: ux500: get SCU base from device tree
      ARM: ux500: get rid of static GIC dist base
      ARM: ux500: get rid of SCU and backupram static maps
      ARM: ux500: kill off L2CC static map
      ARM: ux500: look up PRCMU resource from DT
      ARM: ux500: rename ux500_map_io
      ARM: ux500: delete static resource defines

Mark Rutland (1):
      arm64: dts: kill skeleton.dtsi

Nicholas Krause (2):
      ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
      mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c

Russell King (3):
      ARM: Show proper respect for Heinrich Hertz by using the correct unit for frequency
      ARM: v7 setup function should invalidate L1 cache
      ARM: fix EFM32 build breakage caused by cpu_resume_arm

Stephen Boyd (1):
      ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state

Thierry Reding (2):
      ARM: tegra: Use lower-case hexadecimal digits
      ARM: tegra: Fix typo (reset -> rest) in comment

Tony Lindgren (4):
      ARM: OMAP2+: Remove legacy booting support for cm-t35
      ARM: OMAP2+: Remove legacy booting support for Overo
      ARM: OMAP2+: Remove legacy booting support for Beagleboards
      Merge branch 'omap-for-v4.2/legacy' into omap-for-v4.2/cleanup


 .../devicetree/bindings/arm/atmel-at91.txt      |   2 +-
 .../bindings/fuse/nvidia,tegra20-fuse.txt       |   2 +-
 arch/arm/boot/dts/at91rm9200.dtsi               |   2 +-
 arch/arm/boot/dts/exynos5260-xyref5260.dts      |   2 +-
 arch/arm/boot/dts/omap3-cm-t3517.dts            |   2 +-
 arch/arm/boot/dts/tegra124.dtsi                 |   2 +-
 arch/arm/boot/dts/tegra20.dtsi                  |   2 +-
 arch/arm/include/asm/suspend.h                  |   1 +
 arch/arm/kernel/sleep.S                         |  14 +
 arch/arm/mach-at91/Makefile                     |   5 -
 arch/arm/mach-at91/Makefile.boot                |   8 -
 arch/arm/mach-at91/include/mach/at91_ramc.h     |  28 -
 arch/arm/mach-at91/include/mach/at91rm9200_mc.h | 116 ---
 arch/arm/mach-at91/include/mach/at91sam9_smc.h  |  98 ---
 arch/arm/mach-at91/pm.c                         |   8 +-
 arch/arm/mach-at91/pm.h                         |  14 +-
 arch/arm/mach-at91/pm_suspend.S                 |   3 +-
 arch/arm/mach-at91/sam9_smc.c                   | 136 ----
 arch/arm/mach-at91/sam9_smc.h                   |  11 -
 arch/arm/mach-bcm/Makefile                      |   2 +-
 arch/arm/mach-bcm/brcmstb.h                     |  19 -
 arch/arm/mach-bcm/headsmp-brcmstb.S             |  33 -
 arch/arm/mach-bcm/platsmp-brcmstb.c             |   4 +-
 arch/arm/mach-berlin/headsmp.S                  |   6 -
 arch/arm/mach-berlin/platsmp.c                  |   3 +-
 arch/arm/mach-davinci/include/mach/da8xx.h      |   2 +-
 arch/arm/mach-hisi/Makefile                     |   2 +-
 arch/arm/mach-hisi/core.h                       |   1 -
 arch/arm/mach-hisi/headsmp.S                    |  16 -
 arch/arm/mach-hisi/platsmp.c                    |   4 +-
 arch/arm/mach-imx/Kconfig                       |  34 -
 arch/arm/mach-imx/Makefile                      |   2 -
 arch/arm/mach-imx/clk-imx6sx.c                  |   4 +-
 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c  | 318 --------
 arch/arm/mach-imx/gpc.c                         |   1 -
 arch/arm/mach-imx/headsmp.S                     |   1 -
 arch/arm/mach-imx/mach-cpuimx35.c               | 206 -----
 arch/arm/mach-iop13xx/include/mach/time.h       |   2 +-
 arch/arm/mach-ixp4xx/include/mach/platform.h    |   2 +-
 arch/arm/mach-ks8695/include/mach/hardware.h    |   2 +-
 arch/arm/mach-mvebu/headsmp-a9.S                |   1 -
 arch/arm/mach-omap2/Kconfig                     |  22 -
 arch/arm/mach-omap2/Makefile                    |   3 -
 arch/arm/mach-omap2/board-cm-t35.c              | 769 -------------------
 arch/arm/mach-omap2/board-omap3beagle.c         | 595 --------------
 arch/arm/mach-omap2/board-overo.c               | 571 --------------
 arch/arm/mach-omap2/devices.c                   |   4 +-
 arch/arm/mach-omap2/fb.c                        |   2 +-
 arch/arm/mach-omap2/gpmc-onenand.c              |   4 +-
 arch/arm/mach-omap2/hsmmc.c                     |   2 +-
 arch/arm/mach-omap2/omap-wakeupgen.c            |   2 +-
 arch/arm/mach-omap2/opp2430_data.c              |   4 +-
 arch/arm/mach-omap2/pmu.c                       |   2 +-
 arch/arm/mach-omap2/sdrc2xxx.c                  |   2 +-
 arch/arm/mach-omap2/serial.c                    |   2 +-
 arch/arm/mach-omap2/sram242x.S                  |   2 +-
 arch/arm/mach-omap2/sram243x.S                  |   2 +-
 arch/arm/mach-prima2/headsmp.S                  |   1 -
 arch/arm/mach-pxa/mp900.c                       |   2 +-
 arch/arm/mach-rockchip/core.h                   |   1 -
 arch/arm/mach-rockchip/headsmp.S                |   8 -
 arch/arm/mach-rockchip/platsmp.c                |   5 +-
 arch/arm/mach-shmobile/common.h                 |   1 -
 arch/arm/mach-shmobile/headsmp-scu.S            |   4 +-
 arch/arm/mach-shmobile/headsmp.S                |   7 -
 arch/arm/mach-shmobile/platsmp-apmu.c           |   2 +-
 arch/arm/mach-socfpga/core.h                    |   1 -
 arch/arm/mach-socfpga/headsmp.S                 |   5 -
 arch/arm/mach-socfpga/platsmp.c                 |   2 +-
 arch/arm/mach-tegra/Makefile                    |   2 +-
 arch/arm/mach-tegra/headsmp.S                   |  12 -
 arch/arm/mach-tegra/reset.c                     |   2 +-
 arch/arm/mach-tegra/reset.h                     |   1 -
 arch/arm/mach-tegra/sleep-tegra30.S             |   2 +-
 arch/arm/mach-ux500/cache-l2x0.c                |  11 +-
 arch/arm/mach-ux500/cpu-db8500.c                |  60 +-
 arch/arm/mach-ux500/cpu.c                       |  20 +-
 arch/arm/mach-ux500/id.c                        |   2 +-
 arch/arm/mach-ux500/platsmp.c                   |  35 +-
 arch/arm/mach-ux500/pm.c                        |  15 +-
 arch/arm/mach-ux500/setup.h                     |  16 +-
 arch/arm/mach-zynq/common.h                     |   2 -
 arch/arm/mach-zynq/headsmp.S                    |   5 -
 arch/arm/mach-zynq/platsmp.c                    |   5 +-
 arch/arm/mm/proc-v7.S                           |   2 +-
 arch/arm64/boot/dts/skeleton.dtsi               |  13 -
 drivers/ata/Kconfig                             |   1 -
 drivers/ata/pata_at91.c                         |  92 ++-
 drivers/pcmcia/Kconfig                          |   1 -
 drivers/pcmcia/at91_cf.c                        |  25 +-
 include/linux/mfd/syscon/atmel-mc.h             | 144 ++++
 include/soc/at91/at91rm9200_sdramc.h            |  63 --
 92 files changed, 367 insertions(+), 3312 deletions(-)
 delete mode 100644 arch/arm/mach-at91/Makefile.boot
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_ramc.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_mc.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9_smc.h
 delete mode 100644 arch/arm/mach-at91/sam9_smc.c
 delete mode 100644 arch/arm/mach-at91/sam9_smc.h
 delete mode 100644 arch/arm/mach-bcm/brcmstb.h
 delete mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S
 delete mode 100644 arch/arm/mach-hisi/headsmp.S
 delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
 delete mode 100644 arch/arm/mach-imx/mach-cpuimx35.c
 delete mode 100644 arch/arm/mach-omap2/board-cm-t35.c
 delete mode 100644 arch/arm/mach-omap2/board-omap3beagle.c
 delete mode 100644 arch/arm/mach-omap2/board-overo.c
 delete mode 100644 arch/arm/mach-tegra/headsmp.S
 delete mode 100644 arch/arm64/boot/dts/skeleton.dtsi
 create mode 100644 include/linux/mfd/syscon/atmel-mc.h
 delete mode 100644 include/soc/at91/at91rm9200_sdramc.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1172500 — [GIT PULL 2/5] ARM: SoC: platform support for v4.2

FromKevin Hilman <khilman@kernel.org>
Date2015-06-26 00:40 +0200
Subject[GIT PULL 2/5] ARM: SoC: platform support for v4.2
Message-ID<pFnYm-5mM-17@gated-at.bofh.it>
In reply to#1172495
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

Conflicts:
	arch/arm/mach-socfpga/core.h

Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides

----------------------------------------------------------------

The following changes since commit 8d2977bf36bf6fc66d0c8e64263711cc2f0c1e4b:

  Merge tag 'armsoc-cleanup' into test-merge

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-soc

for you to fetch changes up to 2879e43f09122f8b3ef5456e3d7e48716b086e60:

  Merge tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

----------------------------------------------------------------

Alan Tull (1):
      ARM: socfpga: support suspend to ram

Anson Huang (3):
      ARM: imx: using unsigned variable for do_div
      ARM: imx7d: add low level debug uart support
      ARM: imx: add msl support for imx7d

Arnd Bergmann (17):
      Merge tag 'sunxi-core-for-4.2' of https://git.kernel.org/.../mripard/linux into next/soc
      Merge tag 'socfpga_updates_for_v4.2' of git://git.kernel.org/.../dinguyen/linux into next/soc
      Merge tag 'tegra-for-4.2-soc' of git://git.kernel.org/.../tegra/linux into next/soc
      Merge tag 'rpi-soc-for-armsoc-v4.2' of git://git.kernel.org/.../rpi/linux-rpi into next/soc
      Merge tag 'pxa-for-4.2' of https://github.com/rjarzmik/linux into next/soc
      ARM: uniphier: only select TWD for SMP
      Merge tag 'zynq-soc-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/soc
      Merge tag 'arm-soc/for-4.2/maintainers' of http://github.com/broadcom/stblinux into next/soc
      Merge branch 'irq/for-arm' of git://git.kernel.org/.../tip/tip into next/soc
      Merge tag 'arm-soc/for-4.2/soc-take2' of http://github.com/broadcom/stblinux into next/soc
      Merge tag 'omap-for-v4.2/omap1-v2' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
      ARM: zx: fix building with CONFIG_THUMB2_KERNEL
      ARM: shmobile: only select sound drivers that build
      Merge tag 'renesas-soc-for-v4.2' of git://git.kernel.org/.../horms/renesas into next/soc
      Merge tag 'arm-soc/for-4.2/soc-part2' of http://github.com/broadcom/stblinux into next/soc
      ARM: imx: make imx51/3 suspend optional
      ARM: imx: imx7d requires anatop

Bartlomiej Zolnierkiewicz (5):
      ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout
      ARM: EXYNOS: make exynos_core_restart() less verbose
      ARM: EXYNOS: add exynos_set_boot_addr() helper
      ARM: EXYNOS: add exynos_get_boot_addr() helper
      ARM: EXYNOS: add coupled cpuidle support for Exynos3250

Ben Dooks (3):
      ARM: debug: fix big endian operation for 8250 word mode
      ARM: socfpga: enable big endian for secondary core(s)
      ARM: socfpga: support big endian for socfpga

Bintian Wang (1):
      arm64: Enable Hisilicon ARMv8 SoC family in Kconfig and defconfig

Brian Norris (1):
      MAINTAINERS: add brcmstb regex

Chen-Yu Tsai (1):
      ARM: sun8i: Add SMP support for the Allwinner A23

Dan Carpenter (1):
      ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()

Dave Gerlach (1):
      ARM: OMAP: AM43xx hwmod: Add data for am43xx emif hwmod

David Riley (1):
      soc/tegra: pmc: move to using a restart handler

Dinh Nguyen (5):
      ARM: socfpga: Add support for UART1 debug uart for earlyprintk
      ARM: socfpga: remove the need to map uart_io_desc
      ARM: socfpga: use of_iomap to map the SCU
      ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5
      ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10

Dmitry Osipenko (1):
      ARM: tegra20: Store CPU "resettable" status in IRAM

Eric Anholt (3):
      ARM: bcm2835: Skip doing our own iotable_init() initialization
      ARM: bcm2835: Drop the init_irq() hook
      ARM: bcm2835: Move the restart/power_off handling to the WDT driver

Fabio Estevam (2):
      clk: imx: clk-cpu: Include "clk.h" header file
      ARM: imx: mmdc: Include "common.h" header file

Florian Fainelli (5):
      ARM: BCM63xx: Add Broadcom BCM63xx PMB controller helpers
      ARM: BCM63xx: Add secondary CPU PMB initialization sequence
      ARM: vfp: Add include guards
      ARM: vfp: Add vfp_disable for problematic platforms
      ARM: BCM63xx: Add SMP support for BCM63138

Frank Li (3):
      dt-bindings: add imx7d clock ID definitions
      ARM: clk: imx: update pllv3 to support imx7
      ARM: imx: add imx7d clk tree support

Gregory Fong (2):
      ARM: brcmstb: Select ARCH_WANT_OPTIONAL_GPIOLIB
      ARM: brcmstb: Add default gpio number

Joachim Eastwood (3):
      ARM: lpc18xx: add basic support for NXP LPC18xx/43xx SoCs
      MAINTAINERS: Add entry for NXP LPC18xx/43xx MCUs
      ARM: lpc18xx: define low-level debug symbol for LPC18xx/43xx

Joe Perches (1):
      ARM: mach-imx: iomux-imx31: Use DECLARE_BITMAP

Josh Cartwright (2):
      ARM: zynq: Use restart_handler mechanism for slcr reset
      ARM: zynq: Drop use of slcr_unlock in zynq_slcr_system_restart

Jun Nie (8):
      ARM: zx: add basic support for ZTE ZX296702
      ARM: zx: add low level debug support for zx296702
      ARM: zx: enable SMP and hotplug for zx296702
      MAINTAINERS: add entry for ARM ZTE architecture
      dt-bindings: Add #defines for ZTE ZX296702 clocks
      clk: zx: add clock support to zx296702
      ARM: dts: zx: add an initial zx296702 dts and doc
      ARM: zx: Add basic defconfig support for ZX296702

Kevin Cernekee (1):
      bus: brcmstb_gisb: Honor the "big-endian" and "native-endian" DT properties

Kevin Hilman (8):
      Merge branch 'socfpga/soc' into next/soc
      Merge tag 'imx-soc-4.2' of git://git.kernel.org/.../shawnguo/linux into next/soc
      Merge tag 'hi6220-soc-for-4.2' of git://github.com/hisilicon/linux-hisi into next/soc
      Merge tag 'samsung-mach-1' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
      ARM: socfpga: fix build error due to secondary_startup
      Merge branch 'socfpga/soc' into next/soc
      Merge branch 'zte/soc' into next/soc
      Merge tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/.../tmlind/linux-omap into next/soc

Krzysztof Kozlowski (9):
      ARM: pxa: Constify irq_domain_ops
      ARM: imx: Constify irq_domain_ops
      ARM: EXYNOS: Handle of of_iomap() failure
      ARM: EXYNOS: Handle of_find_device_by_node() and kstrdup() failures
      ARM: EXYNOS: Add missing of_node_put() when parsing power domains
      ARM: EXYNOS: Get current parent clock for power domain on/off
      ARM: EXYNOS: Constify irq_domain_ops
      ARM: SAMSUNG: Constify platform_device_id
      MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS

Marek Szyprowski (2):
      ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs
      ARM: EXYNOS: register power domain driver from core_initcall

Martin Fuzzey (1):
      ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.

Masahiro Yamada (2):
      ARM: UniPhier: add basic support for UniPhier architecture
      MAINTAINERS: add myself as ARM/UniPhier maintainer

Maxime Coquelin (3):
      ARM: Add STM32 family machine
      MAINTAINERS: Add entry for STM32 MCUs
      ARM: Kconfig: Select clocksource in STM32 entry

Mika Westerberg (1):
      ARM: ep93xx: simone: support for SPI-based MMC/SD cards

Mirza Krak (1):
      ARM: imx: clk-v610: Add clock for I2C2 and I2C3

Nicholas Mc Guire (1):
      soc/tegra: Watch wait_for_completion_timeout() return type

Pali Rohár (2):
      ARM: OMAP2+: Return correct error values from device and hwmod
      ARM: OMAP3: Fix crypto support for HS devices

Rafał Miłecki (1):
      ARM: BCM5301X: Ignore another (BCM4709 specific) fault code

Ray Jui (1):
      ARM: BCM: Enable NAND support for iProc SoCs

Robert Jarzmik (7):
      ARM: pxa: change clocks init sequence
      ARM: pxa: move gpio11 clock to board files
      clk: pxa: add missing pxa27x clocks for Irda and sa1100-rtc
      ARM: pxa: pxa27x skip default device initialization with DT
      ARM: pxa: Transition pxa25x and pxa27x to clk framework
      ARM: pxa: convert eseries to clock framework
      ARM: pxa: Transition pxa25x, pxa27x, pxa3xx to clk framework

Sergiy Kibrik (1):
      ARM: SAMSUNG: fix clk_enable() WARNing in S3C24XX ADC

Shawn Guo (27):
      ARM: imx: use dynamic mapping for timer
      ARM: imx: use dynamic mapping for CCM
      ARM: imx: move revision definitions and declarations into a header
      ARM: imx5: let pm code map CCM block on its own
      ARM: imx6: set initial power mode in pm function
      ARM: imx6: let pm code map CCM block on its own
      ARM: imx6: do not use cpu_is_xxx() in clock driver
      ARM: imx: add clk-pllv1 type support
      ARM: imx: remove inclusions of platform headers
      ARM: imx: move clock drivers into drivers/clk
      MAINTAINERS: add new folders into IMX entry
      ARM: imx: drop epit timer initialization from imx35 clock driver
      ARM: imx6: initialize CCM_CLPCR_LPM into RUN mode earlier
      ARM: imx: use relaxed IO accessor in timer driver
      ARM: imx: move timer resources into a structure
      ARM: imx: define an enum for gpt timer device type
      ARM: imx: initialize gpt device type for DT boot
      ARM: imx: setup tctl register in device specific function
      ARM: imx: set up .set_next_event hook via imx_gpt_data
      ARM: imx: move clock event variables into imx_timer
      ARM: imx: define gpt register offset per device type
      ARM: imx: get rid of variable timer_base
      ARM: imx: provide gpt device specific irq functions
      ARM: imx: remove platform headers from timer driver
      ARM: imx: move timer driver into drivers/clocksource
      clocksource: timer-imx-gpt: remove include of <asm/mach/time.h>
      MAINTAINERS: update Shawn's email to use kernel.org one

Shenwei Wang (2):
      ARM: imx: Remove the duplicated function declaration
      ARM: imx: Correct the comments in time.c

Stefan Agner (10):
      irqdomain: Add non-hierarchy helper irq_domain_set_info
      genirq: Add irq_chip_(enable/disable)_parent
      genirq: generic chip: Support hierarchy domain
      irqchip: nvic: Support hierarchy irq domain
      irqchip: vf610-mscm: Support NVIC parent chip
      ARM: unify MMU/!MMU addruart calls
      ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms
      ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC
      ARM: use ARM_SINGLE_ARMV7M for ARMv7-M platforms
      ARM: imx: clk-vf610: enable debug access port by default

Sébastien Szymanski (1):
      ARM: clk-imx6q: refine sata's parent

Tony Lindgren (8):
      ARM: OMAP1: Move UART defines to prepare for sparse IRQ
      ARM: OMAP1: Switch to use generic irqchip in preparation for sparse IRQ
      ARM: omap1: Switch to use MULTI_IRQ
      ARM: OMAP1: Change interrupt numbering for sparse IRQ
      ARM: OMAP1: Fix randconfig builds if ARCH_OMAP15XX not selected
      ARM: OMAP1: Fix section mismatch warnings for omap_cfg_reg
      memory: omap-gpmc: Add Kconfig option for debug
      Merge tag 'for-v4.2/omap-hwmod-a' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.2/soc


 Documentation/arm/stm32/overview.txt            |  32 +
 Documentation/arm/stm32/stm32f429-overview.txt  |  22 +
 Documentation/devicetree/bindings/arm/cpus.txt  |   1 +
 .../bindings/arm/exynos/power_domain.txt        |   7 +-
 Documentation/devicetree/bindings/arm/fsl.txt   |   3 +
 Documentation/devicetree/bindings/arm/zte.txt   |  15 +
 .../devicetree/bindings/clock/zx296702-clk.txt  |  35 +
 .../devicetree/bindings/serial/pl011.txt        |   2 +-
 .../devicetree/bindings/vendor-prefixes.txt     |   1 +
 MAINTAINERS                                     |  38 +-
 arch/arm/Kconfig                                |  72 +-
 arch/arm/Kconfig.debug                          |  66 +-
 arch/arm/Makefile                               |   4 +
 arch/arm/boot/dts/Makefile                      |   1 +
 arch/arm/boot/dts/zx296702-ad1.dts              |  48 ++
 arch/arm/boot/dts/zx296702.dtsi                 | 139 +++
 arch/arm/configs/efm32_defconfig                |   1 +
 arch/arm/configs/zx_defconfig                   | 129 +++
 arch/arm/include/asm/firmware.h                 |   4 +
 arch/arm/include/asm/vfp.h                      |   9 +
 arch/arm/include/debug/8250.S                   |   3 +
 arch/arm/include/debug/efm32.S                  |   2 +-
 arch/arm/include/debug/imx-uart.h               |  15 +-
 arch/arm/include/debug/pl01x.S                  |   7 +
 arch/arm/kernel/debug.S                         |   2 +-
 arch/arm/mach-bcm/Kconfig                       |   2 +
 arch/arm/mach-bcm/Makefile                      |   7 +-
 arch/arm/mach-bcm/bcm63xx_headsmp.S             |  23 +
 arch/arm/mach-bcm/bcm63xx_pmb.c                 | 221 +++++
 arch/arm/mach-bcm/bcm63xx_smp.c                 | 169 ++++
 arch/arm/mach-bcm/bcm63xx_smp.h                 |   9 +
 arch/arm/mach-bcm/bcm_5301x.c                   |   9 +-
 arch/arm/mach-bcm/board_bcm2835.c               |  91 --
 arch/arm/mach-ep93xx/simone.c                   | 135 ++-
 arch/arm/mach-exynos/common.h                   |   4 +-
 arch/arm/mach-exynos/exynos.c                   |   3 +-
 arch/arm/mach-exynos/firmware.c                 |  18 +
 arch/arm/mach-exynos/platsmp.c                  |  86 +-
 arch/arm/mach-exynos/pm.c                       |  51 +-
 arch/arm/mach-exynos/pm_domains.c               |  53 +-
 arch/arm/mach-exynos/pmu.c                      |   6 +-
 arch/arm/mach-exynos/suspend.c                  |   2 +-
 arch/arm/mach-imx/Kconfig                       |  49 +-
 arch/arm/mach-imx/Makefile                      |  31 +-
 arch/arm/mach-imx/Makefile.boot                 |   0
 arch/arm/mach-imx/anatop.c                      |   5 +-
 arch/arm/mach-imx/common.h                      |  15 +-
 arch/arm/mach-imx/cpu.c                         |   3 +
 arch/arm/mach-imx/cpuidle-imx6q.c               |   4 +-
 arch/arm/mach-imx/cpuidle-imx6sl.c              |   4 +-
 arch/arm/mach-imx/cpuidle-imx6sx.c              |   4 +-
 arch/arm/mach-imx/gpc.c                         |   2 +-
 arch/arm/mach-imx/hardware.h                    |   1 +
 arch/arm/mach-imx/iomux-imx31.c                 |   2 +-
 arch/arm/mach-imx/mach-imx6q.c                  |   1 +
 arch/arm/mach-imx/mach-imx6sl.c                 |   1 +
 arch/arm/mach-imx/mach-imx6sx.c                 |   1 +
 arch/arm/mach-imx/mach-imx7d.c                  |  43 +
 arch/arm/mach-imx/mach-vf610.c                  |   1 +
 arch/arm/mach-imx/mmdc.c                        |   2 +
 arch/arm/mach-imx/mx27.h                        |   4 -
 arch/arm/mach-imx/mx3x.h                        |   7 -
 arch/arm/mach-imx/mxc.h                         |  24 +-
 arch/arm/mach-imx/pm-imx5.c                     | 205 ++++-
 arch/arm/mach-imx/pm-imx6.c                     |  38 +-
 arch/arm/mach-imx/suspend-imx53.S               | 139 +++
 arch/arm/mach-imx/time.c                        | 385 ---------
 arch/arm/mach-lpc18xx/Makefile                  |   1 +
 arch/arm/mach-lpc18xx/Makefile.boot             |   3 +
 arch/arm/mach-lpc18xx/board-dt.c                |  22 +
 arch/arm/mach-omap1/ams-delta-fiq-handler.S     |   3 +-
 arch/arm/mach-omap1/board-ams-delta.c           |   1 +
 arch/arm/mach-omap1/board-fsample.c             |   1 +
 arch/arm/mach-omap1/board-generic.c             |   1 +
 arch/arm/mach-omap1/board-h2.c                  |   1 +
 arch/arm/mach-omap1/board-h3-mmc.c              |   1 +
 arch/arm/mach-omap1/board-h3.c                  |   1 +
 arch/arm/mach-omap1/board-htcherald.c           |   1 +
 arch/arm/mach-omap1/board-innovator.c           |   1 +
 arch/arm/mach-omap1/board-nokia770.c            |   1 +
 arch/arm/mach-omap1/board-osk.c                 |   1 +
 arch/arm/mach-omap1/board-palmte.c              |   1 +
 arch/arm/mach-omap1/board-palmtt.c              |   1 +
 arch/arm/mach-omap1/board-palmz71.c             |   1 +
 arch/arm/mach-omap1/board-perseus2.c            |   1 +
 arch/arm/mach-omap1/board-sx1.c                 |   1 +
 arch/arm/mach-omap1/board-voiceblue.c           |   1 +
 arch/arm/mach-omap1/common.h                    |   7 +-
 arch/arm/mach-omap1/dma.c                       |   2 +-
 arch/arm/mach-omap1/gpio16xx.c                  |   2 +
 arch/arm/mach-omap1/gpio7xx.c                   |   2 +
 arch/arm/mach-omap1/i2c.c                       |   3 +-
 arch/arm/mach-omap1/include/mach/entry-macro.S  |  39 -
 arch/arm/mach-omap1/include/mach/irqs.h         | 124 ++-
 arch/arm/mach-omap1/include/mach/memory.h       |   4 +-
 arch/arm/mach-omap1/include/mach/serial.h       |   5 -
 arch/arm/mach-omap1/include/mach/soc.h          |   4 +
 arch/arm/mach-omap1/irq.c                       | 157 ++--
 arch/arm/mach-omap1/mux.c                       |   8 +-
 arch/arm/mach-omap1/pm.c                        |   1 +
 arch/arm/mach-omap1/serial.c                    |   1 +
 arch/arm/mach-omap1/timer.c                     |   4 +-
 arch/arm/mach-omap2/omap_device.c               |  30 +-
 arch/arm/mach-omap2/omap_hwmod.c                |  10 +-
 arch/arm/mach-omap2/omap_hwmod.h                |   6 +
 .../mach-omap2/omap_hwmod_2xxx_ipblock_data.c   |  12 +-
 .../omap_hwmod_33xx_43xx_common_data.h          |   1 +
 .../omap_hwmod_33xx_43xx_ipblock_data.c         |  16 +-
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c      |  13 -
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c      | 119 ++-
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c      |  22 +
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c      |  11 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c       |   4 +-
 arch/arm/mach-omap2/omap_hwmod_81xx_data.c      |   2 +
 arch/arm/mach-omap2/prcm43xx.h                  |   2 +
 arch/arm/mach-pxa/Makefile                      |   9 +-
 arch/arm/mach-pxa/clock-pxa2xx.c                |  55 --
 arch/arm/mach-pxa/clock-pxa3xx.c                | 212 -----
 arch/arm/mach-pxa/clock.c                       |  86 --
 arch/arm/mach-pxa/clock.h                       |  80 --
 arch/arm/mach-pxa/eseries.c                     |  27 +-
 arch/arm/mach-pxa/generic.c                     |   6 +
 arch/arm/mach-pxa/generic.h                     |   3 +
 arch/arm/mach-pxa/irq.c                         |   2 +-
 arch/arm/mach-pxa/lubbock.c                     |   4 +-
 arch/arm/mach-pxa/pxa25x.c                      | 183 ----
 arch/arm/mach-pxa/pxa27x.c                      | 182 +---
 arch/arm/mach-pxa/pxa300.c                      |  20 +-
 arch/arm/mach-pxa/pxa320.c                      |  10 -
 arch/arm/mach-pxa/pxa3xx.c                      |  59 --
 arch/arm/mach-pxa/raumfeld.c                    |   1 -
 arch/arm/mach-pxa/tosa.c                        |   1 -
 arch/arm/mach-shmobile/Kconfig                  |   4 +-
 arch/arm/mach-socfpga/Kconfig                   |  11 +-
 arch/arm/mach-socfpga/Makefile                  |   1 +
 arch/arm/mach-socfpga/core.h                    |  11 +-
 arch/arm/mach-socfpga/headsmp.S                 |   5 +-
 arch/arm/mach-socfpga/platsmp.c                 |  57 +-
 arch/arm/mach-socfpga/pm.c                      | 149 ++++
 arch/arm/mach-socfpga/self-refresh.S            | 136 +++
 arch/arm/mach-socfpga/socfpga.c                 |  41 +-
 arch/arm/mach-stm32/Makefile                    |   1 +
 arch/arm/mach-stm32/Makefile.boot               |   3 +
 arch/arm/mach-stm32/board-dt.c                  |  19 +
 arch/arm/mach-sunxi/platsmp.c                   |  69 ++
 arch/arm/mach-tegra/cpuidle-tegra20.c           |   5 +-
 arch/arm/mach-tegra/reset-handler.S             |  10 +-
 arch/arm/mach-tegra/reset.h                     |   4 +
 arch/arm/mach-tegra/sleep-tegra20.S             |  37 +-
 arch/arm/mach-tegra/sleep.h                     |   4 +
 arch/arm/mach-tegra/tegra.c                     |   1 -
 arch/arm/mach-uniphier/Kconfig                  |  11 +
 arch/arm/mach-uniphier/Makefile                 |   2 +
 arch/arm/mach-uniphier/platsmp.c                |  90 ++
 arch/arm/mach-uniphier/uniphier.c               |  30 +
 arch/arm/mach-zx/Kconfig                        |  18 +
 arch/arm/mach-zx/Makefile                       |   2 +
 arch/arm/mach-zx/core.h                         |  19 +
 arch/arm/mach-zx/headsmp.S                      |  33 +
 arch/arm/mach-zx/platsmp.c                      | 189 ++++
 arch/arm/mach-zx/zx296702.c                     |  25 +
 arch/arm/mach-zynq/common.c                     |   6 -
 arch/arm/mach-zynq/common.h                     |   1 -
 arch/arm/mach-zynq/slcr.c                       |  28 +-
 arch/arm/plat-omap/dma.c                        |   4 +
 arch/arm/plat-samsung/adc.c                     |   6 +-
 arch/arm/vfp/vfpmodule.c                        |  13 +
 arch/arm64/Kconfig                              |   5 +
 arch/arm64/configs/defconfig                    |   1 +
 drivers/bus/brcmstb_gisb.c                      |  13 +-
 drivers/clk/Makefile                            |   2 +
 drivers/clk/imx/Makefile                        |  26 +
 .../arm/mach-imx => drivers/clk/imx}/clk-busy.c |   0
 .../arm/mach-imx => drivers/clk/imx}/clk-cpu.c  |   1 +
 .../clk/imx}/clk-fixup-div.c                    |   0
 .../clk/imx}/clk-fixup-mux.c                    |   0
 .../clk/imx}/clk-gate-exclusive.c               |   0
 .../mach-imx => drivers/clk/imx}/clk-gate2.c    |   0
 .../arm/mach-imx => drivers/clk/imx}/clk-imx1.c |  17 +-
 .../mach-imx => drivers/clk/imx}/clk-imx21.c    |  14 +-
 .../mach-imx => drivers/clk/imx}/clk-imx25.c    |   6 +-
 .../mach-imx => drivers/clk/imx}/clk-imx27.c    |  15 +-
 .../mach-imx => drivers/clk/imx}/clk-imx31.c    |  35 +-
 .../mach-imx => drivers/clk/imx}/clk-imx35.c    |  36 +-
 .../clk/imx}/clk-imx51-imx53.c                  |   5 +-
 .../mach-imx => drivers/clk/imx}/clk-imx6q.c    |  36 +-
 .../mach-imx => drivers/clk/imx}/clk-imx6sl.c   |   7 -
 .../mach-imx => drivers/clk/imx}/clk-imx6sx.c   |   6 -
 drivers/clk/imx/clk-imx7d.c                     | 860 +++++++++++++++++++
 .../arm/mach-imx => drivers/clk/imx}/clk-pfd.c  |   0
 .../mach-imx => drivers/clk/imx}/clk-pllv1.c    |  33 +-
 .../mach-imx => drivers/clk/imx}/clk-pllv2.c    |   0
 .../mach-imx => drivers/clk/imx}/clk-pllv3.c    |  13 +-
 .../mach-imx => drivers/clk/imx}/clk-vf610.c    |   4 +
 {arch/arm/mach-imx => drivers/clk/imx}/clk.c    |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk.h    |  14 +-
 drivers/clk/pxa/clk-pxa27x.c                    |  32 +-
 drivers/clk/zte/Makefile                        |   2 +
 drivers/clk/zte/clk-pll.c                       | 172 ++++
 drivers/clk/zte/clk-zx296702.c                  | 657 ++++++++++++++
 drivers/clk/zte/clk.h                           |  32 +
 drivers/clocksource/Kconfig                     |   6 +
 drivers/clocksource/Makefile                    |   1 +
 drivers/clocksource/timer-imx-gpt.c             | 540 ++++++++++++
 drivers/irqchip/Kconfig                         |   1 +
 drivers/irqchip/irq-nvic.c                      |  28 +-
 drivers/irqchip/irq-vf610-mscm-ir.c             |  23 +-
 drivers/memory/Kconfig                          |   8 +
 drivers/memory/omap-gpmc.c                      |   6 +-
 drivers/soc/tegra/fuse/fuse-tegra20.c           |   6 +-
 drivers/soc/tegra/pmc.c                         |  23 +-
 drivers/watchdog/bcm2835_wdt.c                  |  62 ++
 include/dt-bindings/clock/imx7d-clock.h         | 450 ++++++++++
 include/dt-bindings/clock/vf610-clock.h         |   3 +-
 include/dt-bindings/clock/zx296702-clock.h      | 170 ++++
 include/linux/irq.h                             |   2 +
 include/linux/irqdomain.h                       |   8 +-
 include/linux/reset/bcm63xx_pmb.h               |  88 ++
 include/soc/imx/revision.h                      |  37 +
 include/soc/imx/timer.h                         |  26 +
 include/soc/tegra/pmc.h                         |   2 -
 include/uapi/linux/serial_reg.h                 |   3 +
 kernel/irq/chip.c                               |  28 +
 kernel/irq/generic-chip.c                       |   5 +-
 kernel/irq/irqdomain.c                          |  21 +
 225 files changed, 6675 insertions(+), 2075 deletions(-)
 create mode 100644 Documentation/arm/stm32/overview.txt
 create mode 100644 Documentation/arm/stm32/stm32f429-overview.txt
 create mode 100644 Documentation/devicetree/bindings/arm/zte.txt
 create mode 100644 Documentation/devicetree/bindings/clock/zx296702-clk.txt
 create mode 100644 arch/arm/boot/dts/zx296702-ad1.dts
 create mode 100644 arch/arm/boot/dts/zx296702.dtsi
 create mode 100644 arch/arm/configs/zx_defconfig
 create mode 100644 arch/arm/mach-bcm/bcm63xx_headsmp.S
 create mode 100644 arch/arm/mach-bcm/bcm63xx_pmb.c
 create mode 100644 arch/arm/mach-bcm/bcm63xx_smp.c
 create mode 100644 arch/arm/mach-bcm/bcm63xx_smp.h
 create mode 100644 arch/arm/mach-imx/Makefile.boot
 create mode 100644 arch/arm/mach-imx/mach-imx7d.c
 create mode 100644 arch/arm/mach-imx/suspend-imx53.S
 delete mode 100644 arch/arm/mach-imx/time.c
 create mode 100644 arch/arm/mach-lpc18xx/Makefile
 create mode 100644 arch/arm/mach-lpc18xx/Makefile.boot
 create mode 100644 arch/arm/mach-lpc18xx/board-dt.c
 delete mode 100644 arch/arm/mach-omap1/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-pxa/clock-pxa2xx.c
 delete mode 100644 arch/arm/mach-pxa/clock-pxa3xx.c
 delete mode 100644 arch/arm/mach-pxa/clock.c
 delete mode 100644 arch/arm/mach-pxa/clock.h
 create mode 100644 arch/arm/mach-socfpga/pm.c
 create mode 100644 arch/arm/mach-socfpga/self-refresh.S
 create mode 100644 arch/arm/mach-stm32/Makefile
 create mode 100644 arch/arm/mach-stm32/Makefile.boot
 create mode 100644 arch/arm/mach-stm32/board-dt.c
 create mode 100644 arch/arm/mach-uniphier/Kconfig
 create mode 100644 arch/arm/mach-uniphier/Makefile
 create mode 100644 arch/arm/mach-uniphier/platsmp.c
 create mode 100644 arch/arm/mach-uniphier/uniphier.c
 create mode 100644 arch/arm/mach-zx/Kconfig
 create mode 100644 arch/arm/mach-zx/Makefile
 create mode 100644 arch/arm/mach-zx/core.h
 create mode 100644 arch/arm/mach-zx/headsmp.S
 create mode 100644 arch/arm/mach-zx/platsmp.c
 create mode 100644 arch/arm/mach-zx/zx296702.c
 create mode 100644 drivers/clk/imx/Makefile
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (99%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (91%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (95%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (91%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%)
 create mode 100644 drivers/clk/imx/clk-imx7d.c
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (96%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (98%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (94%)
 create mode 100644 drivers/clk/zte/Makefile
 create mode 100644 drivers/clk/zte/clk-pll.c
 create mode 100644 drivers/clk/zte/clk-zx296702.c
 create mode 100644 drivers/clk/zte/clk.h
 create mode 100644 drivers/clocksource/timer-imx-gpt.c
 create mode 100644 include/dt-bindings/clock/imx7d-clock.h
 create mode 100644 include/dt-bindings/clock/zx296702-clock.h
 create mode 100644 include/linux/reset/bcm63xx_pmb.h
 create mode 100644 include/soc/imx/revision.h
 create mode 100644 include/soc/imx/timer.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1172502 — [GIT PULL 5/5] ARM: SoC: defconfig updates for v4.2

FromKevin Hilman <khilman@kernel.org>
Date2015-06-26 00:40 +0200
Subject[GIT PULL 5/5] ARM: SoC: defconfig updates for v4.2
Message-ID<pFnYm-5mM-21@gated-at.bofh.it>
In reply to#1172495
We keep collecting defconfig updates in a separate branch mostly to encourage
people to handle them separately and avoid conflicts between different topics.

Most of these are enablement of new SoCs, boards or drivers that have
come in, or minor config refreshes due to reorderings in Kconfig
files, etc. I.e. mostly minor churn of various kinds.

Conflicts: None

----------------------------------------------------------------

The following changes since commit 32270e805a1e0baf39aa040177ef1896f03b7266:

  Merge tag 'armsoc-drivers' into test-merge

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-defconfig

for you to fetch changes up to dec36f6ab89db2ae80a0a61f26e1ca1f6a61b651:

  ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y

----------------------------------------------------------------

Alexandre Belloni (1):
      ARM: multi_v7_defconfig: Add Atmel SAMA5 family

Anand Moon (2):
      ARM: exynos_defconfig: Enable CONFIG_SENSORS_PWM_FAN for Odroid-XU3
      ARM: exynos_defconfig: Enable CONFIG_SENSORS_INA2XX for Odroid-XU3

Anthoine Bourgeois (1):
      ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig

Ard Biesheuvel (1):
      ARM: multi_v7_defconfig: enable asm and NEON accelerated crypto modules

Arnd Bergmann (10):
      Merge tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/.../mcoquelin/sti into next/defconfig
      Merge tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi into next/defconfig
      Merge tag 'tegra-for-4.2-defconfig' of git://git.kernel.org/.../tegra/linux into next/defconfig
      Merge tag 'renesas-defconfig-for-v4.2' of git://git.kernel.org/.../horms/renesas into next/defconfig
      ARM: xz: do not try to use a ramdisk in defconfig
      ARM: stm32: do not try to use a ramdisk in defconfig
      Merge tag 'at91-defconfig' of git://git.kernel.org/.../nferre/linux-at91 into next/defconfig
      Merge tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/.../galak/linux-qcom into next/defconfig
      Merge tag 'renesas-defconfig2-for-v4.2' of git://git.kernel.org/.../horms/renesas into next/defconfig
      Merge tag 'imx-defconfig-4.2' of git://git.kernel.org/.../shawnguo/linux into next/defconfig

Baruch Siach (1):
      ARM: multi_v7_defconfig: enable Conexant Digicolor platform

Fabio Estevam (2):
      ARM: imx_v6_v7_defconfig: Enable RTC PCF8523 support
      ARM: imx_v6_v7_defconfig: Select LS1021A

Fathi Boudra (1):
      ARM: defconfig: hisi: enable HiSilicon hip04 ethernet controller

Frank Li (1):
      ARM: config: imx_v6_v7_defconfig add imx7d support

Geert Uytterhoeven (5):
      ARM: shmobile: defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2
      ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2
      ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
      ARM: multi_v7_defconfig: Make sound support modular
      ARM: multi_v7_defconfig: Make media support modular

Javier Martinez Canillas (9):
      ARM: multi_v7_defconfig: Enable support for Samsung S3C64XX SPI
      ARM: multi_v7_defconfig: Enable max77802 regulator, rtc and clock drivers
      ARM: multi_v7_defconfig: Enable Exynos USB PHY drivers support
      ARM: multi_v7_defconfig: Enable support for missing ChromeOS EC drivers
      ARM: multi_v7_defconfig: Enable Samsung PWM support
      ARM: multi_v7_defconfig: Enable Samsung S3C SoC RTC
      ARM: multi_v7_defconfig: Enable options for Exynos display support
      ARM: multi_v7_defconfig: Enable GPIO-based I2C arbitration support
      ARM: multi_v7_defconfig: Enable Cypress APA I2C Trackpad support

Joachim Eastwood (2):
      ARM: lpc18xx: add kernel config
      ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig

Jun Nie (1):
      ARM: zx: Add basic defconfig support for ZX296702

Kevin Hilman (3):
      Merge tag 'samsung-defconfig-2' of git://git.kernel.org/.../kgene/linux-samsung into next/defconfig
      Merge tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/.../tmlind/linux-omap into next/defconfig
      ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y

Krzysztof Kozlowski (6):
      ARM: multi_v7_defconfig: Enable CPU idle for exynos SoCs
      ARM: multi_v7_defconfig: Enable PMIC and MUIC drivers for exynos
      ARM: multi_v7_defconfig: Enable TMU for exynos SoCs
      ARM: multi_v7_defconfig: Enable OHCI on exynos SoCs
      ARM: exynos_defconfig: Enable display on Trats2 board
      ARM: multi_v7_defconfig: Enable display on Trats2 board

Kukjin Kim (1):
      ARM: exynos_defconfig: savedefconfig

Lee Jones (2):
      ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog
      ARM: multi_v7_defconfig: Enable support for ST's LPC RTC

Lina Iyer (2):
      ARM: config: Update qcom_defconfig to enable cpuidle
      ARM: config: multi_v7: Update to enable cpuidle for QCOM SoCs

Linus Walleij (3):
      ARM: ux500: add PERF_EVENTS to defconfig
      ARM: ux500: enable CoreSight in defconfig
      ARM64: add GPIO keys to the defconfig

Masahiro Yamada (1):
      ARM: multi_v7_defconfig: enable UniPhier SoC family

Maxime Coquelin (1):
      ARM: configs: Add STM32 defconfig

Murali Karicheri (1):
      ARM: keystone: defconfig: enable netcp driver by default

Nicolas Ferre (1):
      ARM: at91/defconfig: add CONFIG_REGULATOR_FIXED_VOLTAGE for mmc driver

Roger Quadros (1):
      ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR

Stefan Agner (2):
      ARM: vf610m4: add defconfig for Linux on Vybrids Cortex-M4
      ARM: add ARM_SINGLE_ARMV7M in ARMv7-M defconfigs

Sébastien Szymanski (1):
      ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards

Thierry Reding (1):
      ARM: tegra: Update default configuration

Tony Lindgren (1):
      ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module

Zhou Wang (1):
      ARM: hip04: add GPIO configure in hisi_defconfig


 arch/arm/configs/at91_dt_defconfig   |   2 +
 arch/arm/configs/efm32_defconfig     |   1 -
 arch/arm/configs/exynos_defconfig    |  50 ++++------
 arch/arm/configs/hisi_defconfig      |   2 +
 arch/arm/configs/imx_v6_v7_defconfig |   9 ++
 arch/arm/configs/keystone_defconfig  |   6 ++
 arch/arm/configs/lpc18xx_defconfig   | 151 ++++++++++++++++++++++++++++++
 arch/arm/configs/multi_v7_defconfig  | 110 +++++++++++++++++++---
 arch/arm/configs/omap2plus_defconfig |   3 +
 arch/arm/configs/qcom_defconfig      |   2 +
 arch/arm/configs/sama5_defconfig     |   1 +
 arch/arm/configs/shmobile_defconfig  |   4 +-
 arch/arm/configs/stm32_defconfig     |  70 ++++++++++++++
 arch/arm/configs/tegra_defconfig     |  10 ++
 arch/arm/configs/u8500_defconfig     |   5 +
 arch/arm/configs/vf610m4_defconfig   |  42 +++++++++
 arch/arm64/configs/defconfig         |   1 +
 17 files changed, 419 insertions(+), 50 deletions(-)
 create mode 100644 arch/arm/configs/lpc18xx_defconfig
 create mode 100644 arch/arm/configs/stm32_defconfig
 create mode 100644 arch/arm/configs/vf610m4_defconfig
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1172503 — [GIT PULL 4/5] ARM: SoC: driver updates for v4.2

FromKevin Hilman <khilman@kernel.org>
Date2015-06-26 00:40 +0200
Subject[GIT PULL 4/5] ARM: SoC: driver updates for v4.2
Message-ID<pFnYm-5mM-27@gated-at.bofh.it>
In reply to#1172495
Some of these are for drivers/soc, where we're now putting
SoC-specific drivers these days. Some are for other driver subsystems
where we have received acks from the appropriate maintainers.

Some highlights:

- simple-mfd: document DT bindings and misc updates
- migrate mach-berlin to simple-mfd for clock, pinctrl and reset
- memory: support for Tegra132 SoC
- memory: introduce tegra EMC driver for scaling memory frequency
- misc. updates for ARM CCI and CCN busses

Conflicts:
	arch/arm64/boot/dts/arm/juno-motherboard.dtsi

Trivial add/add conflict with our dt branch.
Resolution: take both sides.

----------------------------------------------------------------

The following changes since commit 39e79b873e1bafc5637a1a704495b01edbe469b1:

  Merge tag 'armsoc-dt' into test-merge

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-drivers

for you to fetch changes up to 4af34b572a85c44c55491a10693535a79627c478:

  drivers: soc: sunxi: Introduce SoC driver to map SRAMs

----------------------------------------------------------------

Antoine Tenart (15):
      ARM: berlin: select MFD_SYSCON by default
      ARM: berlin: prepare simple-mfd/syscon conversion of sys/chip ctrl nodes
      reset: berlin: convert to a platform driver
      ARM: berlin: move reset to simple-mfd nodes
      reset: berlin: drop arch_initcall initialization
      pinctrl: berlin: prepare to use regmap provided by syscon
      ARM: berlin: move pinctrl to simple-mfd nodes
      pinctrl: berlin: drop SoC stub provided regmap
      clk: berlin: prepare simple-mfd conversion
      ARM: berlin: move BG2 clock node
      ARM: berlin: move BG2CD clock node
      ARM: berlin: move BG2Q clock node
      clk: berlin: drop direct of_iomap of nodes reg property
      ARM: berlin: remove useless chip and system ctrl compatibles
      ARM: berlin: add an ADC node for the BG2Q

Arnd Bergmann (9):
      Merge tag 'simple-mfd' of git://git.kernel.org/.../linusw/linux-integrator into next/drivers
      Merge tag 'ccn/updates-for-4.2' of git://git.linaro.org/people/pawel.moll/linux into next/drivers
      Merge tag 'tegra-for-4.2-memory' of git://git.kernel.org/.../tegra/linux into next/drivers
      Merge tag 'tegra-for-4.2-ramcode' of git://git.kernel.org/.../tegra/linux into next/drivers
      Merge tag 'tegra-for-4.2-emc' of git://git.kernel.org/.../tegra/linux into next/drivers
      Merge tag 'berlin-simple-mfd-4.2-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers
      Merge tag 'v4.1-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
      Merge tag 'qcom-soc-for-4.2-1' of git://git.kernel.org/.../galak/linux-qcom into next/drivers
      Merge tag 'mvebu-drivers-4.2' of git://git.infradead.org/linux-mvebu into next/drivers

Kumar Gala (1):
      firmware: qcom: scm: Split out 32-bit specific SCM code

Lina Iyer (1):
      ARM: qcom: Add Subsystem Power Manager (SPM) driver

Linus Walleij (5):
      MFD/OF: document MFD devices and handle simple-mfd
      ARM: dts: update syscons to use simple-mfd
      leds: syscon: instantiate from platform device
      arm64: juno: Add APB registers and LEDs using syscon
      arm64: add LEDs and some trigger support to defconfig

Maxime Ripard (1):
      drivers: soc: sunxi: Introduce SoC driver to map SRAMs

Mikko Perttunen (5):
      soc/tegra: fuse: Add RAM code reader helper
      of: Add Tegra124 EMC bindings
      memory: tegra: Add API needed by the EMC driver
      memory: tegra: Add EMC (external memory controller) driver
      memory: tegra: Add EMC frequency debugfs entry

Pawel Moll (6):
      bus: arm-ccn: Fix node->XP config conversion
      bus: arm-ccn: cpumask attribute
      bus: arm-ccn: Provide required event arguments
      bus: arm-ccn: Do not group CCN events with other PMUs
      bus: arm-ccn: Allocate event when it is being added, not initialised
      bus: arm-ccn: Use hrtimer_start() again

Suzuki K. Poulose (7):
      arm-cci: Do not enable CCI-400 PMU by default
      arm-cci: Cleanup PMU driver code
      arm-cci: Abstract out the PMU counter details
      arm-cci: Abstract handling for CCI events
      arm-cci: Sanitise CCI400 PMU driver specific code
      arm-cci: Add CCI-500 PMU support
      arm-cci: Add aliases for PMU events

Thierry Reding (4):
      memory: tegra: Add SWGROUP names
      iommu/tegra-smmu: Add debugfs support
      memory: tegra: Add Tegra132 support
      Merge branch 'for-4.2/ramcode' into for-4.2/emc

Thomas Petazzoni (1):
      bus: mvebu-mbus: add mv_mbus_dram_info_nooverlap()

Tomeu Vizoso (3):
      of: Document long-ram-code property in nvidia,tegra20-apbmisc
      memory: tegra: Disable ARBITRATION_EMEM interrupt
      of: Document timings subnode of nvidia,tegra-mc

jilai wang (1):
      firmware: qcom: scm: Add HDCP Support


 Documentation/arm/CCN.txt                       |   17 +-
 Documentation/devicetree/bindings/arm/cci.txt   |    4 +-
 .../memory-controllers/nvidia,tegra-mc.txt      |   84 +-
 .../bindings/memory-controllers/tegra-emc.txt   |  374 ++++++
 Documentation/devicetree/bindings/mfd/mfd.txt   |   41 +
 .../bindings/misc/nvidia,tegra20-apbmisc.txt    |    2 +
 .../devicetree/bindings/soc/sunxi/sram.txt      |   72 ++
 arch/arm/boot/dts/arm-realview-pb1176.dts       |    2 +-
 arch/arm/boot/dts/berlin2.dtsi                  |   90 +-
 arch/arm/boot/dts/berlin2cd.dtsi                |   66 +-
 arch/arm/boot/dts/berlin2q.dtsi                 |  120 +-
 arch/arm/boot/dts/integrator.dtsi               |    4 +-
 arch/arm/mach-berlin/Kconfig                    |    1 +
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi   |   68 ++
 arch/arm64/configs/defconfig                    |    6 +
 drivers/bus/Kconfig                             |   31 +-
 drivers/bus/arm-cci.c                           |  905 +++++++++++---
 drivers/bus/arm-ccn.c                           |  270 ++++-
 drivers/bus/mvebu-mbus.c                        |  117 ++
 drivers/clk/berlin/bg2.c                        |    7 +-
 drivers/clk/berlin/bg2q.c                       |    7 +-
 drivers/firmware/Makefile                       |    3 +-
 drivers/firmware/qcom_scm-32.c                  |  503 ++++++++
 drivers/firmware/qcom_scm.c                     |  474 +-------
 drivers/firmware/qcom_scm.h                     |   47 +
 drivers/iommu/Kconfig                           |    2 +-
 drivers/iommu/tegra-smmu.c                      |  109 ++
 drivers/leds/leds-syscon.c                      |  170 +--
 drivers/memory/tegra/Kconfig                    |   10 +
 drivers/memory/tegra/Makefile                   |    3 +
 drivers/memory/tegra/mc.c                       |  143 ++-
 drivers/memory/tegra/mc.h                       |    4 +
 drivers/memory/tegra/tegra114.c                 |   32 +-
 drivers/memory/tegra/tegra124-emc.c             | 1140 ++++++++++++++++++
 drivers/memory/tegra/tegra124.c                 |  123 +-
 drivers/memory/tegra/tegra30.c                  |   32 +-
 drivers/of/platform.c                           |    1 +
 drivers/pinctrl/berlin/berlin-bg2.c             |   26 +-
 drivers/pinctrl/berlin/berlin-bg2cd.c           |   26 +-
 drivers/pinctrl/berlin/berlin-bg2q.c            |   26 +-
 drivers/pinctrl/berlin/berlin.c                 |    9 +-
 drivers/reset/reset-berlin.c                    |   74 +-
 drivers/soc/Kconfig                             |    1 +
 drivers/soc/Makefile                            |    1 +
 drivers/soc/qcom/Kconfig                        |    7 +
 drivers/soc/qcom/Makefile                       |    1 +
 drivers/soc/qcom/spm.c                          |  385 ++++++
 drivers/soc/sunxi/Kconfig                       |   10 +
 drivers/soc/sunxi/Makefile                      |    1 +
 drivers/soc/sunxi/sunxi_sram.c                  |  284 +++++
 drivers/soc/tegra/fuse/tegra-apbmisc.c          |   21 +
 include/linux/mbus.h                            |    5 +
 include/linux/qcom_scm.h                        |   13 +-
 include/linux/soc/sunxi/sunxi_sram.h            |   19 +
 include/soc/tegra/emc.h                         |   19 +
 include/soc/tegra/fuse.h                        |    1 +
 include/soc/tegra/mc.h                          |   20 +-
 57 files changed, 4966 insertions(+), 1067 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/mfd.txt
 create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt
 create mode 100644 drivers/firmware/qcom_scm-32.c
 create mode 100644 drivers/firmware/qcom_scm.h
 create mode 100644 drivers/memory/tegra/tegra124-emc.c
 create mode 100644 drivers/soc/qcom/spm.c
 create mode 100644 drivers/soc/sunxi/Kconfig
 create mode 100644 drivers/soc/sunxi/Makefile
 create mode 100644 drivers/soc/sunxi/sunxi_sram.c
 create mode 100644 include/linux/soc/sunxi/sunxi_sram.h
 create mode 100644 include/soc/tegra/emc.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web