• Olof Johansson's avatar
    Merge tag 'msm-dt-for-3.7' of... · 591346c9
    Olof Johansson authored
    Merge tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/dt
    
    From David Brown:
    
    These patches migrate both the 8660 and 8960 targets on msm to be
    devicetree only.  This also sets most of the frame in place necessary
    to build both targets into the same image.
    
    There's a couple of cleanups in here that are kept in this series
    because they are intimately tied to the changes necessary to support
    the devicetree conversions.
    
    By Stephen Boyd
    via David Brown
    * tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
      ARM: msm: Remove non-DT targets from 8960
      ARM: msm: Add DT support for 8960
      ARM: msm: Move io mapping prototypes to common.h
      ARM: msm: Rename board-msm8x60 to signify its DT only status
      ARM: msm: Make 8660 a DT only target
      ARM: msm: Move 8660 to DT timer
      ARM: msm: Add DT support to msm_timer
      ARM: msm: Allow timer.c to compile on multiple targets
      ARM: msm: Don't touch GIC registers outside of GIC code
      ARM: msm: Add msm8660-surf.dts to Makefile.boot
      ARM: msm: Add handle_irq handler for 8660 DT machine
    
    Resolved trivial context conflict in arch/arm/mach-msm/io.c and a
    remove/change conflict in arch/arm/mach-msm/board-msm8x60.c.
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    591346c9
timer.c 8.82 KB