mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

clk/samsung updates for 5.13

Browse source 
- clean up of redundant dev_err() calls after dev_ioremap_resource()
 - fix for the clk-exynos7 driver (part of upcoming Galaxy S6 device
   support)
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEujTcHEnaPOkZ6f78TVsgp4CceosFAmBwmFIXHHMubmF3cm9j
 a2lAc2Ftc3VuZy5jb20ACgkQTVsgp4Cceov61w//SSXJQyrsy5hLVLnqLjchHVaX
 vyDC5ro2lnFB4TTF/YPMSqebcmGo9EujaTKWPvbmeUYVkebUM220dYnYDb/ozkq1
 bVMFJ+e1KmRC5CEOZt5aXR421GD30KYQfgPQBOO+vjGKs19Gxn1OSUFrk1cn/rUA
 l1mPInXF64oVmi2/kw30/z4/FsfHGwFhUE4CH79t+r6dTSxYZO7NPuKSR/VVVKap
 UkKSNsbZV0Hm2W8WOc4vALKCIYIDwu9aGGn8XOaYAb/H8YTdcZrSnfhG2jBjBc6j
 WINyygiB1KNCHU/oN465SuqjApss1GYCoI54QsF/FW9iGFH43aN607UeAwbVAjS9
 GK5mpWL9O/jhrs6PBLbTuABoiTLeA2W8VjG1wk9aKuL2P4J/i3EdIp4BzFN/Ro26
 TV/U1PtghSoPqN3cAb3IpCzVgxWk6tbwY8rrLWwundnq6yCZGEzXno5f41v2Rg73
 trSitVB/HLHWx/9p76xqCd/7rJjqdDYKrPJMfHRpHsb25Aoqjygb98YFG6URv0L4
 CyV1L3jIdcXGE5e6fNct/D+JT9SgS8KYaDXWULT5DugOuSM2QuaKADpGSiBE50AH
 /RS/npA9IZsx92ZtN3CRu5x2tednMwxkoCw/WNhjC0jL3BpsVRn9MijLAmlEtgaZ
 VsRzwePDVgY/8EphlPE=
 =jpm2
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Stephen Boyd 2021-04-09 12:13:15 -07:00
commit fdac035ed0
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/clk/samsung/clk-exynos4412-isp.c
View file

@ -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));

7
drivers/clk/samsung/clk-exynos7.c
View file

@ -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,

4
drivers/clk/samsung/clk-s5pv210-audss.c
View file

@ -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),