• Linus Torvalds's avatar
    Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 97e7292a
    Linus Torvalds authored
    Pull arm-soc clk changes from Arnd Bergmann:
     "Clock support is moving to the clk subsystem.  These tegra, omap and
      imx changes are for code that is still platform specific and not (yet)
      part of that subsystem."
    
    Fix up conflicts in arch/arm/mach-{imx/clk-imx51-imx53.c,omap2/Makefile}
    
    * tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
      ARM: imx: clk-imx31: Fix clock id for rnga driver
      ARM: imx: add missing item to the list of clock event modes
      ARM: i.MX5x CSPI: Fixed clock name for CSPI
      ARM: i.MX5x clocks: Fix GPT clocks
      ARM: i.MX5x clocks: Fix parent for PWM clocks
      ARM: i.MX5x clocks: Add EPIT support
      ARM: mx27: Reenable silicon version print
      ARM: clk-imx27: Fix rtc clock id
      ARM: tegra: Provide clock for only one PWM controller
      ARM: tegra: Fix PWM clock programming
      ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
      ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
      ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
      ARM: tegra: Remove second instance of uart clk
      crypto: add clk_prepare/clk_unprepare
      ASoC: tegra: add clk_prepare/clk_unprepare
      staging: nvec: add clk_prepare/clk_unprepare
      spi/tegra: add clk_prepare/clk_unprepare
      Input: tegra-kbc - add clk_prepare/clk_unprepare
      USB: ehci-tegra: add clk_prepare/clk_unprepare
      ...
    97e7292a
Makefile 11.4 KB