sh: Update SuperH SCIF driver

- Changed volatile unsigned to vu_.
- Changed Makefile for kconfig.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/drivers/Makefile b/drivers/Makefile
index 480b3581f642726d082d80338ab5d12472d67d3d..e23b0111d1c35aa1ec3e2358bc47ed774ebd1985 100755 (executable)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -65,6 +65,7 @@ COBJS-y += sed156x.o
 COBJS-y += serial.o
 COBJS-y += serial_max3100.o
 COBJS-y += serial_xuartlite.o
+COBJS-y += serial_sh.o
 COBJS-y += sm501.o
 COBJS-y += smiLynxEM.o
 COBJS-y += usbtty.o

diff --git a/drivers/serial_sh.c b/drivers/serial_sh.c
index fca92fdd8cb7cc87e9ab488a1aa87893880281cc..78186326f0df2e90a84830c93a6cca7c57a14d5f 100644 (file)
--- a/drivers/serial_sh.c
+++ b/drivers/serial_sh.c
@@ -30,24 +30,24 @@
 #error "Default SCIF doesn't set....."
 #endif
 
-#define SCSMR  (volatile unsigned short *)(SCIF_BASE + 0x0)
-#define SCBRR  (volatile unsigned char  *)(SCIF_BASE + 0x4) 
-#define SCSCR  (volatile unsigned short *)(SCIF_BASE + 0x8)
-#define SCFTDR         (volatile unsigned char  *)(SCIF_BASE + 0xC)
-#define SCFSR  (volatile unsigned short *)(SCIF_BASE + 0x10)
-#define SCFRDR         (volatile unsigned char  *)(SCIF_BASE + 0x14)
-#define SCFCR  (volatile unsigned short *)(SCIF_BASE + 0x18)
-#define SCFDR  (volatile unsigned short *)(SCIF_BASE + 0x1C)
+#define SCSMR  (vu_short *)(SCIF_BASE + 0x0)
+#define SCBRR  (vu_char  *)(SCIF_BASE + 0x4) 
+#define SCSCR  (vu_short *)(SCIF_BASE + 0x8)
+#define SCFTDR         (vu_char  *)(SCIF_BASE + 0xC)
+#define SCFSR  (vu_short *)(SCIF_BASE + 0x10)
+#define SCFRDR         (vu_char  *)(SCIF_BASE + 0x14)
+#define SCFCR  (vu_short *)(SCIF_BASE + 0x18)
+#define SCFDR  (vu_short *)(SCIF_BASE + 0x1C)
 #if defined(CONFIG_SH4A)
-#define SCRFDR (volatile unsigned short *)(SCIF_BASE + 0x20)
-#define SCSPTR (volatile unsigned short *)(SCIF_BASE + 0x24)
-#define SCLSR   (volatile unsigned short *)(SCIF_BASE + 0x28)
-#define SCRER  (volatile unsigned short *)(SCIF_BASE + 0x2C)
+#define SCRFDR (vu_short *)(SCIF_BASE + 0x20)
+#define SCSPTR (vu_short *)(SCIF_BASE + 0x24)
+#define SCLSR   (vu_short *)(SCIF_BASE + 0x28)
+#define SCRER  (vu_short *)(SCIF_BASE + 0x2C)
 #elif defined (CONFIG_SH4)
-#define SCSPTR         (volatile unsigned short *)(SCIF_BASE + 0x20)
-#define SCLSR  (volatile unsigned short *)(SCIF_BASE + 0x24)
+#define SCSPTR         (vu_short *)(SCIF_BASE + 0x20)
+#define SCLSR  (vu_short *)(SCIF_BASE + 0x24)
 #elif defined (CONFIG_SH3)
-#define SCLSR  (volatile unsigned short *)(SCIF_BASE + 0x24)
+#define SCLSR  (vu_short *)(SCIF_BASE + 0x24)
 #endif
 
 #define SCR_RE                 (1 << 4)