1 files changed, 46 insertions, 27 deletions

diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
index 503f766c23a7..8e3de61cd4b8 100644
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/r8a66597-udc.h
@@ -8,16 +8,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 
 #ifndef __R8A66597_H__
@@ -53,6 +43,7 @@
         ((pipenum >= R8A66597_BASE_PIPENUM_ISOC) && \
          (pipenum < (R8A66597_BASE_PIPENUM_ISOC + R8A66597_MAX_NUM_ISOC)))
 
+#define r8a66597_is_sudmac(r8a66597)    (r8a66597->pdata->sudmac)
 struct r8a66597_pipe_info {
         u16     pipe;
         u16     epnum;
@@ -70,6 +61,7 @@ struct r8a66597_request {
 struct r8a66597_ep {
         struct usb_ep           ep;
         struct r8a66597         *r8a66597;
+        struct r8a66597_dma     *dma;
 
         struct list_head        queue;
         unsigned                busy:1;
@@ -85,13 +77,20 @@ struct r8a66597_ep {
         unsigned char           fifoaddr;
         unsigned char           fifosel;
         unsigned char           fifoctr;
-        unsigned char           fifotrn;
         unsigned char           pipectr;
+        unsigned char           pipetre;
+        unsigned char           pipetrn;
+};
+
+struct r8a66597_dma {
+        unsigned                used:1;
+        unsigned                dir:1;  /* 1 = IN(write), 0 = OUT(read) */
 };
 
 struct r8a66597 {
         spinlock_t              lock;
         void __iomem            *reg;
+        void __iomem            *sudmac_reg;
 
 #ifdef CONFIG_HAVE_CLK
         struct clk *clk;
@@ -104,6 +103,7 @@ struct r8a66597 {
         struct r8a66597_ep      ep[R8A66597_MAX_NUM_PIPE];
         struct r8a66597_ep      *pipenum2ep[R8A66597_MAX_NUM_PIPE];
         struct r8a66597_ep      *epaddr2ep[16];
+        struct r8a66597_dma     dma;
 
         struct timer_list       timer;
         struct usb_request      *ep0_req;       /* for internal request */
@@ -124,6 +124,7 @@ struct r8a66597 {
 #define gadget_to_r8a66597(_gadget)     \
                 container_of(_gadget, struct r8a66597, gadget)
 #define r8a66597_to_gadget(r8a66597) (&r8a66597->gadget)
+#define r8a66597_to_dev(r8a66597)       (r8a66597->gadget.dev.parent)
 
 static inline u16 r8a66597_read(struct r8a66597 *r8a66597, unsigned long offset)
 {
@@ -182,12 +183,27 @@ static inline void r8a66597_write(struct r8a66597 *r8a66597, u16 val,
         iowrite16(val, r8a66597->reg + offset);
 }
 
+static inline void r8a66597_mdfy(struct r8a66597 *r8a66597,
+                                 u16 val, u16 pat, unsigned long offset)
+{
+        u16 tmp;
+        tmp = r8a66597_read(r8a66597, offset);
+        tmp = tmp & (~pat);
+        tmp = tmp | val;
+        r8a66597_write(r8a66597, tmp, offset);
+}
+
+#define r8a66597_bclr(r8a66597, val, offset)    \
+                        r8a66597_mdfy(r8a66597, 0, val, offset)
+#define r8a66597_bset(r8a66597, val, offset)    \
+                        r8a66597_mdfy(r8a66597, val, 0, offset)
+
 static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
-                                       unsigned long offset,
+                                       struct r8a66597_ep *ep,
                                        unsigned char *buf,
                                        int len)
 {
-        void __iomem *fifoaddr = r8a66597->reg + offset;
+        void __iomem *fifoaddr = r8a66597->reg + ep->fifoaddr;
         int adj = 0;
         int i;
 
@@ -215,18 +231,12 @@ static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
                         adj = 0x01; /* 16-bit wide */
         }
 
+        if (r8a66597->pdata->wr0_shorted_to_wr1)
+                r8a66597_bclr(r8a66597, MBW_16, ep->fifosel);
         for (i = 0; i < len; i++)
                 iowrite8(buf[i], fifoaddr + adj - (i & adj));
-}
-
-static inline void r8a66597_mdfy(struct r8a66597 *r8a66597,
-                                 u16 val, u16 pat, unsigned long offset)
-{
-        u16 tmp;
-        tmp = r8a66597_read(r8a66597, offset);
-        tmp = tmp & (~pat);
-        tmp = tmp | val;
-        r8a66597_write(r8a66597, tmp, offset);
+        if (r8a66597->pdata->wr0_shorted_to_wr1)
+                r8a66597_bclr(r8a66597, MBW_16, ep->fifosel);
 }
 
 static inline u16 get_xtal_from_pdata(struct r8a66597_platdata *pdata)
@@ -251,12 +261,21 @@ static inline u16 get_xtal_from_pdata(struct r8a66597_platdata *pdata)
         return clock;
 }
 
-#define r8a66597_bclr(r8a66597, val, offset)    \
-                        r8a66597_mdfy(r8a66597, 0, val, offset)
-#define r8a66597_bset(r8a66597, val, offset)    \
-                        r8a66597_mdfy(r8a66597, val, 0, offset)
+static inline u32 r8a66597_sudmac_read(struct r8a66597 *r8a66597,
+                                       unsigned long offset)
+{
+        return ioread32(r8a66597->sudmac_reg + offset);
+}
+
+static inline void r8a66597_sudmac_write(struct r8a66597 *r8a66597, u32 val,
+                                         unsigned long offset)
+{
+        iowrite32(val, r8a66597->sudmac_reg + offset);
+}
 
 #define get_pipectr_addr(pipenum)       (PIPE1CTR + (pipenum - 1) * 2)
+#define get_pipetre_addr(pipenum)       (PIPE1TRE + (pipenum - 1) * 4)
+#define get_pipetrn_addr(pipenum)       (PIPE1TRN + (pipenum - 1) * 4)
 
 #define enable_irq_ready(r8a66597, pipenum)     \
         enable_pipe_irq(r8a66597, pipenum, BRDYENB)