usb: r8a66597: Add support for RZ/A series

While the USB HW in the RZ/A is basically the same, there are some
differences from the original versions that were in the SH SoCs.

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 6ef5190..28d2bc8 100644 (file)
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -82,6 +82,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
                }
        } while ((tmp & USBE) != USBE);
        r8a66597_bclr(r8a66597, USBE, SYSCFG0);
                }
        } while ((tmp & USBE) != USBE);
        r8a66597_bclr(r8a66597, USBE, SYSCFG0);

+#if !defined(CONFIG_RZA_USB)

        r8a66597_mdfy(r8a66597, CONFIG_R8A66597_XTAL, XTAL, SYSCFG0);
 
        i = 0;
        r8a66597_mdfy(r8a66597, CONFIG_R8A66597_XTAL, XTAL, SYSCFG0);
 
        i = 0;


@@ -94,6 +95,20 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
                        return -1;
                }
        } while ((tmp & SCKE) != SCKE);
                        return -1;
                }
        } while ((tmp & SCKE) != SCKE);

+#else
+       /*
+        * RZ/A Only:
+        * Bits XTAL(UCKSEL) and UPLLE in SYSCFG0 for USB0 controls both USB0
+        * and USB1, so we must always set the USB0 register
+        */
+#if (CONFIG_R8A66597_XTAL == 1)
+       setbits(le16, R8A66597_BASE0, XTAL);
+#endif
+       mdelay(1);
+       setbits(le16, R8A66597_BASE0, UPLLE);
+       mdelay(1);
+       r8a66597_bset(r8a66597, SUSPM, SUSPMODE0);
+#endif /* CONFIG_RZA_USB */

 #endif /* #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) */
 
        return 0;
 #endif /* #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) */
 
        return 0;


@@ -101,6 +116,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
 
 static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
 {
 
 static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
 {

+#if !defined(CONFIG_RZA_USB)

        r8a66597_bclr(r8a66597, SCKE, SYSCFG0);
        udelay(1);
 #if !defined(CONFIG_SUPERH_ON_CHIP_R8A66597)
        r8a66597_bclr(r8a66597, SCKE, SYSCFG0);
        udelay(1);
 #if !defined(CONFIG_SUPERH_ON_CHIP_R8A66597)


@@ -108,6 +124,15 @@ static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
        r8a66597_bclr(r8a66597, XCKE, SYSCFG0);
        r8a66597_bclr(r8a66597, USBE, SYSCFG0);
 #endif
        r8a66597_bclr(r8a66597, XCKE, SYSCFG0);
        r8a66597_bclr(r8a66597, USBE, SYSCFG0);
 #endif

+#else
+       r8a66597_bclr(r8a66597, SUSPM, SUSPMODE0);
+
+       clrbits(le16, R8A66597_BASE0, UPLLE);
+       mdelay(1);
+       r8a66597_bclr(r8a66597, USBE, SYSCFG0);
+       mdelay(1);
+
+#endif

 }
 
 static void r8a66597_enable_port(struct r8a66597 *r8a66597, int port)
 }
 
 static void r8a66597_enable_port(struct r8a66597 *r8a66597, int port)


@@ -118,7 +143,9 @@ static void r8a66597_enable_port(struct r8a66597 *r8a66597, int port)
        r8a66597_bset(r8a66597, val, get_syscfg_reg(port));
        r8a66597_bset(r8a66597, HSE, get_syscfg_reg(port));
 
        r8a66597_bset(r8a66597, val, get_syscfg_reg(port));
        r8a66597_bset(r8a66597, HSE, get_syscfg_reg(port));
 

+#if !defined(CONFIG_RZA_USB)

        r8a66597_write(r8a66597, BURST | CPU_ADR_RD_WR, get_dmacfg_reg(port));
        r8a66597_write(r8a66597, BURST | CPU_ADR_RD_WR, get_dmacfg_reg(port));

+#endif

 }
 
 static void r8a66597_disable_port(struct r8a66597 *r8a66597, int port)
 }
 
 static void r8a66597_disable_port(struct r8a66597 *r8a66597, int port)


@@ -148,7 +175,9 @@ static int enable_controller(struct r8a66597 *r8a66597)
        if (ret < 0)
                return ret;
 
        if (ret < 0)
                return ret;
 

+#if !defined(CONFIG_RZA_USB)

        r8a66597_bset(r8a66597, CONFIG_R8A66597_LDRV & LDRV, PINCFG);
        r8a66597_bset(r8a66597, CONFIG_R8A66597_LDRV & LDRV, PINCFG);

+#endif

        r8a66597_bset(r8a66597, USBE, SYSCFG0);
 
        r8a66597_bset(r8a66597, INTL, SOFCFG);
        r8a66597_bset(r8a66597, USBE, SYSCFG0);
 
        r8a66597_bset(r8a66597, INTL, SOFCFG);


@@ -266,12 +295,30 @@ static int send_setup_packet(struct r8a66597 *r8a66597, struct usb_device *dev,
        unsigned long setup_addr = USBREQ;
        u16 intsts1;
        int timeout = 3000;
        unsigned long setup_addr = USBREQ;
        u16 intsts1;
        int timeout = 3000;

+#if defined(CONFIG_RZA_USB)
+       u16 dcpctr;
+       int timeout2 = 10000;
+#endif

        u16 devsel = setup->request == USB_REQ_SET_ADDRESS ? 0 : dev->devnum;
 
        r8a66597_write(r8a66597, make_devsel(devsel) |
                                 (8 << dev->maxpacketsize), DCPMAXP);
        r8a66597_write(r8a66597, ~(SIGN | SACK), INTSTS1);
 
        u16 devsel = setup->request == USB_REQ_SET_ADDRESS ? 0 : dev->devnum;
 
        r8a66597_write(r8a66597, make_devsel(devsel) |
                                 (8 << dev->maxpacketsize), DCPMAXP);
        r8a66597_write(r8a66597, ~(SIGN | SACK), INTSTS1);
 

+#if defined(CONFIG_RZA_USB)
+       dcpctr = r8a66597_read(r8a66597, DCPCTR);
+       if ((dcpctr & PID) == PID_BUF) {
+               timeout2 = 10000;
+               while (!(dcpctr & BSTS)) {
+                       dcpctr = r8a66597_read(r8a66597, DCPCTR);
+                       if (timeout2-- < 0) {
+                               printf("DCPCTR clear timeout!\n");
+                               break;
+                       }
+               }
+       }
+#endif
+

        for (i = 0; i < 4; i++) {
                r8a66597_write(r8a66597, le16_to_cpu(p[i]), setup_addr);
                setup_addr += 2;
        for (i = 0; i < 4; i++) {
                r8a66597_write(r8a66597, le16_to_cpu(p[i]), setup_addr);
                setup_addr += 2;

diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index 67dc3c4..baa1660 100644 (file)
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -87,8 +87,10 @@
 #define DEVADD8                0xE0
 #define DEVADD9                0xE2
 #define DEVADDA                0xE4
 #define DEVADD8                0xE0
 #define DEVADD9                0xE2
 #define DEVADDA                0xE4

+#define SUSPMODE0      0x102   /* RZ/A only */

 
 /* System Configuration Control Register */
 
 /* System Configuration Control Register */

+#if !defined(CONFIG_RZA_USB)

 #define        XTAL            0xC000  /* b15-14: Crystal selection */
 #define          XTAL48         0x8000   /* 48MHz */
 #define          XTAL24         0x4000   /* 24MHz */
 #define        XTAL            0xC000  /* b15-14: Crystal selection */
 #define          XTAL48         0x8000   /* 48MHz */
 #define          XTAL24         0x4000   /* 24MHz */


@@ -98,10 +100,17 @@
 #define        SCKE            0x0400  /* b10: USB clock enable */
 #define        PCSDIS          0x0200  /* b9: not CS wakeup */
 #define        LPSME           0x0100  /* b8: Low power sleep mode */
 #define        SCKE            0x0400  /* b10: USB clock enable */
 #define        PCSDIS          0x0200  /* b9: not CS wakeup */
 #define        LPSME           0x0100  /* b8: Low power sleep mode */

+#endif

 #define        HSE             0x0080  /* b7: Hi-speed enable */
 #define        DCFM            0x0040  /* b6: Controller function select  */
 #define        DRPD            0x0020  /* b5: D+/- pull down control */
 #define        DPRPU           0x0010  /* b4: D+ pull up control */
 #define        HSE             0x0080  /* b7: Hi-speed enable */
 #define        DCFM            0x0040  /* b6: Controller function select  */
 #define        DRPD            0x0020  /* b5: D+/- pull down control */
 #define        DPRPU           0x0010  /* b4: D+ pull up control */

+#if defined(CONFIG_RZA_USB)
+#define        XTAL            0x0004  /* b2: Crystal selection */
+#define          XTAL12         0x0004   /* 12MHz */
+#define          XTAL48         0x0000   /* 48MHz */
+#define        UPLLE           0x0002  /* b1: internal PLL control */
+#endif

 #define        USBE            0x0001  /* b0: USB module operation enable */
 
 /* System Configuration Status Register */
 #define        USBE            0x0001  /* b0: USB module operation enable */
 
 /* System Configuration Status Register */


@@ -173,10 +182,15 @@
 #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597)
 #define        MBW             0x0800
 #else
 #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597)
 #define        MBW             0x0800
 #else

+#if !defined(CONFIG_RZA_USB)

 #define        MBW             0x0400  /* b10: Maximum bit width for FIFO access */
 #define        MBW             0x0400  /* b10: Maximum bit width for FIFO access */

+#else
+#define        MBW             0x0800  /* b10: Maximum bit width for FIFO access */
+#endif

 #endif
 #define          MBW_8          0x0000   /*  8bit */
 #define          MBW_16         0x0400   /* 16bit */
 #endif
 #define          MBW_8          0x0000   /*  8bit */
 #define          MBW_16         0x0400   /* 16bit */

+#define          MBW_32         0x0800   /* 32bit */

 #define        BIGEND          0x0100  /* b8: Big endian mode */
 #define          BYTE_LITTLE    0x0000         /* little dendian */
 #define          BYTE_BIG       0x0100         /* big endifan */
 #define        BIGEND          0x0100  /* b8: Big endian mode */
 #define          BYTE_LITTLE    0x0000         /* little dendian */
 #define          BYTE_BIG       0x0100         /* big endifan */


@@ -379,6 +393,9 @@
 #define        USBSPD          0x00C0
 #define        RTPORT          0x0001
 
 #define        USBSPD          0x00C0
 #define        RTPORT          0x0001
 

+/* Suspend Mode Register */
+#define SUSPM          0x4000 /* b14: Suspend */
+

 #define R8A66597_MAX_NUM_PIPE          10
 #define R8A66597_BUF_BSIZE             8
 #define R8A66597_MAX_DEVICE            10
 #define R8A66597_MAX_NUM_PIPE          10
 #define R8A66597_BUF_BSIZE             8
 #define R8A66597_MAX_DEVICE            10


@@ -419,7 +436,7 @@ static inline void r8a66597_read_fifo(struct r8a66597 *r8a66597,
                                      int len)
 {
        int i;
                                      int len)
 {
        int i;

-#if defined(CONFIG_SUPERH_ON_CHIP_R8A66597)
+#if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) || defined(CONFIG_RZA_USB)

        unsigned long fifoaddr = r8a66597->reg + offset;
        unsigned long count;
        unsigned long *p = buf;
        unsigned long fifoaddr = r8a66597->reg + offset;
        unsigned long count;
        unsigned long *p = buf;


@@ -453,7 +470,7 @@ static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
 {
        int i;
        unsigned long fifoaddr = r8a66597->reg + offset;
 {
        int i;
        unsigned long fifoaddr = r8a66597->reg + offset;

-#if defined(CONFIG_SUPERH_ON_CHIP_R8A66597)
+#if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) || defined(CONFIG_RZA_USB)

        unsigned long count;
        unsigned char *pb;
        unsigned long *p = buf;
        unsigned long count;
        unsigned char *pb;
        unsigned long *p = buf;