clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
Subsystems (2)
PATCH 1/1 clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
From: Miaoqian Lin <[email protected]>
Replace NULL check with IS_ERR_OR_NULL() check after calling rockchip_clk_register_gate_link() since this function returns error pointers (ERR_PTR).
--- drivers/clk/rockchip/clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/rockchip/clk.c +1 -1
@@ -566,7 +566,7 @@ void rockchip_clk_register_late_branches(struct device *dev,break ; } -if (!pdev) +if (IS_ERR_OR_NULL (pdev))dev_err (dev,"failed to register device for clock %s\n" , list->name); } }
Signature · 1 line
2.52.0
PATCH 1/1 clk: rockchip: rk3568: Add PCIe pipe clock gates
From: Shawn Lin <[email protected]>
The PCIe pipe clocks are currently left as orphan clocks and remain enabled indefinitely, which is suboptimal. Add the missing clock gates so the PCIe driver can explicitly manage them when not in use. In order not to break compatibility with old DTB, mark them as CLK_IGNORE_UNUSED.
--- drivers/clk/rockchip/clk-rk3568.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/rockchip/clk-rk3568.c +6 -0
@@ -830,6 +830,8 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = { RK3568_CLKGATE_CON(12), 3, GFLAGS),GATE (CLK_PCIE20_AUX_NDFT ,"clk_pcie20_aux_ndft" ,"xin24m" ,0 ,RK3568_CLKGATE_CON (12 ),4 ,GFLAGS ), +GATE (CLK_PCIE20_PIPE_DFT ,"clk_pcie20_pipe_dft" ,"aclk_pipe" ,CLK_IGNORE_UNUSED , +RK3568_CLKGATE_CON (12 ),5 ,GFLAGS ),GATE (ACLK_PCIE30X1_MST ,"aclk_pcie30x1_mst" ,"aclk_pipe" ,0 ,RK3568_CLKGATE_CON (12 ),8 ,GFLAGS ), GATE(ACLK_PCIE30X1_SLV, "aclk_pcie30x1_slv", "aclk_pipe", 0,
@@ -840,6 +842,8 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = { RK3568_CLKGATE_CON(12), 11, GFLAGS),GATE (CLK_PCIE30X1_AUX_NDFT ,"clk_pcie30x1_aux_ndft" ,"xin24m" ,0 ,RK3568_CLKGATE_CON (12 ),12 ,GFLAGS ), +GATE (CLK_PCIE30X1_PIPE_DFT ,"clk_pcie30x1_pipe_dft" ,"aclk_pipe" ,CLK_IGNORE_UNUSED , +RK3568_CLKGATE_CON (12 ),13 ,GFLAGS ),GATE (ACLK_PCIE30X2_MST ,"aclk_pcie30x2_mst" ,"aclk_pipe" ,0 ,RK3568_CLKGATE_CON (13 ),0 ,GFLAGS ), GATE(ACLK_PCIE30X2_SLV, "aclk_pcie30x2_slv", "aclk_pipe", 0,
@@ -850,6 +854,8 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = { RK3568_CLKGATE_CON(13), 3, GFLAGS),GATE (CLK_PCIE30X2_AUX_NDFT ,"clk_pcie30x2_aux_ndft" ,"xin24m" ,0 ,RK3568_CLKGATE_CON (13 ),4 ,GFLAGS ), +GATE (CLK_PCIE30X2_PIPE_DFT ,"clk_pcie30x2_pipe_dft" ,"aclk_pipe" ,CLK_IGNORE_UNUSED , +RK3568_CLKGATE_CON (13 ),5 ,GFLAGS ),GATE (ACLK_SATA0 ,"aclk_sata0" ,"aclk_pipe" ,0 ,RK3568_CLKGATE_CON (11 ),0 ,GFLAGS ), GATE(CLK_SATA0_PMALIVE, "clk_sata0_pmalive", "gpll_20m", 0,
Signature · 1 line
2.52.0
Sascha Hauer
AppliedRe: [PATCH] clk: rockchip: rk3568: Add PCIe pipe clock gates
Quoted 6 lines · Alexander Shiyan
The PCIe pipe clocks are currently left as orphan clocks and remain enabled indefinitely, which is suboptimal. Add the missing clock gates so the PCIe driver can explicitly manage them when not in use. In order not to break compatibility with old DTB, mark them as
CLK_IGNORE_UNUSED.
Applied, thanks!
[1/1] clk: rockchip: rk3568: Add PCIe pipe clock gates
https://git.pengutronix.de/cgit/barebox/commit/?id=28f3a11c9a73 (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>
Sascha Hauer
AppliedRe: [PATCH] clk: rockchip: rk3568: Add PCIe pipe clock gates
In reply to Alexander ShiyanQuoted 6 lines · Alexander Shiyan
The PCIe pipe clocks are currently left as orphan clocks and remain enabled indefinitely, which is suboptimal. Add the missing clock gates so the PCIe driver can explicitly manage them when not in use. In order not to break compatibility with old DTB, mark them as
CLK_IGNORE_UNUSED.
Applied, thanks!
[1/1] clk: rockchip: rk3568: Add PCIe pipe clock gates
https://git.pengutronix.de/cgit/barebox/commit/?id=28f3a11c9a73 (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>
Sascha Hauer
AppliedHi Alexander,
Quoted 6 lines · Alexander Shiyan
From: Miaoqian Lin <[email protected]>
Replace NULL check with
IS_ERR_OR_NULL()check after callingrockchip_clk_register_gate_link()since this function returns error pointers (ERR_PTR).
Quoted 8 lines
Fixes c62fa612cfa6 ("clk: rockchip: implement linked gate clock support")Signed-off-by Miaoqian Lin <[email protected]>Signed-off-by Heiko Stuebner <[email protected]>Signed-off-by Alexander Shiyan <[email protected]>--- drivers/clk/rockchip/clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
BTW better quote the whole Linux commit message including the tags and make yourself the author of the patch. The original Linux commit authors and reviewers are likely not interested in that the patch is merged in barebox. Also when the original patch carries a reviewed-by: tag this is only valid in the Linux context, not in barebox.
Sascha
Quoted 19 lines
drivers/clk/rockchip/clk.c +1
-1@@ -566,7 +566,7 @@ void rockchip_clk_register_late_branches(struct device *dev,break ; } -if (!pdev) +if (IS_ERR_OR_NULL (pdev))dev_err (dev,"failed to register device for clock %s\n" , list->name); } }Signature · 1 line
2.52.0
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Sascha Hauer
AppliedRe: (subset) [PATCH] clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
In reply to Alexander ShiyanQuoted 5 lines · Alexander Shiyan
Replace NULL check with
IS_ERR_OR_NULL()check after callingrockchip_clk_register_gate_link()since this function returns error pointers (ERR_PTR).
Applied, thanks!
[1/1] clk: rockchip: Fix error pointer check after rockchip_clk_register_gate_link()
https://git.pengutronix.de/cgit/barebox/commit/?id=6a11a80667cd (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>