• Olof Johansson's avatar
    Merge tag 'renesas-soc-for-v3.11' of... · b67172ec
    Olof Johansson authored
    Merge tag 'renesas-soc-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
    
    From Simon Horman:
    Renesas ARM-based SoC updates for v3.11
    
    * Increased clock coverage for r8a7740, r8a73a4, r8a7778 and r8a7790
    * Use fixed clock ratio for r8a7778
    * Always use shmobile_setup_delay for sh73a0
    * Add add CPUFreq support for sh73a0
    * Check kick bit before changing rate on sh73a0
    * Do not overwrite all div4 clock operations on sh73a0
    
    * Cleanup SH_FIXED_RATIO_CLK and SH_FIXED_RATIO_CLK macros
    * sh73a0: Use DEFINE_RES_MEM*() everywhere
    * r8a7740: Make private clock arrays static
    * r8a7778: Correct model number
    
    The last four changes listed above are cleanups. I have included them
    in this series as all bar the last one are dependencies of non-cleanup
    patches.
    
    * tag 'renesas-soc-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (27 commits)
      ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate
      ARM: shmobile: sh73a0: do not overwrite all div4 clock operations
      ARM: shmobile: sh73a0: Always use shmobile_setup_delay()
      ARM: shmobile: sh73a0: add CPUFreq support
      ARM: shmobile: sh73a0: add support for adjusting CPU frequency
      ARM: shmobile: r8a7790: add TPU PWM support
      ARM: shmobile: r8a7790: Make private clock arrays static
      ARM: shmobile: r8a7790: add div6 clocks
      ARM: shmobile: r8a7790: add div4 clocks
      ARM: shmobile: r8a7790: add main clock
      ARM: shmobile: r8a7778: Register SDHI device
      ARM: shmobile: r8a7778: add SDHI clock support
      ARM: shmobile: r8a7778: use fixed ratio clock
      ARM: shmobile: r8a7779: Add PCIe clocks
      ARM: shmobile: r8a73a4: add div6 clocks
      ARM: shmobile: r8a73a4: add div4 clocks
      ARM: shmobile: r8a73a4: add pll clocks
      ARM: shmobile: r8a73a4: add main clock
      ARM: shmobile: r8a7740: add TPU PWM support
      ARM: shmobile: r8a7740: Add I2C DT clock names
      ...
    
    Conflicts:
    	arch/arm/mach-shmobile/Kconfig
    	arch/arm/mach-shmobile/include/mach/r8a7778.h
    	arch/arm/mach-shmobile/setup-r8a7778.c
    b67172ec
setup-sh73a0.c 24.1 KB