Commit fdac035e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-v5.13-samsung' of... 

Merge tag 'clk-v5.13-samsung' of https://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk into clk-samsung

Pull Samsung clk driver updates from Sylwester Nawrocki:

 - clean up of redundant dev_err() calls after dev_ioremap_resource()
 - fix for the clk-exynos7 driver (part of upcoming Galaxy S6 device
   support)

* tag 'clk-v5.13-samsung' of https://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk:
  clk: samsung: Remove redundant dev_err calls
  clk: exynos7: Mark aclk_fsys1_200 as critical
parents a38fd874 7f329176

drivers/clk/samsung/clk-exynos4412-isp.c

+1 −3
Original line number Diff line number Diff line
@@ -115,10 +115,8 @@ static int __init exynos4x12_isp_clk_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	reg_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(reg_base)) {

		dev_err(dev, "failed to map registers\n");

	if (IS_ERR(reg_base))

		return PTR_ERR(reg_base);

	}



	exynos4x12_save_isp = samsung_clk_alloc_reg_dump(exynos4x12_clk_isp_save,

					ARRAY_SIZE(exynos4x12_clk_isp_save));

drivers/clk/samsung/clk-exynos7.c

+6 −1
Original line number Diff line number Diff line
@@ -537,8 +537,13 @@ static const struct samsung_gate_clock top1_gate_clks[] __initconst = { 
	GATE(CLK_ACLK_FSYS0_200, "aclk_fsys0_200", "dout_aclk_fsys0_200",

		ENABLE_ACLK_TOP13, 28, CLK_SET_RATE_PARENT |

		CLK_IS_CRITICAL, 0),

	/*

	 * This clock is required for the CMU_FSYS1 registers access, keep it

	 * enabled permanently until proper runtime PM support is added.

	 */

	GATE(CLK_ACLK_FSYS1_200, "aclk_fsys1_200", "dout_aclk_fsys1_200",

		ENABLE_ACLK_TOP13, 24, CLK_SET_RATE_PARENT, 0),

		ENABLE_ACLK_TOP13, 24, CLK_SET_RATE_PARENT |

		CLK_IS_CRITICAL, 0),



	GATE(CLK_SCLK_PHY_FSYS1_26M, "sclk_phy_fsys1_26m",

		"dout_sclk_phy_fsys1_26m", ENABLE_SCLK_TOP1_FSYS11,

drivers/clk/samsung/clk-s5pv210-audss.c

+1 −3
Original line number Diff line number Diff line
@@ -72,10 +72,8 @@ static int s5pv210_audss_clk_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	reg_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(reg_base)) {

		dev_err(&pdev->dev, "failed to map audss registers\n");

	if (IS_ERR(reg_base))

		return PTR_ERR(reg_base);

	}



	clk_data = devm_kzalloc(&pdev->dev,

				struct_size(clk_data, hws, AUDSS_MAX_CLKS),