15 files changed, 145 insertions, 81 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 80de2f88ed2c..4ab2cb62dfce 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -105,7 +105,7 @@ static int hw_ep_flush(struct ci_hdrc *ci, int num, int dir)
        do {
                /* flush any pending transfer */
-                hw_write(ci, OP_ENDPTFLUSH, BIT(n), BIT(n));
+                hw_write(ci, OP_ENDPTFLUSH, ~0, BIT(n));
                while (hw_read(ci, OP_ENDPTFLUSH, BIT(n)))
                        cpu_relax();
        } while (hw_read(ci, OP_ENDPTSTAT, BIT(n)));
@@ -205,7 +205,7 @@ static int hw_ep_prime(struct ci_hdrc *ci, int num, int dir, int is_ctrl)
        if (is_ctrl && dir == RX && hw_read(ci, OP_ENDPTSETUPSTAT, BIT(num)))
                return -EAGAIN;
-        hw_write(ci, OP_ENDPTPRIME, BIT(n), BIT(n));
+        hw_write(ci, OP_ENDPTPRIME, ~0, BIT(n));
        while (hw_read(ci, OP_ENDPTPRIME, BIT(n)))
                cpu_relax();
diff --git a/drivers/usb/gadget/bcm63xx_udc.c b/drivers/usb/gadget/bcm63xx_udc.c
index 888fbb43b338..e969eb809a85 100644
--- a/drivers/usb/gadget/bcm63xx_udc.c
+++ b/drivers/usb/gadget/bcm63xx_udc.c
@@ -360,24 +360,30 @@ static inline void usb_dma_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
        bcm_writel(val, udc->iudma_regs + off);
 }
-static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off)
+static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off, int chan)
 {
-        return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
+        return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
+                        (ENETDMA_CHAN_WIDTH * chan));
 }
-static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
+static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
+                                        int chan)
 {
-        bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
+        bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
+                        (ENETDMA_CHAN_WIDTH * chan));
 }
-static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off)
+static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off, int chan)
 {
-        return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
+        return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
+                        (ENETDMA_CHAN_WIDTH * chan));
 }
-static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
+static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
+                                        int chan)
 {
-        bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
+        bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
+                        (ENETDMA_CHAN_WIDTH * chan));
 }
 static inline void set_clocks(struct bcm63xx_udc *udc, bool is_enabled)
@@ -638,7 +644,7 @@ static void iudma_write(struct bcm63xx_udc *udc, struct iudma_ch *iudma,
        } while (!last_bd);
        usb_dmac_writel(udc, ENETDMAC_CHANCFG_EN_MASK,
-                        ENETDMAC_CHANCFG_REG(iudma->ch_idx));
+                        ENETDMAC_CHANCFG_REG, iudma->ch_idx);
 }
 /**
@@ -694,9 +700,9 @@ static void iudma_reset_channel(struct bcm63xx_udc *udc, struct iudma_ch *iudma)
                bcm63xx_fifo_reset_ep(udc, max(0, iudma->ep_num));
        /* stop DMA, then wait for the hardware to wrap up */
-        usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG(ch_idx));
+        usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG, ch_idx);
-        while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)) &
+        while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx) &
                                   ENETDMAC_CHANCFG_EN_MASK) {
                udelay(1);
@@ -713,10 +719,10 @@ static void iudma_reset_channel(struct bcm63xx_udc *udc, struct iudma_ch *iudma)
                        dev_warn(udc->dev, "forcibly halting IUDMA channel %d\n",
                                 ch_idx);
                        usb_dmac_writel(udc, ENETDMAC_CHANCFG_BUFHALT_MASK,
-                                        ENETDMAC_CHANCFG_REG(ch_idx));
+                                        ENETDMAC_CHANCFG_REG, ch_idx);
                }
        }
-        usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG(ch_idx));
+        usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG, ch_idx);
        /* don't leave "live" HW-owned entries for the next guy to step on */
        for (d = iudma->bd_ring; d <= iudma->end_bd; d++)
@@ -728,11 +734,11 @@ static void iudma_reset_channel(struct bcm63xx_udc *udc, struct iudma_ch *iudma)
        /* set up IRQs, UBUS burst size, and BD base for this channel */
        usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
-                        ENETDMAC_IRMASK_REG(ch_idx));
+                        ENETDMAC_IRMASK_REG, ch_idx);
-        usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG(ch_idx));
+        usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG, ch_idx);
-        usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG(ch_idx));
+        usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG, ch_idx);
-        usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG(ch_idx));
+        usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG, ch_idx);
 }
 /**
@@ -2035,7 +2041,7 @@ static irqreturn_t bcm63xx_udc_data_isr(int irq, void *dev_id)
        spin_lock(&udc->lock);
        usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
-                        ENETDMAC_IR_REG(iudma->ch_idx));
+                        ENETDMAC_IR_REG, iudma->ch_idx);
        bep = iudma->bep;
        rc = iudma_read(udc, iudma);
@@ -2175,18 +2181,18 @@ static int bcm63xx_iudma_dbg_show(struct seq_file *s, void *p)
                seq_printf(s, " [ep%d]:\n",
                           max_t(int, iudma_defaults[ch_idx].ep_num, 0));
                seq_printf(s, "  cfg: %08x; irqstat: %08x; irqmask: %08x; maxburst: %08x\n",
-                           usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)),
+                           usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx),
-                           usb_dmac_readl(udc, ENETDMAC_IR_REG(ch_idx)),
+                           usb_dmac_readl(udc, ENETDMAC_IR_REG, ch_idx),
-                           usb_dmac_readl(udc, ENETDMAC_IRMASK_REG(ch_idx)),
+                           usb_dmac_readl(udc, ENETDMAC_IRMASK_REG, ch_idx),
-                           usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG(ch_idx)));
+                           usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG, ch_idx));
-                sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG(ch_idx));
+                sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG, ch_idx);
-                sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG(ch_idx));
+                sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG, ch_idx);
                seq_printf(s, "  base: %08x; index: %04x_%04x; desc: %04x_%04x %08x\n",
-                           usb_dmas_readl(udc, ENETDMAS_RSTART_REG(ch_idx)),
+                           usb_dmas_readl(udc, ENETDMAS_RSTART_REG, ch_idx),
                           sram2 >> 16, sram2 & 0xffff,
                           sram3 >> 16, sram3 & 0xffff,
-                           usb_dmas_readl(udc, ENETDMAS_SRAM4_REG(ch_idx)));
+                           usb_dmas_readl(udc, ENETDMAS_SRAM4_REG, ch_idx));
                seq_printf(s, "  desc: %d/%d used", iudma->n_bds_used,
                           iudma->n_bds);
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 306a2b52125c..2b4334394076 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -585,7 +585,6 @@ static ssize_t ffs_epfile_io(struct file *file,
                             char __user *buf, size_t len, int read)
 {
        struct ffs_epfile *epfile = file->private_data;
-        struct usb_gadget *gadget = epfile->ffs->gadget;
        struct ffs_ep *ep;
        char *data = NULL;
        ssize_t ret, data_len;
@@ -622,6 +621,12 @@ static ssize_t ffs_epfile_io(struct file *file,
        /* Allocate & copy */
        if (!halt) {
                /*
+                 * if we _do_ wait above, the epfile->ffs->gadget might be NULL
+                 * before the waiting completes, so do not assign to 'gadget' earlier
+                 */
+                struct usb_gadget *gadget = epfile->ffs->gadget;
+                /*
                 * Controller may require buffer size to be aligned to
                 * maxpacketsize of an out endpoint.
                 */
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index bf7a56b6d48a..69b76efd11e9 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -1157,7 +1157,7 @@ static int __init printer_bind_config(struct usb_configuration *c)
        usb_gadget_set_selfpowered(gadget);
-        if (gadget->is_otg) {
+        if (gadget_is_otg(gadget)) {
                otg_descriptor.bmAttributes |= USB_OTG_HNP;
                printer_cfg_driver.descriptors = otg_desc;
                printer_cfg_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index f04b2c3154de..dd9678f85c58 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1629,7 +1629,7 @@ static void s3c2410_udc_reinit(struct s3c2410_udc *dev)
                ep->ep.desc = NULL;
                ep->halted = 0;
                INIT_LIST_HEAD(&ep->queue);
-                usb_ep_set_maxpacket_limit(&ep->ep, &ep->ep.maxpacket);
+                usb_ep_set_maxpacket_limit(&ep->ep, ep->ep.maxpacket);
        }
 }
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 471142725ffe..81cda09b47e3 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -685,8 +685,15 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
        struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
        u32                     status, masked_status, pcd_status = 0, cmd;
        int                     bh;
+        unsigned long           flags;
-        spin_lock (&ehci->lock);
+        /*
+         * For threadirqs option we use spin_lock_irqsave() variant to prevent
+         * deadlock with ehci hrtimer callback, because hrtimer callbacks run
+         * in interrupt context even when threadirqs is specified. We can go
+         * back to spin_lock() variant when hrtimer callbacks become threaded.
+         */
+        spin_lock_irqsave(&ehci->lock, flags);
        status = ehci_readl(ehci, &ehci->regs->status);
@@ -704,7 +711,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
        /* Shared IRQ? */
        if (!masked_status || unlikely(ehci->rh_state == EHCI_RH_HALTED)) {
-                spin_unlock(&ehci->lock);
+                spin_unlock_irqrestore(&ehci->lock, flags);
                return IRQ_NONE;
        }
@@ -815,7 +822,7 @@ dead:
        if (bh)
                ehci_work (ehci);
-        spin_unlock (&ehci->lock);
+        spin_unlock_irqrestore(&ehci->lock, flags);
        if (pcd_status)
                usb_hcd_poll_rh_status(hcd);
        return IRQ_HANDLED;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 47b858fc50b2..7ae0c4d51741 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -238,6 +238,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
        int                     port;
        int                     mask;
        int                     changed;
+        bool                    fs_idle_delay;
        ehci_dbg(ehci, "suspend root hub\n");
@@ -272,6 +273,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
        ehci->bus_suspended = 0;
        ehci->owned_ports = 0;
        changed = 0;
+        fs_idle_delay = false;
        port = HCS_N_PORTS(ehci->hcs_params);
        while (port--) {
                u32 __iomem     *reg = &ehci->regs->port_status [port];
@@ -300,16 +302,32 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                }
                if (t1 != t2) {
+                        /*
+                         * On some controllers, Wake-On-Disconnect will
+                         * generate false wakeup signals until the bus
+                         * switches over to full-speed idle.  For their
+                         * sake, add a delay if we need one.
+                         */
+                        if ((t2 & PORT_WKDISC_E) &&
+                                        ehci_port_speed(ehci, t2) ==
+                                                USB_PORT_STAT_HIGH_SPEED)
+                                fs_idle_delay = true;
                        ehci_writel(ehci, t2, reg);
                        changed = 1;
                }
        }
+        spin_unlock_irq(&ehci->lock);
+        if ((changed && ehci->has_tdi_phy_lpm) || fs_idle_delay) {
+                /*
+                 * Wait for HCD to enter low-power mode or for the bus
+                 * to switch to full-speed idle.
+                 */
+                usleep_range(5000, 5500);
+        }
        if (changed && ehci->has_tdi_phy_lpm) {
-                spin_unlock_irq(&ehci->lock);
-                msleep(5);      /* 5 ms for HCD to enter low-power mode */
                spin_lock_irq(&ehci->lock);
                port = HCS_N_PORTS(ehci->hcs_params);
                while (port--) {
                        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[port];
@@ -322,8 +340,8 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                                        port, (t3 & HOSTPC_PHCD) ?
                                        "succeeded" : "failed");
                }
+                spin_unlock_irq(&ehci->lock);
        }
-        spin_unlock_irq(&ehci->lock);
        /* Apparently some devices need a >= 1-uframe delay here */
        if (ehci->bus_suspended)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index fc192ad9cc6a..239ad0b1ceb6 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -477,8 +477,11 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                                musb->port1_status |=
                                                (USB_PORT_STAT_C_SUSPEND << 16)
                                                | MUSB_PORT_STAT_RESUME;
+                                musb->rh_timer = jiffies
+                                                 + msecs_to_jiffies(20);
                                schedule_delayed_work(
-                                        &musb->finish_resume_work, 20);
+                                        &musb->finish_resume_work,
+                                        msecs_to_jiffies(20));
                                musb->xceiv->state = OTG_STATE_A_HOST;
                                musb->is_active = 1;
@@ -2157,11 +2160,19 @@ static void musb_restore_context(struct musb *musb)
        void __iomem *musb_base = musb->mregs;
        void __iomem *ep_target_regs;
        void __iomem *epio;
+        u8 power;
        musb_writew(musb_base, MUSB_FRAME, musb->context.frame);
        musb_writeb(musb_base, MUSB_TESTMODE, musb->context.testmode);
        musb_write_ulpi_buscontrol(musb->mregs, musb->context.busctl);
-        musb_writeb(musb_base, MUSB_POWER, musb->context.power);
+        /* Don't affect SUSPENDM/RESUME bits in POWER reg */
+        power = musb_readb(musb_base, MUSB_POWER);
+        power &= MUSB_POWER_SUSPENDM | MUSB_POWER_RESUME;
+        musb->context.power &= ~(MUSB_POWER_SUSPENDM | MUSB_POWER_RESUME);
+        power |= musb->context.power;
+        musb_writeb(musb_base, MUSB_POWER, power);
        musb_writew(musb_base, MUSB_INTRTXE, musb->intrtxe);
        musb_writew(musb_base, MUSB_INTRRXE, musb->intrrxe);
        musb_writeb(musb_base, MUSB_INTRUSBE, musb->context.intrusbe);
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index ed455724017b..abb38c3833ef 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1183,6 +1183,9 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)
                                csr = MUSB_CSR0_H_STATUSPKT
                                        | MUSB_CSR0_TXPKTRDY;
+                        /* disable ping token in status phase */
+                        csr |= MUSB_CSR0_H_DIS_PING;
                        /* flag status stage */
                        musb->ep0_stage = MUSB_EP0_STATUS;
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index eb634433ef09..e2d2d8c9891b 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -135,7 +135,8 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
                /* later, GetPortStatus will stop RESUME signaling */
                musb->port1_status |= MUSB_PORT_STAT_RESUME;
-                schedule_delayed_work(&musb->finish_resume_work, 20);
+                schedule_delayed_work(&musb->finish_resume_work,
+                                      msecs_to_jiffies(20));
        }
 }
@@ -158,7 +159,6 @@ void musb_port_reset(struct musb *musb, bool do_reset)
         */
        power = musb_readb(mbase, MUSB_POWER);
        if (do_reset) {
                /*
                 * If RESUME is set, we must make sure it stays minimum 20 ms.
                 * Then we must clear RESUME and wait a bit to let musb start
@@ -167,11 +167,22 @@ void musb_port_reset(struct musb *musb, bool do_reset)
                 * detected".
                 */
                if (power &  MUSB_POWER_RESUME) {
-                        while (time_before(jiffies, musb->rh_timer))
+                        long remain = (unsigned long) musb->rh_timer - jiffies;
-                                msleep(1);
+                        if (musb->rh_timer > 0 && remain > 0) {
+                                /* take into account the minimum delay after resume */
+                                schedule_delayed_work(
+                                        &musb->deassert_reset_work, remain);
+                                return;
+                        }
                        musb_writeb(mbase, MUSB_POWER,
-                                power & ~MUSB_POWER_RESUME);
+                                    power & ~MUSB_POWER_RESUME);
-                        msleep(1);
+                        /* Give the core 1 ms to clear MUSB_POWER_RESUME */
+                        schedule_delayed_work(&musb->deassert_reset_work,
+                                              msecs_to_jiffies(1));
+                        return;
                }
                power &= 0xf0;
@@ -180,7 +191,8 @@ void musb_port_reset(struct musb *musb, bool do_reset)
                musb->port1_status |= USB_PORT_STAT_RESET;
                musb->port1_status &= ~USB_PORT_STAT_ENABLE;
-                schedule_delayed_work(&musb->deassert_reset_work, 50);
+                schedule_delayed_work(&musb->deassert_reset_work,
+                                      msecs_to_jiffies(50));
        } else {
                dev_dbg(musb->controller, "root port reset stopped\n");
                musb_writeb(mbase, MUSB_POWER,
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 2a408cdaf7b2..8aa59a2c5eb2 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -659,7 +659,6 @@ static int omap2430_runtime_suspend(struct device *dev)
                                OTG_INTERFSEL);
                omap2430_low_level_exit(musb);
-                phy_power_off(musb->phy);
        }
        return 0;
@@ -674,7 +673,6 @@ static int omap2430_runtime_resume(struct device *dev)
                omap2430_low_level_init(musb);
                musb_writel(musb->mregs, OTG_INTERFSEL,
                                musb->context.otg_interfsel);
-                phy_power_on(musb->phy);
        }
        return 0;
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 8546c8dccd51..d204f745ed05 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -159,32 +159,6 @@ put_3p3:
        return rc;
 }
-#ifdef CONFIG_PM_SLEEP
-#define USB_PHY_SUSP_DIG_VOL  500000
-static int msm_hsusb_config_vddcx(int high)
-{
-        int max_vol = USB_PHY_VDD_DIG_VOL_MAX;
-        int min_vol;
-        int ret;
-        if (high)
-                min_vol = USB_PHY_VDD_DIG_VOL_MIN;
-        else
-                min_vol = USB_PHY_SUSP_DIG_VOL;
-        ret = regulator_set_voltage(hsusb_vddcx, min_vol, max_vol);
-        if (ret) {
-                pr_err("%s: unable to set the voltage for regulator "
-                        "HSUSB_VDDCX\n", __func__);
-                return ret;
-        }
-        pr_debug("%s: min_vol:%d max_vol:%d\n", __func__, min_vol, max_vol);
-        return ret;
-}
-#endif
 static int msm_hsusb_ldo_set_mode(int on)
 {
        int ret = 0;
@@ -440,7 +414,32 @@ static int msm_otg_reset(struct usb_phy *phy)
 #define PHY_SUSPEND_TIMEOUT_USEC        (500 * 1000)
 #define PHY_RESUME_TIMEOUT_USEC (100 * 1000)
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
+#define USB_PHY_SUSP_DIG_VOL  500000
+static int msm_hsusb_config_vddcx(int high)
+{
+        int max_vol = USB_PHY_VDD_DIG_VOL_MAX;
+        int min_vol;
+        int ret;
+        if (high)
+                min_vol = USB_PHY_VDD_DIG_VOL_MIN;
+        else
+                min_vol = USB_PHY_SUSP_DIG_VOL;
+        ret = regulator_set_voltage(hsusb_vddcx, min_vol, max_vol);
+        if (ret) {
+                pr_err("%s: unable to set the voltage for regulator "
+                        "HSUSB_VDDCX\n", __func__);
+                return ret;
+        }
+        pr_debug("%s: min_vol:%d max_vol:%d\n", __func__, min_vol, max_vol);
+        return ret;
+}
 static int msm_otg_suspend(struct msm_otg *motg)
 {
        struct usb_phy *phy = &motg->phy;
@@ -1733,22 +1732,18 @@ static int msm_otg_pm_resume(struct device *dev)
 }
 #endif
-#ifdef CONFIG_PM
 static const struct dev_pm_ops msm_otg_dev_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)
        SET_RUNTIME_PM_OPS(msm_otg_runtime_suspend, msm_otg_runtime_resume,
                                msm_otg_runtime_idle)
 };
-#endif
 static struct platform_driver msm_otg_driver = {
        .remove = msm_otg_remove,
        .driver = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
-#ifdef CONFIG_PM
                .pm = &msm_otg_dev_pm_ops,
-#endif
        },
 };
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index ee1f00f03c43..44ab12986805 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -907,6 +907,8 @@ static const struct usb_device_id id_table_combined[] = {
        /* Crucible Devices */
        { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
+        /* Cressi Devices */
+        { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
        { }                                     /* Terminating entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 1e2d369df86e..e599fbfcde5f 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1320,3 +1320,9 @@
 * Manufacturer: Smart GSM Team
 */
 #define FTDI_Z3X_PID            0x0011
+/*
+ * Product: Cressi PC Interface
+ * Manufacturer: Cressi
+ */
+#define FTDI_CRESSI_PID         0x87d0
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 216d20affba8..68fc9fe65936 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1526,7 +1526,8 @@ static const struct usb_device_id option_ids[] = {
        /* Cinterion */
        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },
-        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },
+        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8),
+                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) },
        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),
                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },