1 files changed, 27 insertions, 2 deletions

diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c
index d7e210f4b55c..82fdc69d5728 100644
--- a/arch/arm/mach-davinci/psc.c
+++ b/arch/arm/mach-davinci/psc.c
@@ -35,7 +35,7 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id)
         struct davinci_soc_info *soc_info = &davinci_soc_info;
 
         if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) {
-                pr_warning("PSC: Bad psc data: 0x%x[%d]\n",
+                pr_warn("PSC: Bad psc data: 0x%x[%d]\n",
                                 (int)soc_info->psc_bases, ctlr);
                 return 0;
         }
@@ -48,6 +48,31 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id)
         return mdstat & BIT(12);
 }
 
+/* Control "reset" line associated with PSC domain */
+void davinci_psc_reset(unsigned int ctlr, unsigned int id, bool reset)
+{
+        u32 mdctl;
+        void __iomem *psc_base;
+        struct davinci_soc_info *soc_info = &davinci_soc_info;
+
+        if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) {
+                pr_warn("PSC: Bad psc data: 0x%x[%d]\n",
+                                (int)soc_info->psc_bases, ctlr);
+                return;
+        }
+
+        psc_base = ioremap(soc_info->psc_bases[ctlr], SZ_4K);
+
+        mdctl = readl(psc_base + MDCTL + 4 * id);
+        if (reset)
+                mdctl &= ~MDCTL_LRST;
+        else
+                mdctl |= MDCTL_LRST;
+        writel(mdctl, psc_base + MDCTL + 4 * id);
+
+        iounmap(psc_base);
+}
+
 /* Enable or disable a PSC domain */
 void davinci_psc_config(unsigned int domain, unsigned int ctlr,
                 unsigned int id, bool enable, u32 flags)
@@ -58,7 +83,7 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr,
         u32 next_state = PSC_STATE_ENABLE;
 
         if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) {
-                pr_warning("PSC: Bad psc data: 0x%x[%d]\n",
+                pr_warn("PSC: Bad psc data: 0x%x[%d]\n",
                                 (int)soc_info->psc_bases, ctlr);
                 return;
         }