clk: tegra: Implement reset control reset

Commit Message

Peter De Schrijver March 2, 2017, 2:16 p.m. UTC

From: Mikko Perttunen <[e-mail]>

For completeness, also implement this reset framework API for Tegra.

Signed-off-by: Mikko Perttunen <[e-mail]>
Reviewed-by: Peter De Schrijver <[e-mail]>
Reviewed-by: Arto Merilainen <[e-mail]>
---
 drivers/clk/tegra/clk.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Comments

Thierry Reding March 20, 2017, 1:16 p.m. UTC | #1

On Thu, Mar 02, 2017 at 04:16:16PM +0200, Peter De Schrijver wrote:
> From: Mikko Perttunen <[e-mail]>
> 
> For completeness, also implement this reset framework API for Tegra.
> 
> Signed-off-by: Mikko Perttunen <[e-mail]>
> Reviewed-by: Peter De Schrijver <[e-mail]>
> Reviewed-by: Arto Merilainen <[e-mail]>
> ---
>  drivers/clk/tegra/clk.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)

This was missing a Signed-off-by: from you because you forwarded the
patch. I've added one before applying, under the assumption that you
merely forgot to add it.

Thanks,
Thierry

Patch

diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index b2cdd9a..ba923f0 100644
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
@@ -17,6 +17,7 @@ 
 #include <linux/clkdev.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
+#include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/clk/tegra.h>
 #include <linux/reset-controller.h>
@@ -182,6 +183,20 @@  static int tegra_clk_rst_deassert(struct reset_controller_dev *rcdev,
 	return -EINVAL;
 }
 
+static int tegra_clk_rst_reset(struct reset_controller_dev *rcdev,
+		unsigned long id)
+{
+	int err;
+
+	err = tegra_clk_rst_assert(rcdev, id);
+	if (err)
+		return err;
+
+	udelay(1);
+
+	return tegra_clk_rst_deassert(rcdev, id);
+}
+
 const struct tegra_clk_periph_regs *get_reg_bank(int clkid)
 {
 	int reg_bank = clkid / 32;
@@ -274,6 +289,7 @@  void __init tegra_init_from_table(struct tegra_clk_init_table *tbl,
 static const struct reset_control_ops rst_ops = {
 	.assert = tegra_clk_rst_assert,
 	.deassert = tegra_clk_rst_deassert,
+	.reset = tegra_clk_rst_reset,
 };
 
 static struct reset_controller_dev rst_ctlr = {