From: Stephen Boyd <sboyd@kernel.org>
Date: Mon, 21 Dec 2020 01:17:25 +0000 (-0800)
Subject: Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and 'clk... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~8196^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d240d4c20578d8b6dc8b3720534681aa8636fdad;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and 'clk-unused' into clk-next

 - Replace clk-provider.h with of_clk.h when possible

* clk-amlogic:
  clk: meson: g12a: add MIPI DSI Host Pixel Clock
  dt-bindings: clk: g12a-clkc: add DSI Pixel clock bindings
  clk: meson: enable building as modules
  clk: meson: Kconfig: fix dependency for G12A
  clk: meson: axg: add MIPI DSI Host clock
  clk: meson: axg: add Video Clocks
  dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
  dt-bindings: clk: axg-clkc: add Video Clocks

* clk-rockchip:
  clk: rockchip: fix i2s gate bits on rk3066 and rk3188
  clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
  clk: rockchip: Remove redundant null check before clk_prepare_enable
  clk: rockchip: Add appropriate arch dependencies

* clk-of:
  xtensa: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  sh: boards: Replace <linux/clk-provider.h> by <linux/of_clk.h>

* clk-freescale:
  clk: fsl-flexspi: new driver
  dt-bindings: clock: document the fsl-flexspi-clk device
  clk: divider: add devm_clk_hw_register_divider_table()
  clk: qoriq: provide constants for the type
  clk: fsl-sai: use devm_clk_hw_register_composite_pdata()
  clk: composite: add devm_clk_hw_register_composite_pdata()
  clk: fsl-sai: fix memory leak
  clk: qoriq: Add platform dependencies

* clk-unused:
  clk: scpi: mark scpi_clk_match as maybe unused
  clk: pwm: drop of_match_ptr from of_device_id table
---

d240d4c20578d8b6dc8b3720534681aa8636fdad
diff --cc include/linux/clk-provider.h
index 86b7075,86b7075,03a5de5,03a5de5,5f896df,03a5de5..e431689
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@@@@@@ -1060,8 -1060,8 -1060,8 -1060,8 -1087,15 -1060,8 +1087,15 @@@@@@@ struct clk_hw *clk_hw_register_composit
      		const struct clk_parent_data *parent_data, int num_parents,
      		struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
      		struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
++    		struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
++    		unsigned long flags);
++++ +struct clk_hw *devm_clk_hw_register_composite_pdata(struct device *dev,
++++ +		const char *name, const struct clk_parent_data *parent_data,
++++ +		int num_parents,
++++ +		struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
++++ +		struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
  ++ +		struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
  ++ +		unsigned long flags);
      void clk_hw_unregister_composite(struct clk_hw *hw);
      
      struct clk *clk_register(struct device *dev, struct clk_hw *hw);