Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 02:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: sh-sci: Fix up h8300 support.

Browse Source 
- Dummy SCIF functions define.
- h8300 specific header include.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Yoshinori Sato 2009-04-28 04:40:15 +00:00 committed by Paul Mundt
parent 54507f6ee9
commit 168f36237b
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/sh-sci.c
View File

@ -54,6 +54,10 @@
#include <asm/sh_bios.h> #include <asm/sh_bios.h>
#endif #endif
#ifdef CONFIG_H8300
#include <asm/gpio.h>
#endif
#include "sh-sci.h" #include "sh-sci.h"
struct sci_port { struct sci_port {

17
drivers/serial/sh-sci.h
View File

@ -317,7 +317,18 @@
} \ } \
} }
#define CPU_SCIF_FNS(name, scif_offset, scif_size) \ #ifdef CONFIG_H8300
/* h8300 don't have SCIF */
#define CPU_SCIF_FNS(name) \
static inline unsigned int sci_##name##_in(struct uart_port *port) \
{ \
return 0; \
} \
static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
{ \
}
#else
#define CPU_SCIF_FNS(name, scif_offset, scif_size) \
static inline unsigned int sci_##name##_in(struct uart_port *port) \ static inline unsigned int sci_##name##_in(struct uart_port *port) \
{ \ { \
SCI_IN(scif_size, scif_offset); \ SCI_IN(scif_size, scif_offset); \
@ -326,6 +337,7 @@
{ \ { \
SCI_OUT(scif_size, scif_offset, value); \ SCI_OUT(scif_size, scif_offset, value); \
} }
#endif
#define CPU_SCI_FNS(name, sci_offset, sci_size) \ #define CPU_SCI_FNS(name, sci_offset, sci_size) \
static inline unsigned int sci_##name##_in(struct uart_port* port) \ static inline unsigned int sci_##name##_in(struct uart_port* port) \
@ -363,7 +375,8 @@
sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \ sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \
h8_sci_offset, h8_sci_size) \ h8_sci_offset, h8_sci_size) \
CPU_SCI_FNS(name, h8_sci_offset, h8_sci_size) CPU_SCI_FNS(name, h8_sci_offset, h8_sci_size)
#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) #define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
CPU_SCIF_FNS(name)
#elif defined(CONFIG_CPU_SUBTYPE_SH7723) ||\ #elif defined(CONFIG_CPU_SUBTYPE_SH7723) ||\
defined(CONFIG_CPU_SUBTYPE_SH7724) defined(CONFIG_CPU_SUBTYPE_SH7724)
#define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scif_offset, sh4_scif_size) \ #define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scif_offset, sh4_scif_size) \