From: Stuart Menefy <stuart.menefy@st.com>
Date: Mon, 24 Aug 2009 08:13:52 +0000 (+0900)
Subject: sh: Read from CCN_PVR instead of ROM for delay.
X-Git-Tag: v2.6.32-rc1~640^2~35^2~14^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d9c035150897c2bebedae280505513dbdef2abc;p=karo-tx-linux.git

sh: Read from CCN_PVR instead of ROM for delay.

Reading from the ROM is not a good idea as it could disturb some
flash operation that it is in progress.

Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index aeecf432d48c..5be45ea4dfec 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -92,8 +92,12 @@
 
 static inline void ctrl_delay(void)
 {
-#ifdef P2SEG
+#ifdef CONFIG_CPU_SH4
+	__raw_readw(CCN_PVR);
+#elif defined(P2SEG)
 	__raw_readw(P2SEG);
+#else
+#error "Need a dummy address for delay"
 #endif
 }