aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2014-09-11 14:52:08 -0500
committerGerrit Code Review2014-09-11 14:52:09 -0500
commitf47a2017538638c15c969e063c59743753dc365e (patch)
tree89022b1b16204eb6397b6f2007f6ae721be761f6
parent1c6e87f1fb521478832c280ebc46cf483c10ff43 (diff)
parentcb8605ea149322eb96f14b6e9a0701cc00a7f929 (diff)
downloadkernel-audio-f47a2017538638c15c969e063c59743753dc365e.tar.gz
kernel-audio-f47a2017538638c15c969e063c59743753dc365e.tar.xz
kernel-audio-f47a2017538638c15c969e063c59743753dc365e.zip
Merge "C_CAN: D_CAN: DRA75x: fix ram init implementation" into p-ti-linux-3.8.y
-rw-r--r--drivers/net/can/c_can/c_can_platform.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 37323b5b52af..6444f8ca685a 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -102,15 +102,18 @@ static void c_can_hw_raminit_dra7(const struct c_can_priv *priv, bool enable)
102 if (omap_rev() == DRA752_REV_ES1_0) { 102 if (omap_rev() == DRA752_REV_ES1_0) {
103 /* Disable interrupts */ 103 /* Disable interrupts */
104 spin_lock_irqsave(&raminit_lock, flags); 104 spin_lock_irqsave(&raminit_lock, flags);
105 }
106 /* Trigger the RAM initialization */
107 writel(start_set, priv->raminit_ctrlreg);
108 writel(start_clr, priv->raminit_ctrlreg);
109 105
110 if (omap_rev() == DRA752_REV_ES1_0) { 106 /* erratum specific to DRA75x ES 1.0 */
107 /* Trigger the RAM initialization */
108 writel(start_set, priv->raminit_ctrlreg);
109 writel(start_clr, priv->raminit_ctrlreg);
110
111 /* Restore interrupts */ 111 /* Restore interrupts */
112 spin_unlock_irqrestore(&raminit_lock, flags); 112 spin_unlock_irqrestore(&raminit_lock, flags);
113 } 113 } else
114 /* Trigger the RAM initialization */
115 writel(start_set, priv->raminit_ctrlreg);
116
114 } 117 }
115 else { 118 else {
116 writel(start_clr, priv->raminit_ctrlreg); 119 writel(start_clr, priv->raminit_ctrlreg);