2 files changed, 39 insertions, 0 deletions

diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c
index ccfff33e00b7..fdf14c1abd14 100644
--- a/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@ -29,6 +29,7 @@
 #define RST_DEVICES_L                   0x004
 #define RST_DEVICES_H                   0x008
 #define RST_DEVICES_U                   0x00C
+#define RST_DFLL_DVCO                   0x2F4
 #define RST_DEVICES_V                   0x358
 #define RST_DEVICES_W                   0x35C
 #define RST_DEVICES_X                   0x28C
@@ -47,6 +48,9 @@
 #define CPU_FINETRIM_R                  0x4e4   /* rise->rise prop dly inc A */
 #define RST_DEVICES_NUM                 5
 
+/* RST_DFLL_DVCO bitfields */
+#define DVFS_DFLL_RESET_SHIFT           0
+
 /* CPU_FINETRIM_SELECT and CPU_FINETRIM_DR bitfields */
 #define CPU_FINETRIM_1_FCPU_1           BIT(0)  /* fcpu0 */
 #define CPU_FINETRIM_1_FCPU_2           BIT(1)  /* fcpu1 */
@@ -2248,6 +2252,39 @@ void tegra114_clock_tune_cpu_trimmers_init(void)
 }
 EXPORT_SYMBOL(tegra114_clock_tune_cpu_trimmers_init);
 
+/**
+ * tegra114_clock_assert_dfll_dvco_reset - assert the DFLL's DVCO reset
+ *
+ * Assert the reset line of the DFLL's DVCO.  No return value.
+ */
+void tegra114_clock_assert_dfll_dvco_reset(void)
+{
+        u32 v;
+
+        v = readl_relaxed(clk_base + RST_DFLL_DVCO);
+        v |= (1 << DVFS_DFLL_RESET_SHIFT);
+        writel_relaxed(v, clk_base + RST_DFLL_DVCO);
+        tegra114_car_barrier();
+}
+EXPORT_SYMBOL(tegra114_clock_assert_dfll_dvco_reset);
+
+/**
+ * tegra114_clock_deassert_dfll_dvco_reset - deassert the DFLL's DVCO reset
+ *
+ * Deassert the reset line of the DFLL's DVCO, allowing the DVCO to
+ * operate.  No return value.
+ */
+void tegra114_clock_deassert_dfll_dvco_reset(void)
+{
+        u32 v;
+
+        v = readl_relaxed(clk_base + RST_DFLL_DVCO);
+        v &= ~(1 << DVFS_DFLL_RESET_SHIFT);
+        writel_relaxed(v, clk_base + RST_DFLL_DVCO);
+        tegra114_car_barrier();
+}
+EXPORT_SYMBOL(tegra114_clock_deassert_dfll_dvco_reset);
+
 static void __init tegra114_clock_init(struct device_node *np)
 {
         struct device_node *node;
diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h
index 554814c67825..07cfacd91686 100644
--- a/drivers/clk/tegra/clk.h
+++ b/drivers/clk/tegra/clk.h
@@ -590,6 +590,8 @@ void tegra_init_dup_clks(struct tegra_clk_duplicate *dup_list,
 void tegra114_clock_tune_cpu_trimmers_high(void);
 void tegra114_clock_tune_cpu_trimmers_low(void);
 void tegra114_clock_tune_cpu_trimmers_init(void);
+void tegra114_clock_assert_dfll_dvco_reset(void);
+void tegra114_clock_deassert_dfll_dvco_reset(void);
 
 typedef void (*tegra_clk_apply_init_table_func)(void);
 extern tegra_clk_apply_init_table_func tegra_clk_apply_init_table;