Merge branch 'sh/r8a66597-udc'

2 files changed, 136 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index bdb10c29ef18..1cbd6a3655c3 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -16,6 +16,8 @@
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
+#include <linux/i2c.h>
+#include <linux/usb/r8a66597.h>
 #include <video/sh_mobile_lcdc.h>
 #include <asm/clock.h>
 #include <asm/machvec.h>
@@ -175,6 +177,35 @@ static struct platform_device kfr2r09_sh_lcdc_device = {
         },
 };
 
+static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
+        .on_chip = 1,
+};
+
+static struct resource kfr2r09_usb0_gadget_resources[] = {
+        [0] = {
+                .start  = 0x04d80000,
+                .end    = 0x04d80123,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 65,
+                .end    = 65,
+                .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
+        },
+};
+
+static struct platform_device kfr2r09_usb0_gadget_device = {
+        .name           = "r8a66597_udc",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = NULL,         /*  not use dma */
+                .coherent_dma_mask      = 0xffffffff,
+                .platform_data  = &kfr2r09_usb0_gadget_data,
+        },
+        .num_resources  = ARRAY_SIZE(kfr2r09_usb0_gadget_resources),
+        .resource       = kfr2r09_usb0_gadget_resources,
+};
+
 static struct platform_device *kfr2r09_devices[] __initdata = {
         &kfr2r09_nor_flash_device,
         &kfr2r09_nand_flash_device,
@@ -186,6 +217,74 @@ static struct platform_device *kfr2r09_devices[] __initdata = {
 #define BSC_CS0WCR 0xfec10024
 #define BSC_CS4BCR 0xfec10010
 #define BSC_CS4WCR 0xfec10030
+#define PORT_MSELCRB 0xa4050182
+
+static int kfr2r09_usb0_gadget_i2c_setup(void)
+{
+        struct i2c_adapter *a;
+        struct i2c_msg msg;
+        unsigned char buf[2];
+        int ret;
+
+        a = i2c_get_adapter(0);
+        if (!a)
+                return -ENODEV;
+
+        /* set bit 1 (the second bit) of chip at 0x09, register 0x13 */
+        buf[0] = 0x13;
+        msg.addr = 0x09;
+        msg.buf = buf;
+        msg.len = 1;
+        msg.flags = 0;
+        ret = i2c_transfer(a, &msg, 1);
+        if (ret != 1)
+                return -ENODEV;
+
+        buf[0] = 0;
+        msg.addr = 0x09;
+        msg.buf = buf;
+        msg.len = 1;
+        msg.flags = I2C_M_RD;
+        ret = i2c_transfer(a, &msg, 1);
+        if (ret != 1)
+                return -ENODEV;
+
+        buf[1] = buf[0] | (1 << 1);
+        buf[0] = 0x13;
+        msg.addr = 0x09;
+        msg.buf = buf;
+        msg.len = 2;
+        msg.flags = 0;
+        ret = i2c_transfer(a, &msg, 1);
+        if (ret != 1)
+                return -ENODEV;
+
+        return 0;
+}
+
+static int kfr2r09_usb0_gadget_setup(void)
+{
+        int plugged_in;
+
+        gpio_request(GPIO_PTN4, NULL); /* USB_DET */
+        gpio_direction_input(GPIO_PTN4);
+        plugged_in = gpio_get_value(GPIO_PTN4);
+        if (!plugged_in)
+                return -ENODEV; /* no cable plugged in */
+
+        if (kfr2r09_usb0_gadget_i2c_setup() != 0)
+                return -ENODEV; /* unable to configure using i2c */
+
+        ctrl_outw((ctrl_inw(PORT_MSELCRB) & ~0xc000) | 0x8000, PORT_MSELCRB);
+        gpio_request(GPIO_FN_PDSTATUS, NULL); /* R-standby disables USB clock */
+        gpio_request(GPIO_PTV6, NULL); /* USBCLK_ON */
+        gpio_direction_output(GPIO_PTV6, 1); /* USBCLK_ON = H */
+        msleep(20); /* wait 20ms to let the clock settle */
+        clk_enable(clk_get(NULL, "usb0"));
+        ctrl_outw(0x0600, 0xa40501d4);
+
+        return 0;
+}
 
 static int __init kfr2r09_devices_setup(void)
 {
@@ -245,6 +344,10 @@ static int __init kfr2r09_devices_setup(void)
         gpio_request(GPIO_PTU0, NULL); /* LEDSTDBY/ */
         gpio_direction_output(GPIO_PTU0, 1);
 
+        /* setup USB function */
+        if (kfr2r09_usb0_gadget_setup() == 0)
+                platform_device_register(&kfr2r09_usb0_gadget_device);
+
         return platform_add_devices(kfr2r09_devices,
                                     ARRAY_SIZE(kfr2r09_devices));
 }
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index c04e134474d8..e6bd09f2e14a 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -341,6 +341,35 @@ static struct platform_device sh7724_usb0_host_device = {
         .resource       = sh7724_usb0_host_resources,
 };
 
+static struct r8a66597_platdata sh7724_usb1_gadget_data = {
+        .on_chip = 1,
+};
+
+static struct resource sh7724_usb1_gadget_resources[] = {
+        [0] = {
+                .start  = 0xa4d90000,
+                .end    = 0xa4d90123,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 66,
+                .end    = 66,
+                .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
+        },
+};
+
+static struct platform_device sh7724_usb1_gadget_device = {
+        .name           = "r8a66597_udc",
+        .id             = 1, /* USB1 */
+        .dev = {
+                .dma_mask               = NULL,         /*  not use dma */
+                .coherent_dma_mask      = 0xffffffff,
+                .platform_data          = &sh7724_usb1_gadget_data,
+        },
+        .num_resources  = ARRAY_SIZE(sh7724_usb1_gadget_resources),
+        .resource       = sh7724_usb1_gadget_resources,
+};
+
 static struct platform_device *ms7724se_devices[] __initdata = {
         &heartbeat_device,
         &smc91x_eth_device,
@@ -351,6 +380,7 @@ static struct platform_device *ms7724se_devices[] __initdata = {
         &keysc_device,
         &sh_eth_device,
         &sh7724_usb0_host_device,
+        &sh7724_usb1_gadget_device,
 };
 
 #define EEPROM_OP   0xBA206000
@@ -459,6 +489,9 @@ static int __init devices_setup(void)
         /* enable USB0 port */
         ctrl_outw(0x0600, 0xa40501d4);
 
+        /* enable USB1 port */
+        ctrl_outw(0x0600, 0xa4050192);
+
         /* enable IRQ 0,1,2 */
         gpio_request(GPIO_FN_INTC_IRQ0, NULL);
         gpio_request(GPIO_FN_INTC_IRQ1, NULL);