Skip to content
  • Linus Torvalds's avatar
    Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 0eff4589
    Linus Torvalds authored
    Pull clk updates from Stephen Boyd:
     "It's the usual big pile of driver updates and additions, but we do
      have a couple core changes in here as well.
    
      Core:
    
       - CLK_IS_CRITICAL support has been added.  This should allow drivers
         to properly express that a certain clk should stay on even if their
         prepare/enable count drops to 0 (and in turn the parents of these
         clks should stay enabled).
    
       - A clk registration API has been added, clk_hw_register(), and an OF
         clk provider API has been added, of_clk_add_hw_provider().  These
         APIs have been put in place to further split clk providers from clk
         consumers, with the goal being to have clk providers never deal
         with struct clk pointers at all.  Conversion of provider drivers is
         on going.  clkdev has also gained support for registering clk_hw
         pointers directly so we can convert drivers that don't use
         devicetree.
    
      New Drivers:
    
       - Marvell ap806 and cp110 system controllers (with clks inside!)
       - Hisilicon Hi3519 clock and reset controller
       - Axis ARTPEC-6 clock controllers
       - Oxford Semiconductor OXNAS clock controllers
       - AXS10X I2S PLL
       - Rockchip RK3399 clock and reset controller
    
      Updates:
    
       - MMC2 and UART2 clks on Samsung Exynos 3250, ACLK on Samsung Exynos
         542x SoCs, and some more clk ID exporting for bus frequency scaling
       - Proper BCM2835 PCM clk support and various other clks
       - i.MX clk updates for i.MX6SX, i.MX7, and VF610
       - Renesas updates for R-Car H3
       - Tegra210 got updates for DisplayPort and HDMI 2.0
       - Rockchip driver refactorings and fixes due to adding RK3399 support"
    
    * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (139 commits)
      clk: fix critical clock locking
      clk: qcom: mmcc-8996: Remove clocks that should be controlled by RPM
      clk: ingenic: Allow divider value to be divided
      clk: sunxi: Add display and TCON0 clocks driver
      clk: rockchip: drop old_rate calculation on pll rate changes
      clk: rockchip: simplify GRF handling in pll clocks
      clk: rockchip: lookup General Register Files in rockchip_clk_init
      clk: rockchip: fix the rk3399 sdmmc sample / drv name
      clk: mvebu: new driver for Armada CP110 system controller
      dt-bindings: arm: add DT binding for Marvell CP110 system controller
      clk: mvebu: new driver for Armada AP806 system controller
      clk: hisilicon: add CRG driver for hi3519 soc
      clk: hisilicon: export some hisilicon APIs to modules
      reset: hisilicon: add reset controller driver for hisilicon SOCs
      clk: bcm/kona: Do not use sizeof on pointer type
      clk: qcom: msm8916: Fix crypto clock flags
      clk: nxp: lpc18xx: Initialize clk_init_data::flags to 0
      clk/axs10x: Add I2S PLL clock driver
      clk: imx7d: fix ahb clock mux 1
      clk: fix comment of devm_clk_hw_register()
      ...
    0eff4589