diff options
| author | Stuart Menefy <stuart.menefy@st.com> | 2009-08-24 10:13:52 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-24 10:13:52 +0200 |
| commit | 7d9c035150897c2bebedae280505513dbdef2abc (patch) | |
| tree | 266d81ab94b001c32ab10b9d078c0454c87436c3 | |
| parent | sh: Remove implicit sign extension from assembler immediates (diff) | |
| download | linux-7d9c035150897c2bebedae280505513dbdef2abc.tar.xz linux-7d9c035150897c2bebedae280505513dbdef2abc.zip | |
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>
| -rw-r--r-- | arch/sh/include/asm/io.h | 6 |
1 files changed, 5 insertions, 1 deletions
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 } |