serial: Move asm-sh/sci.h to linux/serial_sci.h.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 26 Feb 2008 05:52:45 +0000 (14:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 26 Feb 2008 05:52:45 +0000 (14:52 +0900)
This header is needed on other architectures as well (namely h8300),
which currently fails to build without this in place. Rather than
duplicating the port definition completely there, just move this to a
common location instead.

This should get h8300 working again for 2.6.25, in addition to the
changes already pushed by Sato-san in -rc2.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
21 files changed:
arch/sh/kernel/cpu/sh2/setup-sh7619.c
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
arch/sh/kernel/cpu/sh3/setup-sh7705.c
arch/sh/kernel/cpu/sh3/setup-sh770x.c
arch/sh/kernel/cpu/sh3/setup-sh7710.c
arch/sh/kernel/cpu/sh3/setup-sh7720.c
arch/sh/kernel/cpu/sh4/setup-sh4-202.c
arch/sh/kernel/cpu/sh4/setup-sh7750.c
arch/sh/kernel/cpu/sh4/setup-sh7760.c
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/cpu/sh4a/setup-sh7763.c
arch/sh/kernel/cpu/sh4a/setup-sh7770.c
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
arch/sh/kernel/cpu/sh4a/setup-sh7785.c
arch/sh/kernel/cpu/sh4a/setup-shx3.c
drivers/serial/sh-sci.c
include/asm-sh/sci.h [deleted file]
include/linux/serial_sci.h [new file with mode: 0644]

index b230eb278cef73b7f36ce48efb849b3b0f7ca90d..cc530f4d84d679a1418571319cf3b98be02d18fd 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 enum {
        UNUSED = 0,
index db6ef5cecde14b12993f5bbce9b657ba58fa86e1..e98dc4450352c6d1a474d2edfce07c03a723c53b 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 enum {
        UNUSED = 0,
index a564425b905f6572ee710624504dc9283fd9b56b..e6d4ec445dd885d693a39e9b3c4d273ace48db6c 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 enum {
        UNUSED = 0,
index dd0a20a685f716309803fcf652d47ebe4a62b7ba..f581534cb732c08163b274dc452745e957d924d5 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 #include <asm/rtc.h>
 
 enum {
index 9066ed78e28321ed1f9feecbd136b5c1b2f33e3e..d3733b13ea5298194020ee43114ce3bafe8420c4 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 enum {
        UNUSED = 0,
index 0cc0e2bf135dd744676f3b58cf20a900c94644f1..7406c9ad92597c758cab7cecdf3102e48e72f078 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 #include <asm/rtc.h>
 
 enum {
index 3855ea4c21c8acd30ed3f3c0bbf3a4ad598f9d67..8028082527c55a82d835fc32f800a4262dc1bf06 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/io.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 #include <asm/rtc.h>
 
 #define INTC_ICR1      0xA4140010UL
index dab193293f2034c37f36090c1672540da299db0e..7371abf64f8082a902fefc675aec6579ec73b1ac 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
        {
index ae3603aca615017e2296cf094a0a822ec291006a..ec884039b914cb5d424a544da7c41bd67e8a655b 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/io.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct resource rtc_resources[] = {
        [0] = {
index 85f81579b97e54e7494e556c65c86443f3d57e8a..254c5c55ab9170b846d9a9f5b0ac52db0f31e5fa 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 enum {
        UNUSED = 0,
index c0a3f079dfdcda8565c1d3e83394d9b7930c70ac..6d4f50cd4aaf62ece55cce91bdab88c134f6e165 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
        {
index 967e8b69a2f814a1506d23ce72612d1091c295e3..f26b5cdad0d1fd0349665b30ea2c93ecef918ca1 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
        {
index 73c778d40d13f289f33b96f92945b9be49d1af6e..b98b4bc93ec9df41bfd5b61ada70a65b3bd8ba99 100644 (file)
@@ -10,9 +10,9 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
+#include <linux/serial_sci.h>
 #include <linux/mm.h>
 #include <asm/mmzone.h>
-#include <asm/sci.h>
 
 static struct resource usbf_resources[] = {
        [0] = {
index eabd5386812d089efa4084903f9244a21cdc688a..07c988dc9de6fa7bf07e7f315f294cc5e90453c0 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/io.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct resource rtc_resources[] = {
        [0] = {
index 32f4f59a837b41ca36329488597177f6aa1573ef..b9cec48b18088dc0b0239f23b120626d10c5abe3 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
        {
index 293004b526ff98eefa9c0a1f61936e3d551a3396..18dbbe23fea1b172a22532b9cd93005d2eb52562 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/io.h>
-#include <asm/sci.h>
+#include <linux/serial_sci.h>
 
 static struct resource rtc_resources[] = {
        [0] = {
index 74b60e96cdf43bf30d7b7624226116459a0bbbe8..621e7329ec63747b766301e72859a324dee8290e 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
+#include <linux/serial_sci.h>
 #include <linux/io.h>
 #include <linux/mm.h>
 #include <asm/mmzone.h>
-#include <asm/sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
        {
index 4dc958b6b31468a35b11d10536bb005e0d846c2f..bd35f32534b98e11a3e231a16940931915995b43 100644 (file)
@@ -10,9 +10,9 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
+#include <linux/serial_sci.h>
 #include <linux/io.h>
 #include <asm/mmzone.h>
-#include <asm/sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
        {
index 9ce12cb2cebc0d6dfa74dc5bc8fdf77bbf1df6b8..a8c116b80bffc18d8fd0e5c8cf43813076581e67 100644 (file)
@@ -41,6 +41,7 @@
 #include <linux/delay.h>
 #include <linux/console.h>
 #include <linux/platform_device.h>
+#include <linux/serial_sci.h>
 
 #ifdef CONFIG_CPU_FREQ
 #include <linux/notifier.h>
@@ -54,7 +55,6 @@
 #include <asm/kgdb.h>
 #endif
 
-#include <asm/sci.h>
 #include "sh-sci.h"
 
 struct sci_port {
diff --git a/include/asm-sh/sci.h b/include/asm-sh/sci.h
deleted file mode 100644 (file)
index 52e7366..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __ASM_SH_SCI_H
-#define __ASM_SH_SCI_H
-
-#include <linux/serial_core.h>
-
-/*
- * Generic header for SuperH SCI(F)
- *
- * Do not place SH-specific parts in here, sh64 and h8300 depend on this too.
- */
-
-/* Offsets into the sci_port->irqs array */
-enum {
-       SCIx_ERI_IRQ,
-       SCIx_RXI_IRQ,
-       SCIx_TXI_IRQ,
-       SCIx_BRI_IRQ,
-       SCIx_NR_IRQS,
-};
-
-/*
- * Platform device specific platform_data struct
- */
-struct plat_sci_port {
-       void __iomem    *membase;               /* io cookie */
-       unsigned long   mapbase;                /* resource base */
-       unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
-       unsigned int    type;                   /* SCI / SCIF / IRDA */
-       upf_t           flags;                  /* UPF_* flags */
-};
-
-int early_sci_setup(struct uart_port *port);
-
-#endif /* __ASM_SH_SCI_H */
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
new file mode 100644 (file)
index 0000000..893cc53
--- /dev/null
@@ -0,0 +1,32 @@
+#ifndef __LINUX_SERIAL_SCI_H
+#define __LINUX_SERIAL_SCI_H
+
+#include <linux/serial_core.h>
+
+/*
+ * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
+ */
+
+/* Offsets into the sci_port->irqs array */
+enum {
+       SCIx_ERI_IRQ,
+       SCIx_RXI_IRQ,
+       SCIx_TXI_IRQ,
+       SCIx_BRI_IRQ,
+       SCIx_NR_IRQS,
+};
+
+/*
+ * Platform device specific platform_data struct
+ */
+struct plat_sci_port {
+       void __iomem    *membase;               /* io cookie */
+       unsigned long   mapbase;                /* resource base */
+       unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
+       unsigned int    type;                   /* SCI / SCIF / IRDA */
+       upf_t           flags;                  /* UPF_* flags */
+};
+
+int early_sci_setup(struct uart_port *port);
+
+#endif /* __LINUX_SERIAL_SCI_H */