sh: Add support for Solution Engine SH7721 board

diff -uprN a/arch/sh/boards/se/7721/io.c b/arch/sh/boards/se/7721/io.c
@@ -0,0 +1,223 @@
+/*
+ * I/O routine for SH7721 SolutionEngine.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <asm/se.h>
+#include <asm/io.h>
+
+#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
+
+struct iop {
+	unsigned long base;
+	struct iop *(*check) (struct iop *p, unsigned long port);
+	u8 (*inb) (struct iop *p, unsigned long port);
+	u16 (*inw) (struct iop *p, unsigned long port);
+	void (*outb) (struct iop *p, u8 value, unsigned long port);
+	void (*outw) (struct iop *p, u16 value, unsigned long port);
+};
+
+static struct iop *ide_check(struct iop *p, unsigned long port)
+{
+	if (((PA_MRSHPC_IO + 0x1f0) <= port &&
+	      port < (PA_MRSHPC_IO + 0x1f8)) || port = (PA_MRSHPC_IO + 0x3f6))
+		return p;
+	else
+		return NULL;
+}
+
+u8 pcc_inb(struct iop *p, unsigned long port)
+{
+	return ctrl_inb(p->base + port + 0x40000);
+}
+
+u16 pcc_inw(struct iop *p, unsigned long port)
+{
+	return ctrl_inw(p->base + port);
+}
+
+void pcc_outb(struct iop *p, u8 value, unsigned long port)
+{
+	ctrl_outb(value, p->base + port + 0x40000);
+}
+
+void pcc_outw(struct iop *p, u16 value, unsigned long port)
+{
+	ctrl_outw(value, p->base + port);
+}
+
+static struct iop cfiop = {
+	.base	= 0x00000000,
+	.check	= ide_check,
+	.inb	= pcc_inb,
+	.inw	= pcc_inw,
+	.outb	= pcc_outb,
+	.outw	= pcc_outw,
+};
+
+static struct iop *port2iop(unsigned long port)
+{
+	if (cfiop.check(&cfiop, port))
+		return &cfiop;
+	else
+		return NULL;
+}
+
+u8 se7721_inb(unsigned long port)
+{
+	struct iop *p = port2iop(port);
+
+	if (p)
+		return (p->inb)(p, port);
+	else
+		return ctrl_inb(port);
+}
+
+u8 se7721_inb_p(unsigned long port)
+{
+	u8 v = se7721_inb(port);
+
+	ctrl_delay();
+
+	return v;
+}
+
+u16 se7721_inw(unsigned long port)
+{
+	struct iop *p = port2iop(port);
+
+	if (p)
+		return (p->inw)(p, port);
+	else
+		return ctrl_inw(port);
+}
+
+u32 se7721_inl(unsigned long port)
+{
+	return ctrl_inl(port);
+}
+
+void se7721_outb(u8 value, unsigned long port)
+{
+	struct iop *p = port2iop(port);
+
+	if (p)
+		(p->outb)(p, value, port);
+	else
+		ctrl_outb(value, port);
+}
+
+void se7721_outb_p(u8 value, unsigned long port)
+{
+	se7721_outb(value, port);
+	ctrl_delay();
+}
+
+void se7721_outw(u16 value, unsigned long port)
+{
+	struct iop *p = port2iop(port);
+
+	if (p)
+		(p->outw)(p, value, port);
+	else
+		ctrl_outw(value, port);
+}
+
+void se7721_outl(unsigned int value, unsigned long port)
+{
+	ctrl_outl(value, port);
+}
+
+void se7721_insb(unsigned long port, void *addr, unsigned long count)
+{
+	u8 *a = addr;
+	struct iop *p = port2iop(port);
+
+	if (p) {
+		while (count--)
+			*a++ = (p->inb)(p, port);
+	} else {
+		while (count--)
+			*a++ = ctrl_inb(port);
+	}
+}
+
+void se7721_insw(unsigned long port, void *addr, unsigned long count)
+{
+	u16 *a = addr;
+	struct iop *p = port2iop(port);
+
+	if (p) {
+		while (count--)
+			*a++ = (p->inw)(p, port);
+	} else {
+		while (count--)
+			*a++ = ctrl_inw(port);
+	}
+}
+
+void se7721_insl(unsigned long port, void *addr, unsigned long count)
+{
+	u32 *a = addr;
+
+	while (count--)
+		*a++ = ctrl_inl(port);
+}
+
+void se7721_outsb(unsigned long port, const void *addr, unsigned long count)
+{
+	const u8 *a = (unsigned char *)addr;
+	struct iop *p = port2iop(port);
+
+	if (p) {
+		while (count--)
+			(p->outb)(p, *a++, port);
+	} else {
+		while (count--)
+			ctrl_outb(*a++, port);
+	}
+}
+
+void se7721_outsw(unsigned long port, const void *addr, unsigned long count)
+{
+	const u16 *a = (unsigned short *)addr;
+	struct iop *p = port2iop(port);
+
+	if (p) {
+		while (count--)
+			(p->outw)(p, *a++, port);
+	} else {
+		while (count--)
+			ctrl_outw(*a++, port);
+	}
+}
+
+void se7721_outsl(unsigned long port, const void *addr, unsigned long count)
+{
+	const u32 *a = (u32 *)addr;
+
+	while (count--)
+		ctrl_outl(*a++, port);
+}
+
+u8 se7721_readb(void __iomem *addr)
+{
+	if (((PA_MRSHPC_IO + 0x1f0) <= (unsigned long)addr &&
+	    (unsigned long)addr < (PA_MRSHPC_IO + 0x1f8)) ||
+	    (unsigned long)addr = (PA_MRSHPC_IO + 0x3f6))
+		return se7721_inb((unsigned long)addr);
+	else
+		return ctrl_inb((unsigned long)addr);
+}
+
+void se7721_writeb(u8 b, void __iomem *addr)
+{
+	if (((PA_MRSHPC_IO + 0x1f0) <= (unsigned long)addr &&
+	    (unsigned long)addr < (PA_MRSHPC_IO + 0x1f8)) ||
+	    (unsigned long)addr = (PA_MRSHPC_IO + 0x3f6))
+		se7721_outb(b, (unsigned long)addr);
+	else
+		ctrl_outb(b, (unsigned long)addr);
+}

86 lines not on this page · raw message

119 lines not on this page · raw message

diff -uprN a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
@@ -83,6 +83,8 @@ static int __init cf_init_default(void)
 #include <asm/se.h>
 #elif defined(CONFIG_SH_7722_SOLUTION_ENGINE)
 #include <asm/se7722.h>
+#elif defined(CONFIG_SH_7721_SOLUTION_ENGINE)
+#include <asm/se7721.h>
 #endif
 
 /*

@@ -99,7 +101,9 @@ static int __init cf_init_default(void)
  * 0xB0600000 : I/O
  */
 
-#if defined(CONFIG_SH_SOLUTION_ENGINE) || defined(CONFIG_SH_7722_SOLUTION_ENGINE)
+#if defined(CONFIG_SH_SOLUTION_ENGINE) || \
+    defined(CONFIG_SH_7722_SOLUTION_ENGINE) || \
+    defined(CONFIG_SH_7721_SOLUTION_ENGINE)
 static int __init cf_init_se(void)
 {
 	if ((ctrl_inw(MRSHPC_CSR) & 0x000c) != 0)

@@ -155,9 +159,8 @@ static int __init cf_init_se(void)
 
 int __init cf_init(void)
 {
-	if( mach_is_se() || mach_is_7722se() ){
+	if (mach_is_se() || mach_is_7722se() || mach_is_7721se())
 		return cf_init_se();
-	}
 	
 	return cf_init_default();
 }

71 lines not on this page · raw message