From: Stephen Boyd <sboyd@codeaurora.org>
Date: Wed, 25 Oct 2017 09:37:03 +0000 (-0700)
Subject: Merge tag 'clk-v4.15-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/snawro... 
X-Git-Tag: rel_imx_4.19.35_1.1.0~11230^2~22
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=faa865f18cb7e64fe96fdbeb3662f50050bb8d26;p=linux.git

Merge tag 'clk-v4.15-samsung' of git://git./linux/kernel/git/snawrocki/clk into clk-next

Pull Samsung clk driver updates from Sylwester Nawrocki:

Overall clk/samsung clean up and fixes. Removed remaining unused code
after removal of exynos4212 SoC support; dropped internal data structure
fields and related code for registering clkdev lookup entry for each
possible clock object, clkdev aliases could still be defined if needed
in a separate table; other minor fixes of the clock tree definitions.

* tag 'clk-v4.15-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk:
  clk: samsung: Remove obsolete clkdev alias support
  clk: samsung: Add explicit MPLL, EPLL clkdev aliases in S3C2443 driver
  clk: samsung: Rework clkdev alias handling in S3C2443 driver
  clk: samsung: Rework clkdev alias handling in Exynos5440 driver
  clk: samsung: Drop useless alias in Exynos5420 clk driver
  clk: samsung: Remove clkdev alias support in Exynos5250 clk driver
  clk: samsung: Remove double assignment of CLK_ARM_CLK in Exynos4 driver
  clk: samsung: Remove clkdev alias support in Exynos4 clk driver
  clk: samsung: Remove support for obsolete Exynos4212 CPU clock
  clk: samsung: Remove support for Exynos4212 SoCs in Exynos CLKOUT driver
  clk: samsung: Properly propagate flags in __PLL macro
  clk: samsung: Fix m2m scaler clock on Exynos542x
  clk: samsung: Delete a memory allocation error message in clk-cpu.c
---

faa865f18cb7e64fe96fdbeb3662f50050bb8d26
diff --cc drivers/clk/samsung/clk.c
index aef97b091b50,484abc84a352..8634884aa11c
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@@ -181,10 -181,10 +181,10 @@@ void __init samsung_clk_register_mux(st
  				unsigned int nr_clk)
  {
  	struct clk_hw *clk_hw;
- 	unsigned int idx, ret;
+ 	unsigned int idx;
  
  	for (idx = 0; idx < nr_clk; idx++, list++) {
 -		clk_hw = clk_hw_register_mux(NULL, list->name,
 +		clk_hw = clk_hw_register_mux(ctx->dev, list->name,
  			list->parent_names, list->num_parents, list->flags,
  			ctx->reg_base + list->offset,
  			list->shift, list->width, list->mux_flags, &ctx->lock);
@@@ -252,10 -234,10 +234,10 @@@ void __init samsung_clk_register_gate(s
  				unsigned int nr_clk)
  {
  	struct clk_hw *clk_hw;
- 	unsigned int idx, ret;
+ 	unsigned int idx;
  
  	for (idx = 0; idx < nr_clk; idx++, list++) {
 -		clk_hw = clk_hw_register_gate(NULL, list->name, list->parent_name,
 +		clk_hw = clk_hw_register_gate(ctx->dev, list->name, list->parent_name,
  				list->flags, ctx->reg_base + list->offset,
  				list->bit_idx, list->gate_flags, &ctx->lock);
  		if (IS_ERR(clk_hw)) {