Merge branch 'master' into for-next

Conflicts:
	arch/arm/mach-omap1/board-nokia770.c

7 files changed, 299 insertions, 20 deletions

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 6a58cb1330c1..4aa00e6e57ad 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -45,7 +45,8 @@ config USB_ARCH_HAS_OHCI
         default y if STB03xxx
         default y if PPC_MPC52xx
         # MIPS:
-        default y if SOC_AU1X00
+        default y if MIPS_ALCHEMY
+        default y if MACH_JZ4740
         # SH:
         default y if CPU_SUBTYPE_SH7720
         default y if CPU_SUBTYPE_SH7721
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index b91115f84b13..1f48ceb55a77 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -61,7 +61,7 @@ DECLARE_UAC_AC_HEADER_DESCRIPTOR(2);
 #define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \
         + UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))
 /* B.3.2  Class-Specific AC Interface Descriptor */
-static struct uac_ac_header_descriptor_v1_2 ac_header_desc = {
+static struct uac1_ac_header_descriptor_2 ac_header_desc = {
         .bLength =              UAC_DT_AC_HEADER_LENGTH,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   UAC_HEADER,
@@ -125,7 +125,7 @@ static struct usb_audio_control_selector feature_unit = {
 };
 
 #define OUTPUT_TERMINAL_ID      3
-static struct uac_output_terminal_descriptor_v1 output_terminal_desc = {
+static struct uac1_output_terminal_descriptor output_terminal_desc = {
         .bLength                = UAC_DT_OUTPUT_TERMINAL_SIZE,
         .bDescriptorType        = USB_DT_CS_INTERFACE,
         .bDescriptorSubtype     = UAC_OUTPUT_TERMINAL,
@@ -155,7 +155,7 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = {
 };
 
 /* B.4.2  Class-Specific AS Interface Descriptor */
-static struct uac_as_header_descriptor_v1 as_header_desc = {
+static struct uac1_as_header_descriptor as_header_desc = {
         .bLength =              UAC_DT_AS_HEADER_SIZE,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   UAC_AS_GENERAL,
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 82506ca297d5..9648b75f0283 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -32,6 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/moduleparam.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 2b56ce621852..b7bf88019b06 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -238,7 +238,7 @@ static const struct usb_interface_descriptor ac_interface_desc = {
 };
 
 /* B.3.2  Class-Specific AC Interface Descriptor */
-static const struct uac_ac_header_descriptor_v1_1 ac_header_desc = {
+static const struct uac1_ac_header_descriptor_1 ac_header_desc = {
         .bLength =              UAC_DT_AC_HEADER_SIZE(1),
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index fc576557d8a5..02864a237a2c 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1031,7 +1031,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ohci_hcd_ep93xx_driver
 #endif
 
-#ifdef CONFIG_SOC_AU1X00
+#ifdef CONFIG_MIPS_ALCHEMY
 #include "ohci-au1xxx.c"
 #define PLATFORM_DRIVER         ohci_hcd_au1xxx_driver
 #endif
@@ -1095,6 +1095,11 @@ MODULE_LICENSE ("GPL");
 #define TMIO_OHCI_DRIVER        ohci_hcd_tmio_driver
 #endif
 
+#ifdef CONFIG_MACH_JZ4740
+#include "ohci-jz4740.c"
+#define PLATFORM_DRIVER ohci_hcd_jz4740_driver
+#endif
+
 #if     !defined(PCI_DRIVER) &&         \
         !defined(PLATFORM_DRIVER) &&    \
         !defined(OMAP1_PLATFORM_DRIVER) &&      \
diff --git a/drivers/usb/host/ohci-jz4740.c b/drivers/usb/host/ohci-jz4740.c
new file mode 100644
index 000000000000..10e1872f3ab9
--- /dev/null
+++ b/drivers/usb/host/ohci-jz4740.c
@@ -0,0 +1,276 @@
+/*
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ *  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.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/regulator/consumer.h>
+
+struct jz4740_ohci_hcd {
+        struct ohci_hcd ohci_hcd;
+
+        struct regulator *vbus;
+        bool vbus_enabled;
+        struct clk *clk;
+};
+
+static inline struct jz4740_ohci_hcd *hcd_to_jz4740_hcd(struct usb_hcd *hcd)
+{
+        return (struct jz4740_ohci_hcd *)(hcd->hcd_priv);
+}
+
+static inline struct usb_hcd *jz4740_hcd_to_hcd(struct jz4740_ohci_hcd *jz4740_ohci)
+{
+        return container_of((void *)jz4740_ohci, struct usb_hcd, hcd_priv);
+}
+
+static int ohci_jz4740_start(struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        int     ret;
+
+        ret = ohci_init(ohci);
+        if (ret < 0)
+                return ret;
+
+        ohci->num_ports = 1;
+
+        ret = ohci_run(ohci);
+        if (ret < 0) {
+                dev_err(hcd->self.controller, "Can not start %s",
+                        hcd->self.bus_name);
+                ohci_stop(hcd);
+                return ret;
+        }
+        return 0;
+}
+
+static int ohci_jz4740_set_vbus_power(struct jz4740_ohci_hcd *jz4740_ohci,
+        bool enabled)
+{
+        int ret = 0;
+
+        if (!jz4740_ohci->vbus)
+                return 0;
+
+        if (enabled && !jz4740_ohci->vbus_enabled) {
+                ret = regulator_enable(jz4740_ohci->vbus);
+                if (ret)
+                        dev_err(jz4740_hcd_to_hcd(jz4740_ohci)->self.controller,
+                                "Could not power vbus\n");
+        } else if (!enabled && jz4740_ohci->vbus_enabled) {
+                ret = regulator_disable(jz4740_ohci->vbus);
+        }
+
+        if (ret == 0)
+                jz4740_ohci->vbus_enabled = enabled;
+
+        return ret;
+}
+
+static int ohci_jz4740_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+        u16 wIndex, char *buf, u16 wLength)
+{
+        struct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);
+        int ret;
+
+        switch (typeReq) {
+        case SetHubFeature:
+                if (wValue == USB_PORT_FEAT_POWER)
+                        ret = ohci_jz4740_set_vbus_power(jz4740_ohci, true);
+                break;
+        case ClearHubFeature:
+                if (wValue == USB_PORT_FEAT_POWER)
+                        ret = ohci_jz4740_set_vbus_power(jz4740_ohci, false);
+                break;
+        }
+
+        if (ret)
+                return ret;
+
+        return ohci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+}
+
+
+static const struct hc_driver ohci_jz4740_hc_driver = {
+        .description =          hcd_name,
+        .product_desc =         "JZ4740 OHCI",
+        .hcd_priv_size =        sizeof(struct jz4740_ohci_hcd),
+
+        /*
+         * generic hardware linkage
+         */
+        .irq =                  ohci_irq,
+        .flags =                HCD_USB11 | HCD_MEMORY,
+
+        /*
+         * basic lifecycle operations
+         */
+        .start =                ohci_jz4740_start,
+        .stop =                 ohci_stop,
+        .shutdown =             ohci_shutdown,
+
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue =          ohci_urb_enqueue,
+        .urb_dequeue =          ohci_urb_dequeue,
+        .endpoint_disable =     ohci_endpoint_disable,
+
+        /*
+         * scheduling support
+         */
+        .get_frame_number =     ohci_get_frame,
+
+        /*
+         * root hub support
+         */
+        .hub_status_data =      ohci_hub_status_data,
+        .hub_control =          ohci_jz4740_hub_control,
+#ifdef  CONFIG_PM
+        .bus_suspend =          ohci_bus_suspend,
+        .bus_resume =           ohci_bus_resume,
+#endif
+        .start_port_reset =     ohci_start_port_reset,
+};
+
+
+static __devinit int jz4740_ohci_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct usb_hcd *hcd;
+        struct jz4740_ohci_hcd *jz4740_ohci;
+        struct resource *res;
+        int irq;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        if (!res) {
+                dev_err(&pdev->dev, "Failed to get platform resource\n");
+                return -ENOENT;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "Failed to get platform irq\n");
+                return irq;
+        }
+
+        hcd = usb_create_hcd(&ohci_jz4740_hc_driver, &pdev->dev, "jz4740");
+        if (!hcd) {
+                dev_err(&pdev->dev, "Failed to create hcd.\n");
+                return -ENOMEM;
+        }
+
+        jz4740_ohci = hcd_to_jz4740_hcd(hcd);
+
+        res = request_mem_region(res->start, resource_size(res), hcd_name);
+        if (!res) {
+                dev_err(&pdev->dev, "Failed to request mem region.\n");
+                ret = -EBUSY;
+                goto err_free;
+        }
+
+        hcd->rsrc_start = res->start;
+        hcd->rsrc_len = resource_size(res);
+        hcd->regs = ioremap(res->start, resource_size(res));
+
+        if (!hcd->regs) {
+                dev_err(&pdev->dev, "Failed to ioremap registers.\n");
+                ret = -EBUSY;
+                goto err_release_mem;
+        }
+
+        jz4740_ohci->clk = clk_get(&pdev->dev, "uhc");
+        if (IS_ERR(jz4740_ohci->clk)) {
+                ret = PTR_ERR(jz4740_ohci->clk);
+                dev_err(&pdev->dev, "Failed to get clock: %d\n", ret);
+                goto err_iounmap;
+        }
+
+        jz4740_ohci->vbus = regulator_get(&pdev->dev, "vbus");
+        if (IS_ERR(jz4740_ohci->vbus))
+                jz4740_ohci->vbus = NULL;
+
+
+        clk_set_rate(jz4740_ohci->clk, 48000000);
+        clk_enable(jz4740_ohci->clk);
+        if (jz4740_ohci->vbus)
+                ohci_jz4740_set_vbus_power(jz4740_ohci, true);
+
+        platform_set_drvdata(pdev, hcd);
+
+        ohci_hcd_init(hcd_to_ohci(hcd));
+
+        ret = usb_add_hcd(hcd, irq, 0);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to add hcd: %d\n", ret);
+                goto err_disable;
+        }
+
+        return 0;
+
+err_disable:
+        platform_set_drvdata(pdev, NULL);
+        if (jz4740_ohci->vbus) {
+                regulator_disable(jz4740_ohci->vbus);
+                regulator_put(jz4740_ohci->vbus);
+        }
+        clk_disable(jz4740_ohci->clk);
+
+        clk_put(jz4740_ohci->clk);
+err_iounmap:
+        iounmap(hcd->regs);
+err_release_mem:
+        release_mem_region(res->start, resource_size(res));
+err_free:
+        usb_put_hcd(hcd);
+
+        return ret;
+}
+
+static __devexit int jz4740_ohci_remove(struct platform_device *pdev)
+{
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        struct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);
+
+        usb_remove_hcd(hcd);
+
+        platform_set_drvdata(pdev, NULL);
+
+        if (jz4740_ohci->vbus) {
+                regulator_disable(jz4740_ohci->vbus);
+                regulator_put(jz4740_ohci->vbus);
+        }
+
+        clk_disable(jz4740_ohci->clk);
+        clk_put(jz4740_ohci->clk);
+
+        iounmap(hcd->regs);
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+
+        usb_put_hcd(hcd);
+
+        return 0;
+}
+
+static struct platform_driver ohci_hcd_jz4740_driver = {
+        .probe = jz4740_ohci_probe,
+        .remove = __devexit_p(jz4740_ohci_remove),
+        .driver = {
+                .name = "jz4740-ohci",
+                .owner = THIS_MODULE,
+        },
+};
+
+MODULE_ALIAS("platfrom:jz4740-ohci");
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 58cb73c8420a..0e13a00eb2ed 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -20,7 +20,6 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
@@ -43,8 +42,6 @@ MODULE_LICENSE("GPL");
 /* VARIABLES                                                          */
 /*====================================================================*/
 
-static const char driver_name[DEV_NAME_LEN]  = "sl811_cs";
-
 typedef struct local_info_t {
         struct pcmcia_device    *p_dev;
 } local_info_t;
@@ -165,16 +162,16 @@ static int sl811_cs_config_check(struct pcmcia_device *p_dev,
         p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
-        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
 
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                p_dev->io.BasePort1 = io->win[0].base;
-                p_dev->io.NumPorts1 = io->win[0].len;
+                p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+                p_dev->resource[0]->start = io->win[0].base;
+                p_dev->resource[0]->end = io->win[0].len;
 
-                return pcmcia_request_io(p_dev, &p_dev->io);
+                return pcmcia_request_io(p_dev);
         }
         pcmcia_disable_device(p_dev);
         return -ENODEV;
@@ -192,7 +189,7 @@ static int sl811_cs_config(struct pcmcia_device *link)
                 goto failed;
 
         /* require an IRQ and two registers */
-        if (!link->io.NumPorts1 || link->io.NumPorts1 < 2)
+        if (resource_size(link->resource[0]) < 2)
                 goto failed;
 
         if (!link->irq)
@@ -207,11 +204,10 @@ static int sl811_cs_config(struct pcmcia_device *link)
         if (link->conf.Vpp)
                 printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
         printk(", irq %d", link->irq);
-        printk(", io 0x%04x-0x%04x", link->io.BasePort1,
-               link->io.BasePort1+link->io.NumPorts1-1);
+        printk(", io %pR", link->resource[0]);
         printk("\n");
 
-        if (sl811_hc_init(parent, link->io.BasePort1, link->irq)
+        if (sl811_hc_init(parent, link->resource[0]->start, link->irq)
                         < 0) {
 failed:
                 printk(KERN_WARNING "sl811_cs_config failed\n");
@@ -246,7 +242,7 @@ MODULE_DEVICE_TABLE(pcmcia, sl811_ids);
 static struct pcmcia_driver sl811_cs_driver = {
         .owner          = THIS_MODULE,
         .drv            = {
-                .name   = (char *)driver_name,
+                .name   = "sl811_cs",
         },
         .probe          = sl811_cs_probe,
         .remove         = sl811_cs_detach,