Merge tag 'versatile-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...
authorOlof Johansson <olof@lixom.net>
Tue, 8 Jul 2014 04:47:03 +0000 (21:47 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jul 2014 04:47:03 +0000 (21:47 -0700)
commit12af7011e958f2d2cef3ec1e2b692fb93f9c3dac
tree3b151e6d039d8d37e47d3db997869f1fecf658ec
parentb040614c5bf6af6657574299fdf0572d47b53366
parenta54c959d8be9d057b1a192e34a378b74dd81c5f6
Merge tag 'versatile-for-3.17' of git://git./linux/kernel/git/robh/linux into next/soc

Merge "DT IRQ and clock support for Versatile platforms" from Rob Herring.

This branch moves IRQ and clock support over to DT for the versatile
platforms.

* tag 'versatile-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  clk: versatile: add versatile OSC support
  dts: versatile: add clock tree
  ARM: timer-sp: allow getting timer1 clock from DT to fallback to legacy clock
  dt/bindings: add compatible string for versatile osc clock
  dt/bindings: arm-boards: add binding for Versatile core module
  dts: versatile: add pl180 compatible strings
  ARM: versatile: remove init_irq hook for DT boot
  ARM: integrator: convert to use irqchip_init
  irqchip: versatile-fpga: add support for arm,versatile-sic
  irqchip: versatile-fpga: Add IRQCHIP_DECLARE support
  dts: versatile: add missing irq controller properties

Tested-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c