Skip to content

Commit fdac035

Browse files
committed
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
2 parents a38fd87 + 7f32917 commit fdac035

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,8 @@ static int __init exynos4x12_isp_clk_probe(struct platform_device *pdev)
115115

116116
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
117117
reg_base = devm_ioremap_resource(dev, res);
118-
if (IS_ERR(reg_base)) {
119-
dev_err(dev, "failed to map registers\n");
118+
if (IS_ERR(reg_base))
120119
return PTR_ERR(reg_base);
121-
}
122120

123121
exynos4x12_save_isp = samsung_clk_alloc_reg_dump(exynos4x12_clk_isp_save,
124122
ARRAY_SIZE(exynos4x12_clk_isp_save));

drivers/clk/samsung/clk-exynos7.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,13 @@ static const struct samsung_gate_clock top1_gate_clks[] __initconst = {
537537
GATE(CLK_ACLK_FSYS0_200, "aclk_fsys0_200", "dout_aclk_fsys0_200",
538538
ENABLE_ACLK_TOP13, 28, CLK_SET_RATE_PARENT |
539539
CLK_IS_CRITICAL, 0),
540+
/*
541+
* This clock is required for the CMU_FSYS1 registers access, keep it
542+
* enabled permanently until proper runtime PM support is added.
543+
*/
540544
GATE(CLK_ACLK_FSYS1_200, "aclk_fsys1_200", "dout_aclk_fsys1_200",
541-
ENABLE_ACLK_TOP13, 24, CLK_SET_RATE_PARENT, 0),
545+
ENABLE_ACLK_TOP13, 24, CLK_SET_RATE_PARENT |
546+
CLK_IS_CRITICAL, 0),
542547

543548
GATE(CLK_SCLK_PHY_FSYS1_26M, "sclk_phy_fsys1_26m",
544549
"dout_sclk_phy_fsys1_26m", ENABLE_SCLK_TOP1_FSYS11,

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ static int s5pv210_audss_clk_probe(struct platform_device *pdev)
7272

7373
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
7474
reg_base = devm_ioremap_resource(&pdev->dev, res);
75-
if (IS_ERR(reg_base)) {
76-
dev_err(&pdev->dev, "failed to map audss registers\n");
75+
if (IS_ERR(reg_base))
7776
return PTR_ERR(reg_base);
78-
}
7977

8078
clk_data = devm_kzalloc(&pdev->dev,
8179
struct_size(clk_data, hws, AUDSS_MAX_CLKS),

0 commit comments

Comments
 (0)