Due to the merge conflicts, part of the changes in the stable commit
09fc82a6a7a8 ("media: imx-jpeg: Apply clk_bulk api instead of operating
specific clk") was missed. Reapply these codes to fix the following
build failure.
drivers/media/platform/imx-jpeg/mxc-jpeg.c: In function 'mxc_jpeg_probe':
drivers/media/platform/imx-jpeg/mxc-jpeg.c:2112:13: error: 'struct
mxc_jpeg_dev' has no member named 'clk_ipg'
Signed-off-by: Xiaolei Wang <[email protected]>
---
drivers/media/platform/imx-jpeg/mxc-jpeg.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index 2a6466d302df..edda3a7b96ca 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -2108,16 +2108,9 @@ static int mxc_jpeg_probe(struct platform_device *pdev)
jpeg->dev = dev;
jpeg->mode = mode;
- /* Get clocks */
- jpeg->clk_ipg = devm_clk_get(dev, "ipg");
- if (IS_ERR(jpeg->clk_ipg)) {
- dev_err(dev, "failed to get clock: ipg\n");
- goto err_clk;
- }
-
- jpeg->clk_per = devm_clk_get(dev, "per");
- if (IS_ERR(jpeg->clk_per)) {
- dev_err(dev, "failed to get clock: per\n");
+ ret = devm_clk_bulk_get_all(&pdev->dev, &jpeg->clks);
+ if (ret < 0) {
+ dev_err(dev, "failed to get clock\n");
goto err_clk;
}
jpeg->num_clks = ret;
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12268):
https://lists.yoctoproject.org/g/linux-yocto/message/12268
Mute This Topic: https://lists.yoctoproject.org/mt/97726654/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
