[GIT PULL 1/3] ARM: SoC fixes for 3.19-rc1

[GIT PULL 1/3] ARM: SoC fixes for 3.19-rc1

[Arnd Bergmann]

The following changes since commit a0e4467726cd26bacb16f13d207ffcfa82ffc07d:

  Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic (2014-12-09 17:25:00 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus

for you to fetch changes up to 5f1b2953da58e51e97eea9b7235545d72e9e1dab:

  Merge tag 'renesas-defconfig-fixes-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes (2014-12-16 21:43:15 +0100)

----------------------------------------------------------------
ARM: SoC fixes for 3.19-rc1

Here are the first arm-soc bug fixes. Most of these are OMAP related
fixes for regressions or minor bugs. Aside from that, there are a
few defconfig changes for various platforms.

----------------------------------------------------------------
Arnd Bergmann (1):
      Merge tag 'renesas-defconfig-fixes-for-v3.19' of git://git.kernel.org/.../horms/renesas into fixes

Felipe Balbi (1):
      ARM: dts: am437x-sk: fix lcd enable pin mux data

Johan Hovold (1):
      ARM: OMAP2+: clock: remove unused function prototype

Kevin Hilman (1):
      Merge tag 'omap-for-v3.19/fixes-for-merge-window' of git://git.kernel.org/.../tmlind/linux-omap into fixes

Lokesh Vutla (2):
      ARM: dts: DRA7: wdt: Fix compatible property for watchdog node
      ARM: OMAP2+: AM43x: Add ID for ES1.2

Mark Brown (1):
      iommu/exynos: Fix arm64 allmodconfig build

Ravikumar Kattekola (2):
      ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage
      ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM

Roger Quadros (1):
      ARM: omap2plus_defconfig: Enable AHCI_PLATFORM driver

Simon Horman (1):
      Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig"

Tomi Valkeinen (2):
      ARM: dts: dra7: fix DSS PLL clock mux registers
      ARM: dts: am437x-sk-evm.dts: fix LCD timings

Tony Lindgren (2):
      Merge branch 'omap-for-v3.19/fixes-not-urgent' into omap-for-v3.19/fixes
      ARM: dts: Fix gpmc regression for omap 2430sdp smc91x

Viresh Kumar (1):
      ARM: defconfigs: use CONFIG_CPUFREQ_DT

 arch/arm/boot/dts/am437x-sk-evm.dts  | 15 +++++++--------
 arch/arm/boot/dts/dra7-evm.dts       |  4 ++--
 arch/arm/boot/dts/dra7.dtsi          |  2 +-
 arch/arm/boot/dts/dra72-evm.dts      |  2 +-
 arch/arm/boot/dts/dra7xx-clocks.dtsi |  6 +++---
 arch/arm/boot/dts/omap2430-sdp.dts   | 32 ++++++++++++++++----------------
 arch/arm/configs/multi_v7_defconfig  |  2 +-
 arch/arm/configs/omap2plus_defconfig |  2 ++
 arch/arm/configs/shmobile_defconfig  |  3 +--
 arch/arm/mach-omap2/clock.h          |  2 --
 arch/arm/mach-omap2/id.c             |  8 ++++++--
 arch/arm/mach-omap2/soc.h            |  1 +
 drivers/iommu/Kconfig                |  2 +-
 13 files changed, 42 insertions(+), 39 deletions(-)

[GIT PULL 1/3]

[Arnd Bergmann]

The following changes since commit 8918465163171322c77a19d5258a95f56d89d2e4:

  memory: Add NVIDIA Tegra memory controller support (2014-12-04 16:11:47 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt2-for-linus

for you to fetch changes up to 1d5f497d87c7d960c27cdc40e7563b0ae88387d3:

  Merge tag 'tegra-for-3.19-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt2 (2014-12-04 17:21:49 +0100)

----------------------------------------------------------------
ARM: SoC DT updates for 3.19, part 2

This is a follow-up to the early ARM SoC DT changes, with additional
content that has external dependencies:

* The Tegra IOMMU DT support depends on changes from the iommu
  tree, plus the contents of the arm-soc drivers branch
* The MVEBU PHY support depends on changes from the phy tree
* The AT91 DT support depends on changes from the RTC and
  DMA-slave trees

All of these changes just enable additional devices for
existing platforms.

----------------------------------------------------------------
Alexandre Belloni (1):
      ARM: at91/dt: at91sam9rl: add rtc

Arnd Bergmann (6):
      Merge branch 'topic/at_xdmac' of git://git.infradead.org/users/vkoul/slave-dma into next/dt
      Merge tag 'at91-dt2' of git://git.kernel.org/.../nferre/linux-at91 into next/dt2
      Merge tag 'v3.18-rc4' into next/dt2
      Merge tag 'depends/phy-dt-header' into next/dt2
      Merge tag 'mvebu-dt-usb-phy-3.19-3' of git://git.infradead.org/linux-mvebu into next/dt2
      Merge tag 'tegra-for-3.19-dt' of git://git.kernel.org/.../tegra/linux into next/dt2

Boris Brezillon (5):
      ARM: at91/dt: add RTT nodes to at91 dtsis
      ARM: at91/dt: add GPBR nodes
      ARM: at91/dt: enable the RTT block on the sam9g20ek board
      ARM: at91/dt: enable the RTT block on the at91sam9m10g45ek board
      ARM: at91/dt: at91sam9g45: add ISI node

Gregory CLEMENT (2):
      ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375
      ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375

Jason Cooper (1):
      Merge tag 'tags/phy-dt-header' into mvebu/dt-usb_phy

Ludovic Desroches (2):
      ARM: at91/dt: sama5d4: use macro instead of numeric value
      ARM: at91/dt: sama5d4: add DMA support

Nicolas Ferre (3):
      Merge branch 'at91-3.19-dt' into at91-3.19-dt2
      Merge branch 'topic/at_xdmac' of git://git.infradead.org/users/vkoul/slave-dma into at91-3.19-dt2
      ARM: at91: fix GPLv2 wording

Sean Paul (1):
      ARM: tegra: Add APB_MISC_GP as a MIPI pad control bank

Thierry Reding (7):
      Merge branch 'for-3.19/iommu' into for-3.19/dt
      ARM: tegra: Add memory controller support for Tegra30
      ARM: tegra: Add memory controller support for Tegra114
      ARM: tegra: Add memory controller support for Tegra124
      ARM: tegra: Enable IOMMU for display controllers on Tegra30
      ARM: tegra: Enable IOMMU for display controllers on Tegra114
      ARM: tegra: Enable IOMMU for display controllers on Tegra124

 arch/arm/boot/dts/armada-375.dtsi           | 11 +++++
 arch/arm/boot/dts/at91-sama5d4ek.dts        |  4 +-
 arch/arm/boot/dts/at91sam9260.dtsi          | 14 ++++++
 arch/arm/boot/dts/at91sam9261.dtsi          | 14 ++++++
 arch/arm/boot/dts/at91sam9263.dtsi          | 21 ++++++++
 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 14 ++++++
 arch/arm/boot/dts/at91sam9g45.dtsi          | 46 ++++++++++++++++++
 arch/arm/boot/dts/at91sam9m10g45ek.dts      |  9 ++++
 arch/arm/boot/dts/at91sam9rl.dtsi           | 21 ++++++++
 arch/arm/boot/dts/sama5d4.dtsi              | 75 +++++++++++++++++++++++++++--
 arch/arm/boot/dts/tegra114.dtsi             | 23 +++++----
 arch/arm/boot/dts/tegra124.dtsi             | 19 +++++++-
 arch/arm/boot/dts/tegra30.dtsi              | 25 +++++-----
 13 files changed, 267 insertions(+), 29 deletions(-)

[GIT PULL 3/3] ARM: SoC/iommu configuration for 3.19

[Arnd Bergmann]

The following changes since commit 5d01410fe4d92081f349b013a2e7a95429e4f2c9:

  Linux 3.18-rc6 (2014-11-23 15:25:20 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/iommu-config-for-linus

for you to fetch changes up to fd522d279235b8bcafc39c1040895fe2d938d1e7:

  Merge tag 'of-iommu-configure' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/iommu-config (2014-12-05 17:45:38 +0100)

----------------------------------------------------------------
ARM: SoC/iommu configuration for 3.19

The iomm-config branch contains work from Will Deacon, quoting his description:

    This series adds automatic IOMMU and DMA-mapping configuration for
    OF-based DMA masters described using the generic IOMMU devicetree
    bindings. Although there is plenty of future work around splitting up
    iommu_ops, adding default IOMMU domains and sorting out automatic IOMMU
    group creation for the platform_bus, this is already useful enough for
    people to port over their IOMMU drivers and start using the new probing
    infrastructure (indeed, Marek has patches queued for the Exynos IOMMU).

The branch touches core ARM and IOMMU driver files, and the respective
maintainers (Russell King and Joerg Roedel) agreed to have the contents
merged through the arm-soc tree. The final version was ready just before
the merge window, so we ended up delaying it a bit longer than the rest,
but we don't expect to see regressions because this is just additional
infrastructure that will get used in drivers starting in 3.20 but is
unused so far.

---

Please note the non-obvious conflict resolution, Stephen got it
right in linux-next: https://lkml.org/lkml/2014/12/8/83

----------------------------------------------------------------
Arnd Bergmann (1):
      Merge tag 'of-iommu-configure' of git://git.kernel.org/.../will/linux into next/iommu-config

Marek Szyprowski (1):
      iommu: fix initialization without 'add_device' callback

Robin Murphy (1):
      iommu: store DT-probed IOMMU data privately

Will Deacon (7):
      iommu: provide early initialisation hook for IOMMU drivers
      dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
      iommu: add new iommu_ops callback for adding an OF device
      iommu: provide helper function to configure an IOMMU for an of master
      dma-mapping: detect and configure IOMMU in of_dma_configure
      arm: call iommu_init before of_platform_populate
      arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_ops

 arch/arm/include/asm/dma-mapping.h | 12 ++---
 arch/arm/kernel/setup.c            |  2 +
 arch/arm/mm/dma-mapping.c          | 83 ++++++++++++++++++++++++++++++++---
 drivers/iommu/Kconfig              |  2 +-
 drivers/iommu/iommu.c              |  2 +-
 drivers/iommu/of_iommu.c           | 89 ++++++++++++++++++++++++++++++++++++++
 drivers/of/platform.c              | 50 +++++++++++----------
 include/asm-generic/vmlinux.lds.h  |  2 +
 include/linux/dma-mapping.h        | 13 +++---
 include/linux/iommu.h              |  8 ++++
 include/linux/of_iommu.h           | 23 ++++++++++
 11 files changed, 242 insertions(+), 44 deletions(-)

[GIT PULL 2/3] ARM: SoC DT updates for 3.19, part 2

[Arnd Bergmann]

Sorry for the broken subject line in the previous mail, this has the
same contents with the right subject.

8<-------
The following changes since commit 8918465163171322c77a19d5258a95f56d89d2e4:

  memory: Add NVIDIA Tegra memory controller support (2014-12-04 16:11:47 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt2-for-linus

for you to fetch changes up to 1d5f497d87c7d960c27cdc40e7563b0ae88387d3:

  Merge tag 'tegra-for-3.19-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt2 (2014-12-04 17:21:49 +0100)

----------------------------------------------------------------
ARM: SoC DT updates for 3.19, part 2

This is a follow-up to the early ARM SoC DT changes, with additional
content that has external dependencies:

* The Tegra IOMMU DT support depends on changes from the iommu
  tree, plus the contents of the arm-soc drivers branch
* The MVEBU PHY support depends on changes from the phy tree
* The AT91 DT support depends on changes from the RTC and
  DMA-slave trees

All of these changes just enable additional devices for
existing platforms.

----------------------------------------------------------------
Alexandre Belloni (1):
      ARM: at91/dt: at91sam9rl: add rtc

Arnd Bergmann (6):
      Merge branch 'topic/at_xdmac' of git://git.infradead.org/users/vkoul/slave-dma into next/dt
      Merge tag 'at91-dt2' of git://git.kernel.org/.../nferre/linux-at91 into next/dt2
      Merge tag 'v3.18-rc4' into next/dt2
      Merge tag 'depends/phy-dt-header' into next/dt2
      Merge tag 'mvebu-dt-usb-phy-3.19-3' of git://git.infradead.org/linux-mvebu into next/dt2
      Merge tag 'tegra-for-3.19-dt' of git://git.kernel.org/.../tegra/linux into next/dt2

Boris Brezillon (5):
      ARM: at91/dt: add RTT nodes to at91 dtsis
      ARM: at91/dt: add GPBR nodes
      ARM: at91/dt: enable the RTT block on the sam9g20ek board
      ARM: at91/dt: enable the RTT block on the at91sam9m10g45ek board
      ARM: at91/dt: at91sam9g45: add ISI node

Gregory CLEMENT (2):
      ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375
      ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375

Jason Cooper (1):
      Merge tag 'tags/phy-dt-header' into mvebu/dt-usb_phy

Ludovic Desroches (2):
      ARM: at91/dt: sama5d4: use macro instead of numeric value
      ARM: at91/dt: sama5d4: add DMA support

Nicolas Ferre (3):
      Merge branch 'at91-3.19-dt' into at91-3.19-dt2
      Merge branch 'topic/at_xdmac' of git://git.infradead.org/users/vkoul/slave-dma into at91-3.19-dt2
      ARM: at91: fix GPLv2 wording

Sean Paul (1):
      ARM: tegra: Add APB_MISC_GP as a MIPI pad control bank

Thierry Reding (7):
      Merge branch 'for-3.19/iommu' into for-3.19/dt
      ARM: tegra: Add memory controller support for Tegra30
      ARM: tegra: Add memory controller support for Tegra114
      ARM: tegra: Add memory controller support for Tegra124
      ARM: tegra: Enable IOMMU for display controllers on Tegra30
      ARM: tegra: Enable IOMMU for display controllers on Tegra114
      ARM: tegra: Enable IOMMU for display controllers on Tegra124

 arch/arm/boot/dts/armada-375.dtsi           | 11 +++++
 arch/arm/boot/dts/at91-sama5d4ek.dts        |  4 +-
 arch/arm/boot/dts/at91sam9260.dtsi          | 14 ++++++
 arch/arm/boot/dts/at91sam9261.dtsi          | 14 ++++++
 arch/arm/boot/dts/at91sam9263.dtsi          | 21 ++++++++
 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 14 ++++++
 arch/arm/boot/dts/at91sam9g45.dtsi          | 46 ++++++++++++++++++
 arch/arm/boot/dts/at91sam9m10g45ek.dts      |  9 ++++
 arch/arm/boot/dts/at91sam9rl.dtsi           | 21 ++++++++
 arch/arm/boot/dts/sama5d4.dtsi              | 75 +++++++++++++++++++++++++++--
 arch/arm/boot/dts/tegra114.dtsi             | 23 +++++----
 arch/arm/boot/dts/tegra124.dtsi             | 19 +++++++-
 arch/arm/boot/dts/tegra30.dtsi              | 25 +++++-----
 13 files changed, 267 insertions(+), 29 deletions(-)