Merge tag 'renesas-soc-for-v3.15' of...
Merge tag 'renesas-soc-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Renesas ARM Based SoC Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) - Add i2c clocks (portion missing from previous patch due to miss-merge) * r8a7791 (R-Car M2) - Add SATA clocks - Add ZS clock - Wait for status on all MSTP clocks -- Add I2C and VIN clocks * r8a7790 (R-Car H2) - Add PCI USB host clock support - Add Audio DMAC, SATA and VIN clocks - Add Audio DMAC support * r8a7779 (R-Car H1) - Wait for status on selected MSTP clocks * tag 'renesas-soc-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790: Add PCI USB host clock support ARM: shmobile: r7s72100: really add i2c clocks ARM: shmobile: r8a7791: Add SATA clocks ARM: shmobile: r8a7791: Add ZS clock ARM: shmobile: r8a7790: Add SATA clocks ARM: shmobile: r8a7790: Add VIN clock support ARM: shmobile: r8a7790: add Audio DMAC support ARM: shmobile: r8a7790: add Audio DMAC clock ARM: shmobile: r8a7791: Wait for status on all MSTP clocks ARM: shmobile: r8a7791: Add VIN clocks ARM: shmobile: r8a7791: Add I2C clocks ARM: shmobile: r8a7790: Wait for status on all MSTP clocks ARM: shmobile: r8a7779: Wait for status on selected MSTP clocks ARM: shmobile: wait for MSTP clock status to toggle, when enabling it
Showing
- arch/arm/mach-shmobile/clock-r7s72100.c 4 additions, 0 deletionsarch/arm/mach-shmobile/clock-r7s72100.c
- arch/arm/mach-shmobile/clock-r8a7779.c 10 additions, 10 deletionsarch/arm/mach-shmobile/clock-r8a7779.c
- arch/arm/mach-shmobile/clock-r8a7790.c 86 additions, 54 deletionsarch/arm/mach-shmobile/clock-r8a7790.c
- arch/arm/mach-shmobile/clock-r8a7791.c 60 additions, 21 deletionsarch/arm/mach-shmobile/clock-r8a7791.c
- arch/arm/mach-shmobile/include/mach/r8a7790.h 25 additions, 0 deletionsarch/arm/mach-shmobile/include/mach/r8a7790.h
- arch/arm/mach-shmobile/setup-r8a7790.c 90 additions, 0 deletionsarch/arm/mach-shmobile/setup-r8a7790.c
- drivers/sh/clk/cpg.c 38 additions, 0 deletionsdrivers/sh/clk/cpg.c
- include/linux/sh_clk.h 12 additions, 7 deletionsinclude/linux/sh_clk.h
Loading
Please register or sign in to comment