• Olof Johansson's avatar
    Merge tag 'renesas-soc2-for-v3.11' of... · 677b5c48
    Olof Johansson authored
    Merge tag 'renesas-soc2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
    
    From Simon Horman:
    Second Round of Renesas ARM-based SoC updates for v3.11
    
    * Ether device name updates for r8a7778 and r8a7779 Sergei Shtylyov
    * Extended clock and driver coverage for r8a7778 by Goda-san and Morimoto-san
    * Extended clock and coverage for r8a73a4 and r8a7790 by  Guennadi Liakhovetski
    * HSCIF support for r8a7790 by Ulrich Hecht
    
    * tag 'renesas-soc2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
      ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
      ARM: shmobile: r8a73a4: add clock definitions and aliases for MMCIF and SDHI
      ARM: shmobile: r8a7778: add support MMC driver
      ARM: shmobile: r8a7778: add support HSPI driver
      ARM: shmobile: r8a7778: add support I2C driver
      ARM: shmobile: r8a7778: add support MMC clock
      ARM: shmobile: r8a7778: add support HSPI clock
      ARM: shmobile: r8a7778: add support I2C clock
      ARM: shmobile: r8a7790: HSCIF support
      ARM: shmobile: r8a7778: fix Ether device name
      ARM: shmobile: r8a7779: fix Ether device name
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/mach-shmobile/clock-r8a7778.c
    	arch/arm/mach-shmobile/include/mach/r8a7778.h
    677b5c48
clock-r8a7778.c 8.83 KB