3 files changed, 581 insertions, 0 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 68d12794cfd..8de7b9e8fc5 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -451,3 +451,17 @@ config MMC_JZ4740
           SoCs.
           If you have a board based on such a SoC and with a SD/MMC slot,
           say Y or M here.
+
+config MMC_USHC
+        tristate "USB SD Host Controller (USHC) support"
+        depends on USB
+        help
+          This selects support for USB SD Host Controllers based on
+          the Cypress Astoria chip with firmware compliant with CSR's
+          USB SD Host Controller specification (CS-118793-SP).
+
+          CSR boards with this device include: USB<>SDIO (M1985v2),
+          and Ultrasira.
+
+          Note: These controllers only support SDIO cards and do not
+          support MMC or SD memory cards.
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 840bcb52d82..f7fb7eb234b 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
 obj-$(CONFIG_SDH_BFIN)          += bfin_sdh.o
 obj-$(CONFIG_MMC_SH_MMCIF)      += sh_mmcif.o
 obj-$(CONFIG_MMC_JZ4740)        += jz4740_mmc.o
+obj-$(CONFIG_MMC_USHC)          += ushc.o
 
 obj-$(CONFIG_MMC_SDHCI_PLTFM)                   += sdhci-platform.o
 sdhci-platform-y                                := sdhci-pltfm.o
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
new file mode 100644
index 00000000000..b4ead4a13c9
--- /dev/null
+++ b/drivers/mmc/host/ushc.c
@@ -0,0 +1,566 @@
+/*
+ * USB SD Host Controller (USHC) controller driver.
+ *
+ * Copyright (C) 2010 Cambridge Silicon Radio Ltd.
+ *
+ * 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; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * Notes:
+ *   - Only version 2 devices are supported.
+ *   - Version 2 devices only support SDIO cards/devices (R2 response is
+ *     unsupported).
+ *
+ * References:
+ *   [USHC] USB SD Host Controller specification (CS-118793-SP)
+ */
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/kernel.h>
+#include <linux/usb.h>
+#include <linux/slab.h>
+#include <linux/dma-mapping.h>
+#include <linux/mmc/host.h>
+
+enum ushc_request {
+        USHC_GET_CAPS  = 0x00,
+        USHC_HOST_CTRL = 0x01,
+        USHC_PWR_CTRL  = 0x02,
+        USHC_CLK_FREQ  = 0x03,
+        USHC_EXEC_CMD  = 0x04,
+        USHC_READ_RESP = 0x05,
+        USHC_RESET     = 0x06,
+};
+
+enum ushc_request_type {
+        USHC_GET_CAPS_TYPE  = USB_DIR_IN  | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+        USHC_HOST_CTRL_TYPE = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+        USHC_PWR_CTRL_TYPE  = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+        USHC_CLK_FREQ_TYPE  = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+        USHC_EXEC_CMD_TYPE  = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+        USHC_READ_RESP_TYPE = USB_DIR_IN  | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+        USHC_RESET_TYPE     = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+};
+
+#define USHC_GET_CAPS_VERSION_MASK 0xff
+#define USHC_GET_CAPS_3V3      (1 << 8)
+#define USHC_GET_CAPS_3V0      (1 << 9)
+#define USHC_GET_CAPS_1V8      (1 << 10)
+#define USHC_GET_CAPS_HIGH_SPD (1 << 16)
+
+#define USHC_HOST_CTRL_4BIT     (1 << 1)
+#define USHC_HOST_CTRL_HIGH_SPD (1 << 0)
+
+#define USHC_PWR_CTRL_OFF 0x00
+#define USHC_PWR_CTRL_3V3 0x01
+#define USHC_PWR_CTRL_3V0 0x02
+#define USHC_PWR_CTRL_1V8 0x03
+
+#define USHC_READ_RESP_BUSY        (1 << 4)
+#define USHC_READ_RESP_ERR_TIMEOUT (1 << 3)
+#define USHC_READ_RESP_ERR_CRC     (1 << 2)
+#define USHC_READ_RESP_ERR_DAT     (1 << 1)
+#define USHC_READ_RESP_ERR_CMD     (1 << 0)
+#define USHC_READ_RESP_ERR_MASK    0x0f
+
+struct ushc_cbw {
+        __u8 signature;
+        __u8 cmd_idx;
+        __le16 block_size;
+        __le32 arg;
+} __attribute__((packed));
+
+#define USHC_CBW_SIGNATURE 'C'
+
+struct ushc_csw {
+        __u8 signature;
+        __u8 status;
+        __le32 response;
+} __attribute__((packed));
+
+#define USHC_CSW_SIGNATURE 'S'
+
+struct ushc_int_data {
+        u8 status;
+        u8 reserved[3];
+};
+
+#define USHC_INT_STATUS_SDIO_INT     (1 << 1)
+#define USHC_INT_STATUS_CARD_PRESENT (1 << 0)
+
+
+struct ushc_data {
+        struct usb_device *usb_dev;
+        struct mmc_host *mmc;
+
+        struct urb *int_urb;
+        struct ushc_int_data *int_data;
+
+        struct urb *cbw_urb;
+        struct ushc_cbw *cbw;
+
+        struct urb *data_urb;
+
+        struct urb *csw_urb;
+        struct ushc_csw *csw;
+
+        spinlock_t lock;
+        struct mmc_request *current_req;
+        u32 caps;
+        u16 host_ctrl;
+        unsigned long flags;
+        u8 last_status;
+        int clock_freq;
+};
+
+#define DISCONNECTED    0
+#define INT_EN          1
+#define IGNORE_NEXT_INT 2
+
+static void data_callback(struct urb *urb);
+
+static int ushc_hw_reset(struct ushc_data *ushc)
+{
+        return usb_control_msg(ushc->usb_dev, usb_sndctrlpipe(ushc->usb_dev, 0),
+                               USHC_RESET, USHC_RESET_TYPE,
+                               0, 0, NULL, 0, 100);
+}
+
+static int ushc_hw_get_caps(struct ushc_data *ushc)
+{
+        int ret;
+        int version;
+
+        ret = usb_control_msg(ushc->usb_dev, usb_rcvctrlpipe(ushc->usb_dev, 0),
+                              USHC_GET_CAPS, USHC_GET_CAPS_TYPE,
+                              0, 0, &ushc->caps, sizeof(ushc->caps), 100);
+        if (ret < 0)
+                return ret;
+
+        ushc->caps = le32_to_cpu(ushc->caps);
+
+        version = ushc->caps & USHC_GET_CAPS_VERSION_MASK;
+        if (version != 0x02) {
+                dev_err(&ushc->usb_dev->dev, "controller version %d is not supported\n", version);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int ushc_hw_set_host_ctrl(struct ushc_data *ushc, u16 mask, u16 val)
+{
+        u16 host_ctrl;
+        int ret;
+
+        host_ctrl = (ushc->host_ctrl & ~mask) | val;
+        ret = usb_control_msg(ushc->usb_dev, usb_sndctrlpipe(ushc->usb_dev, 0),
+                              USHC_HOST_CTRL, USHC_HOST_CTRL_TYPE,
+                              host_ctrl, 0, NULL, 0, 100);
+        if (ret < 0)
+                return ret;
+        ushc->host_ctrl = host_ctrl;
+        return 0;
+}
+
+static void int_callback(struct urb *urb)
+{
+        struct ushc_data *ushc = urb->context;
+        u8 status, last_status;
+
+        if (urb->status < 0)
+                return;
+
+        status = ushc->int_data->status;
+        last_status = ushc->last_status;
+        ushc->last_status = status;
+
+        /*
+         * Ignore the card interrupt status on interrupt transfers that
+         * were submitted while card interrupts where disabled.
+         *