usb: m66592-udc platform data on_chip support

Convert the m66592-udc driver to use the on_chip flag
from platform data to enable on chip behaviour instead
of relying on CONFIG_SUPERH_BUILT_IN_M66592 ugliness.

This makes the code cleaner and also allows us to support
both external and internal m66592 with the same kernel.

It also makes the Kconfig part more future proof since
we with this patch can add support for new processors
with on-chip m66592 without modifying the Kconfig.

The patch adds a m66592 header file for platform data
and ties in platform data to the existing m66592 devices.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 45 insertions, 44 deletions

diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/m66592-udc.h
index 9a9c2bf9fbd..8b960deed68 100644
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/m66592-udc.h
@@ -23,10 +23,12 @@
 #ifndef __M66592_UDC_H__
 #define __M66592_UDC_H__
 
-#if defined(CONFIG_SUPERH_BUILT_IN_M66592) && defined(CONFIG_HAVE_CLK)
+#ifdef CONFIG_HAVE_CLK
 #include <linux/clk.h>
 #endif
 
+#include <linux/usb/m66592.h>
+
 #define M66592_SYSCFG           0x00
 #define M66592_XTAL             0xC000  /* b15-14: Crystal selection */
 #define   M66592_XTAL48          0x8000         /* 48MHz */
@@ -76,11 +78,11 @@
 #define   M66592_P_TST_J         0x0001         /* PERI TEST J */
 #define   M66592_P_TST_NORMAL    0x0000         /* PERI Normal Mode */
 
-#if defined(CONFIG_SUPERH_BUILT_IN_M66592)
+/* built-in registers */
 #define M66592_CFBCFG           0x0A
 #define M66592_D0FBCFG          0x0C
 #define M66592_LITTLE           0x0100  /* b8: Little endian mode */
-#else
+/* external chip case */
 #define M66592_PINCFG           0x0A
 #define M66592_LDRV             0x8000  /* b15: Drive Current Adjust */
 #define M66592_BIGEND           0x0100  /* b8: Big endian mode */
@@ -100,8 +102,8 @@
 #define M66592_PKTM             0x0020  /* b5: Packet mode */
 #define M66592_DENDE            0x0010  /* b4: Dend enable */
 #define M66592_OBUS             0x0004  /* b2: OUTbus mode */
-#endif  /* #if defined(CONFIG_SUPERH_BUILT_IN_M66592) */
 
+/* common case */
 #define M66592_CFIFO            0x10
 #define M66592_D0FIFO           0x14
 #define M66592_D1FIFO           0x18
@@ -113,13 +115,9 @@
 #define M66592_REW              0x4000  /* b14: Buffer rewind */
 #define M66592_DCLRM            0x2000  /* b13: DMA buffer clear mode */
 #define M66592_DREQE            0x1000  /* b12: DREQ output enable */
-#if defined(CONFIG_SUPERH_BUILT_IN_M66592)
-#define M66592_MBW              0x0800  /* b11: Maximum bit width for FIFO */
-#else
-#define M66592_MBW              0x0400  /* b10: Maximum bit width for FIFO */
-#define   M66592_MBW_8           0x0000   /*  8bit */
-#define   M66592_MBW_16          0x0400   /* 16bit */
-#endif  /* #if defined(CONFIG_SUPERH_BUILT_IN_M66592) */
+#define M66592_MBW_8            0x0000   /*  8bit */
+#define M66592_MBW_16           0x0400   /* 16bit */
+#define M66592_MBW_32           0x0800   /* 32bit */
 #define M66592_TRENB            0x0200  /* b9: Transaction counter enable */
 #define M66592_TRCLR            0x0100  /* b8: Transaction counter clear */
 #define M66592_DEZPM            0x0080  /* b7: Zero-length packet mode */
@@ -480,9 +478,11 @@ struct m66592_ep {
 struct m66592 {
         spinlock_t              lock;
         void __iomem            *reg;
-#if defined(CONFIG_SUPERH_BUILT_IN_M66592) && defined(CONFIG_HAVE_CLK)
+#ifdef CONFIG_HAVE_CLK
         struct clk *clk;
 #endif
+        struct m66592_platdata  *pdata;
+        unsigned long           irq_trigger;
 
         struct usb_gadget               gadget;
         struct usb_gadget_driver        *driver;
@@ -546,13 +546,13 @@ static inline void m66592_read_fifo(struct m66592 *m66592,
 {
         unsigned long fifoaddr = (unsigned long)m66592->reg + offset;
 
-#if defined(CONFIG_SUPERH_BUILT_IN_M66592)
-        len = (len + 3) / 4;
-        insl(fifoaddr, buf, len);
-#else
-        len = (len + 1) / 2;
-        insw(fifoaddr, buf, len);
-#endif
+        if (m66592->pdata->on_chip) {
+                len = (len + 3) / 4;
+                insl(fifoaddr, buf, len);
+        } else {
+                len = (len + 1) / 2;
+                insw(fifoaddr, buf, len);
+        }
 }
 
 static inline void m66592_write(struct m66592 *m66592, u16 val,
@@ -566,33 +566,34 @@ static inline void m66592_write_fifo(struct m66592 *m66592,
                 void *buf, unsigned long len)
 {
         unsigned long fifoaddr = (unsigned long)m66592->reg + offset;
-#if defined(CONFIG_SUPERH_BUILT_IN_M66592)
-        unsigned long count;
-        unsigned char *pb;
-        int i;
-
-        count = len / 4;
-        outsl(fifoaddr, buf, count);
-
-        if (len & 0x00000003) {
-                pb = buf + count * 4;
-                for (i = 0; i < (len & 0x00000003); i++) {
-                        if (m66592_read(m66592, M66592_CFBCFG)) /* little */
-                                outb(pb[i], fifoaddr + (3 - i));
-                        else
-                                outb(pb[i], fifoaddr + i);
+
+        if (m66592->pdata->on_chip) {
+                unsigned long count;
+                unsigned char *pb;
+                int i;
+
+                count = len / 4;
+                outsl(fifoaddr, buf, count);
+
+                if (len & 0x00000003) {
+                        pb = buf + count * 4;
+                        for (i = 0; i < (len & 0x00000003); i++) {
+                                if (m66592_read(m66592, M66592_CFBCFG)) /* le */
+                                        outb(pb[i], fifoaddr + (3 - i));
+                                else
+                                        outb(pb[i], fifoaddr + i);
+                        }
+                }
+        } else {
+                unsigned long odd = len & 0x0001;
+
+                len = len / 2;
+                outsw(fifoaddr, buf, len);
+                if (odd) {
+                        unsigned char *p = buf + len*2;
+                        outb(*p, fifoaddr);
                 }
         }
-#else
-        unsigned long odd = len & 0x0001;
-
-        len = len / 2;
-        outsw(fifoaddr, buf, len);
-        if (odd) {
-                unsigned char *p = buf + len*2;
-                outb(*p, fifoaddr);
-        }
-#endif  /* #if defined(CONFIG_SUPERH_BUILT_IN_M66592) */
 }
 
 static inline void m66592_mdfy(struct m66592 *m66592, u16 val, u16 pat,