Add initial support for optional reset lines. For now, simply deassert
resets on driver probe and assert them back on driver remove.
Signed-off-by: Ivan Bornyakov <[email protected]>
---
.../media/platform/chips-media/wave5/wave5-vpu.c | 16 +++++++++++++++-
.../platform/chips-media/wave5/wave5-vpuapi.h | 1 +
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
index 1b3df5b04249..1e631da58e15 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
@@ -10,6 +10,7 @@
#include <linux/clk.h>
#include <linux/firmware.h>
#include <linux/interrupt.h>
+#include <linux/reset.h>
#include "wave5-vpu.h"
#include "wave5-regdefine.h"
#include "wave5-vpuconfig.h"
@@ -151,6 +152,16 @@ static int wave5_vpu_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, dev);
dev->dev = &pdev->dev;
+ dev->resets = devm_reset_control_array_get_optional_exclusive(&pdev->dev);
+ if (IS_ERR(dev->resets)) {
+ return dev_err_probe(&pdev->dev, PTR_ERR(dev->resets),
+ "Failed to get reset control\n");
+ }
+
+ ret = reset_control_deassert(dev->resets);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to deassert resets\n");
+
ret = devm_clk_bulk_get_all(&pdev->dev, &dev->clks);
/* continue without clock, assume externally managed */
@@ -163,7 +174,7 @@ static int wave5_vpu_probe(struct platform_device *pdev)
ret = clk_bulk_prepare_enable(dev->num_clks, dev->clks);
if (ret) {
dev_err(&pdev->dev, "Enabling clocks, fail: %d\n", ret);
- return ret;
+ goto err_reset_assert;
}
ret = of_property_read_u32(pdev->dev.of_node, "sram-size",
@@ -246,6 +257,8 @@ static int wave5_vpu_probe(struct platform_device *pdev)
wave5_vdi_release(&pdev->dev);
err_clk_dis:
clk_bulk_disable_unprepare(dev->num_clks, dev->clks);
+err_reset_assert:
+ reset_control_assert(dev->resets);
return ret;
}
@@ -256,6 +269,7 @@ static void wave5_vpu_remove(struct platform_device *pdev)
mutex_destroy(&dev->dev_lock);
mutex_destroy(&dev->hw_lock);
+ reset_control_assert(dev->resets);
clk_bulk_disable_unprepare(dev->num_clks, dev->clks);
wave5_vpu_enc_unregister_device(dev);
wave5_vpu_dec_unregister_device(dev);
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
index 465ff9dfe8b1..da530fd98964 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
@@ -758,6 +758,7 @@ struct vpu_device {
struct ida inst_ida;
struct clk_bulk_data *clks;
int num_clks;
+ struct reset_control *resets;
};
struct vpu_instance;
--
2.44.0
Hey Ivan,
On 25.03.2024 09:40, Ivan Bornyakov wrote:
>Add initial support for optional reset lines. For now, simply deassert
>resets on driver probe and assert them back on driver remove.
LGTM.
Greetings,
Sebastian
>
>Signed-off-by: Ivan Bornyakov <[email protected]>
>---
> .../media/platform/chips-media/wave5/wave5-vpu.c | 16 +++++++++++++++-
> .../platform/chips-media/wave5/wave5-vpuapi.h | 1 +
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>index 1b3df5b04249..1e631da58e15 100644
>--- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
>@@ -10,6 +10,7 @@
> #include <linux/clk.h>
> #include <linux/firmware.h>
> #include <linux/interrupt.h>
>+#include <linux/reset.h>
> #include "wave5-vpu.h"
> #include "wave5-regdefine.h"
> #include "wave5-vpuconfig.h"
>@@ -151,6 +152,16 @@ static int wave5_vpu_probe(struct platform_device *pdev)
> dev_set_drvdata(&pdev->dev, dev);
> dev->dev = &pdev->dev;
>
>+ dev->resets = devm_reset_control_array_get_optional_exclusive(&pdev->dev);
>+ if (IS_ERR(dev->resets)) {
>+ return dev_err_probe(&pdev->dev, PTR_ERR(dev->resets),
>+ "Failed to get reset control\n");
>+ }
>+
>+ ret = reset_control_deassert(dev->resets);
>+ if (ret)
>+ return dev_err_probe(&pdev->dev, ret, "Failed to deassert resets\n");
>+
> ret = devm_clk_bulk_get_all(&pdev->dev, &dev->clks);
>
> /* continue without clock, assume externally managed */
>@@ -163,7 +174,7 @@ static int wave5_vpu_probe(struct platform_device *pdev)
> ret = clk_bulk_prepare_enable(dev->num_clks, dev->clks);
> if (ret) {
> dev_err(&pdev->dev, "Enabling clocks, fail: %d\n", ret);
>- return ret;
>+ goto err_reset_assert;
> }
>
> ret = of_property_read_u32(pdev->dev.of_node, "sram-size",
>@@ -246,6 +257,8 @@ static int wave5_vpu_probe(struct platform_device *pdev)
> wave5_vdi_release(&pdev->dev);
> err_clk_dis:
> clk_bulk_disable_unprepare(dev->num_clks, dev->clks);
>+err_reset_assert:
>+ reset_control_assert(dev->resets);
>
> return ret;
> }
>@@ -256,6 +269,7 @@ static void wave5_vpu_remove(struct platform_device *pdev)
>
> mutex_destroy(&dev->dev_lock);
> mutex_destroy(&dev->hw_lock);
>+ reset_control_assert(dev->resets);
> clk_bulk_disable_unprepare(dev->num_clks, dev->clks);
> wave5_vpu_enc_unregister_device(dev);
> wave5_vpu_dec_unregister_device(dev);
>diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>index 465ff9dfe8b1..da530fd98964 100644
>--- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>+++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
>@@ -758,6 +758,7 @@ struct vpu_device {
> struct ida inst_ida;
> struct clk_bulk_data *clks;
> int num_clks;
>+ struct reset_control *resets;
> };
>
> struct vpu_instance;
>--
>2.44.0
>
>