[PATCH] usb: musb: omap2430: Idle musb on init

[Tony Lindgren]

We want to configure musb state in omap2430_musb_enable() instead of
omap2430_musb_init(). Otherwise musb may not idle properly until
USB cable has been connected at least once.

And we already have omap_musb_set_mailbox() configure mode with
omap_control_usb_set_mode() so we can remove those calls from
omap2430_musb_enable().

Cc: Jacopo Mondi 
Cc: Marcel Partap 
Cc: Merlijn Wajer 
Cc: Michael Scott 
Cc: NeKit 
Cc: Pavel Machek 
Cc: Sebastian Reichel 
Signed-off-by: Tony Lindgren 
---
 drivers/usb/musb/omap2430.c | 20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -211,7 +211,6 @@ static int omap2430_musb_init(struct musb *musb)
u32 l;
int status = 0;
struct device *dev = musb->controller;
-   struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
struct musb_hdrc_platform_data *plat = dev_get_platdata(dev);
struct omap_musb_board_data *data = plat->board_data;
 
@@ -267,9 +266,6 @@ static int omap2430_musb_init(struct musb *musb)
musb_readl(musb->mregs, OTG_INTERFSEL),
musb_readl(musb->mregs, OTG_SIMENABLE));
 
-   if (glue->status != MUSB_UNKNOWN)
-   omap_musb_set_mailbox(glue);
-
return 0;
 }
 
@@ -278,19 +274,9 @@ static void omap2430_musb_enable(struct musb *musb)
struct device *dev = musb->controller;
struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
-   switch (glue->status) {
-
-   case MUSB_ID_GROUND:
-   omap_control_usb_set_mode(glue->control_otghs, USB_MODE_HOST);
-   break;
-
-   case MUSB_VBUS_VALID:
-   omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
-   break;
-
-   default:
-   break;
-   }
+   if (glue->status == MUSB_UNKNOWN)
+   glue->status = MUSB_VBUS_OFF;
+   omap_musb_set_mailbox(glue);
 }
 
 static void omap2430_musb_disable(struct musb *musb)
-- 
2.23.0

[PATCH] xhci: tegra: mbox registers address in"soc" data

[JC Kuo]

Tegra194 XUSB host controller has rearranged mailbox registers. This
commit makes mailbox registers address a part of "soc" data so that
xhci-tegra driver can be used for Tegra194.

Signed-off-by: JC Kuo 
---
 drivers/usb/host/xhci-tegra.c | 51 ++-
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index dafc65911fc0..b92a03bbbd2c 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -146,6 +146,13 @@ struct tegra_xusb_phy_type {
unsigned int num;
 };
 
+struct tega_xusb_mbox_regs {
+   u32 cmd;
+   u32 data_in;
+   u32 data_out;
+   u32 owner;
+};
+
 struct tegra_xusb_soc {
const char *firmware;
const char * const *supply_names;
@@ -160,6 +167,8 @@ struct tegra_xusb_soc {
} usb2, ulpi, hsic, usb3;
} ports;
 
+   struct tega_xusb_mbox_regs mbox;
+
bool scale_ss_clock;
bool has_ipfs;
 };
@@ -395,15 +404,15 @@ static int tegra_xusb_mbox_send(struct tegra_xusb *tegra,
 * ACK/NAK messages.
 */
if (!(msg->cmd == MBOX_CMD_ACK || msg->cmd == MBOX_CMD_NAK)) {
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+   value = fpci_readl(tegra, tegra->soc->mbox.owner);
if (value != MBOX_OWNER_NONE) {
dev_err(tegra->dev, "mailbox is busy\n");
return -EBUSY;
}
 
-   fpci_writel(tegra, MBOX_OWNER_SW, XUSB_CFG_ARU_MBOX_OWNER);
+   fpci_writel(tegra, MBOX_OWNER_SW, tegra->soc->mbox.owner);
 
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+   value = fpci_readl(tegra, tegra->soc->mbox.owner);
if (value != MBOX_OWNER_SW) {
dev_err(tegra->dev, "failed to acquire mailbox\n");
return -EBUSY;
@@ -413,17 +422,17 @@ static int tegra_xusb_mbox_send(struct tegra_xusb *tegra,
}
 
value = tegra_xusb_mbox_pack(msg);
-   fpci_writel(tegra, value, XUSB_CFG_ARU_MBOX_DATA_IN);
+   fpci_writel(tegra, value, tegra->soc->mbox.data_in);
 
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_CMD);
+   value = fpci_readl(tegra, tegra->soc->mbox.cmd);
value |= MBOX_INT_EN | MBOX_DEST_FALC;
-   fpci_writel(tegra, value, XUSB_CFG_ARU_MBOX_CMD);
+   fpci_writel(tegra, value, tegra->soc->mbox.cmd);
 
if (wait_for_idle) {
unsigned long timeout = jiffies + msecs_to_jiffies(250);
 
while (time_before(jiffies, timeout)) {
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+   value = fpci_readl(tegra, tegra->soc->mbox.owner);
if (value == MBOX_OWNER_NONE)
break;
 
@@ -431,7 +440,7 @@ static int tegra_xusb_mbox_send(struct tegra_xusb *tegra,
}
 
if (time_after(jiffies, timeout))
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+   value = fpci_readl(tegra, tegra->soc->mbox.owner);
 
if (value != MBOX_OWNER_NONE)
return -ETIMEDOUT;
@@ -598,16 +607,16 @@ static irqreturn_t tegra_xusb_mbox_thread(int irq, void 
*data)
 
mutex_lock(&tegra->lock);
 
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_DATA_OUT);
+   value = fpci_readl(tegra, tegra->soc->mbox.data_out);
tegra_xusb_mbox_unpack(&msg, value);
 
-   value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_CMD);
+   value = fpci_readl(tegra, tegra->soc->mbox.cmd);
value &= ~MBOX_DEST_SMI;
-   fpci_writel(tegra, value, XUSB_CFG_ARU_MBOX_CMD);
+   fpci_writel(tegra, value, tegra->soc->mbox.cmd);
 
/* clear mailbox owner if no ACK/NAK is required */
if (!tegra_xusb_mbox_cmd_requires_ack(msg.cmd))
-   fpci_writel(tegra, MBOX_OWNER_NONE, XUSB_CFG_ARU_MBOX_OWNER);
+   fpci_writel(tegra, MBOX_OWNER_NONE, tegra->soc->mbox.owner);
 
tegra_xusb_mbox_handle(tegra, &msg);
 
@@ -1365,6 +1374,12 @@ static const struct tegra_xusb_soc tegra124_soc = {
},
.scale_ss_clock = true,
.has_ipfs = true,
+   .mbox = {
+   .cmd = XUSB_CFG_ARU_MBOX_CMD,
+   .data_in = XUSB_CFG_ARU_MBOX_DATA_IN,
+   .data_out = XUSB_CFG_ARU_MBOX_DATA_OUT,
+   .owner = XUSB_CFG_ARU_MBOX_OWNER,
+   },
 };
 MODULE_FIRMWARE("nvidia/tegra124/xusb.bin");
 
@@ -1397,6 +1412,12 @@ static const struct tegra_xusb_soc tegra210_soc = {
},
.scale_ss_clock = false,
.has_ipfs = true,
+   .mbox = {
+   .cmd = XUSB_CFG_ARU_MBOX_CMD,
+   .data_in = XUSB_CFG_ARU_MBOX_DATA_IN,
+   .data_out = XUSB_CFG_ARU_MBOX_DATA_OUT,
+   .owner = XUSB_CFG_ARU_MBOX_OWNER,
+   },
 };