From: Stephen Boyd <sboyd@kernel.org>
Date: Fri, 8 Mar 2019 18:26:59 +0000 (-0800)
Subject: Merge branches 'clk-of-refcount', 'clk-mmio-fixed-clock', 'clk-remove-clps', 'clk... 
X-Git-Tag: v5.1-rc1~34^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e2570031a1a47ff993eb2db68718dad6a2f93ec;p=thirdparty%2Flinux.git

Merge branches 'clk-of-refcount', 'clk-mmio-fixed-clock', 'clk-remove-clps', 'clk-socfpga-parent' and 'clk-struct-size' into clk-next

 - Various DT of_node refcount fixes
 - Support for fixed rate clks populated from an MMIO register
 - Remove clps711x driver as the board support is gone

* clk-of-refcount:
  clk: dove: fix refcount leak in dove_clk_init()
  clk: mv98dx3236: fix refcount leak in mv98dx3236_clk_init()
  clk: armada-xp: fix refcount leak in axp_clk_init()
  clk: kirkwood: fix refcount leak in kirkwood_clk_init()
  clk: armada-370: fix refcount leak in a370_clk_init()
  clk: vf610: fix refcount leak in vf610_clocks_init()
  clk: imx7d: fix refcount leak in imx7d_clocks_init()
  clk: imx6sx: fix refcount leak in imx6sx_clocks_init()
  clk: imx6q: fix refcount leak in imx6q_clocks_init()
  clk: samsung: exynos4: fix refcount leak in exynos4_get_xom()
  clk: socfpga: fix refcount leak
  clk: ti: fix refcount leak in ti_dt_clocks_register()
  clk: qoriq: fix refcount leak in clockgen_init()
  clk: highbank: fix refcount leak in hb_clk_init()

* clk-mmio-fixed-clock:
  clk: Add Fixed MMIO clock driver
  dt-bindings: clk: Add bindings for Fixed MMIO clock

* clk-remove-clps:
  clk: clps711x: Remove board support

* clk-socfpga-parent:
  clk: socfpga: Don't have get_parent for single parent ops

* clk-struct-size:
  clk: imx: imx7ulp: use struct_size() in kzalloc()
---

7e2570031a1a47ff993eb2db68718dad6a2f93ec
diff --cc drivers/clk/Kconfig
index d2f0bb5ba47ea,81cdb4eaca07f,296972518db4d,e5b2fe80eab43,81cdb4eaca07f,e5b2fe80eab43..e705aab9e38ba
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@@@@@ -283,18 -283,10 -283,25 -283,19 -283,10 -283,19 +283,24 @@@@@@@ config COMMON_CLK_STM32H
      	---help---
      	  Support for stm32h7 SoC family clocks
      
 +  + config COMMON_CLK_BD718XX
 +  + 	tristate "Clock driver for ROHM BD718x7 PMIC"
 +  + 	depends on MFD_ROHM_BD718XX
 +  + 	help
 +  + 	  This driver supports ROHM BD71837 and ROHM BD71847
 +  + 	  PMICs clock gates.
 +  + 
++ +++config COMMON_CLK_FIXED_MMIO
++ +++	bool "Clock driver for Memory Mapped Fixed values"
++ +++	depends on COMMON_CLK && OF
++ +++	help
++ +++	  Support for Memory Mapped IO Fixed clocks
++ +++
      source "drivers/clk/actions/Kconfig"
      source "drivers/clk/bcm/Kconfig"
      source "drivers/clk/hisilicon/Kconfig"
  -- -source "drivers/clk/imx/Kconfig"
      source "drivers/clk/imgtec/Kconfig"
 +  + source "drivers/clk/imx/Kconfig"
      source "drivers/clk/ingenic/Kconfig"
      source "drivers/clk/keystone/Kconfig"
      source "drivers/clk/mediatek/Kconfig"