• Linus Torvalds's avatar
    Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9f639269
    Linus Torvalds authored
    Pull support for new arm SoCs from Olof Johansson:
     "Three new system-on-chip models are supported: the st-ericsson u9540
      in ux500, the sam9n12 in at91 and the emma ev2 in shmobile.
    
      Emma is a little bit special because it is completely unrelated to the
      classic shmobile models, but the new Renesas rmobile SoCs are a
      combination of things from both Emma and shmobile, so it was decided
      to have them all live in one directory.
    
      This also contains updates to existing shmobile soc code as well as
      some related board changes due to dependencies."
    
    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
      mach-shmobile: Use DT_MACHINE for KZM9D V3
      mach-shmobile: Emma Mobile EV2 DT support V3
      mach-shmobile: KZM9D board Ethernet support V3
      mach-shmobile: Emma Mobile EV2 GPIO support V3
      mach-shmobile: Emma Mobile EV2 SMP support V3
      mach-shmobile: KZM9D board support V3
      mach-shmobile: Emma Mobile EV2 SoC base support V3
      gpio: Emma Mobile GPIO driver V2
      ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict
      ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s
      ARM: mach-shmobile: clock-r8a7740: add MMCIF clock
      ARM: mach-shmobile: clock-r8a7740: add SDHI clock
      ARM: mach-shmobile: clock-r8a7740: add USB clock
      ARM: mach-shmobile: clock-r8a7740: add FSI clock
      ARM: mach-shmobile: r8a7740: cleanup I2C workaround method
      ARM: mach-shmobile: r8a7740: add gpio_irq support
      ARM: mach-shmobile: sh7372: Add FSI DMAEngine support
      ARM / mach-shmobile: Use preset_lpj with calibrate_delay()
      ARM: ux500: ioremap differences for DB9540
      ARM: ux500: core U9540 support
      ...
    9f639269
timer.c 2.78 KB