2018-05-06 21:58:06 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2012-02-08 22:33:25 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
|
|
|
|
* Copyright (C) 2010 Freescale Semiconductor, Inc.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
2020-05-10 17:40:05 +00:00
|
|
|
#include <log.h>
|
2012-02-08 22:33:25 +00:00
|
|
|
#include <usb.h>
|
|
|
|
#include <errno.h>
|
2016-01-23 10:54:32 +00:00
|
|
|
#include <wait_bit.h>
|
2012-02-08 22:33:25 +00:00
|
|
|
#include <linux/compiler.h>
|
2020-05-10 17:40:11 +00:00
|
|
|
#include <linux/delay.h>
|
2016-03-31 21:12:23 +00:00
|
|
|
#include <usb/ehci-ci.h>
|
2012-02-08 22:33:25 +00:00
|
|
|
#include <asm/io.h>
|
|
|
|
#include <asm/arch/imx-regs.h>
|
|
|
|
#include <asm/arch/clock.h>
|
2017-06-29 08:16:06 +00:00
|
|
|
#include <asm/mach-imx/iomux-v3.h>
|
|
|
|
#include <asm/mach-imx/sys_proto.h>
|
2016-06-17 06:19:27 +00:00
|
|
|
#include <dm.h>
|
2017-06-01 01:47:48 +00:00
|
|
|
#include <asm/mach-types.h>
|
2016-12-22 09:06:43 +00:00
|
|
|
#include <power/regulator.h>
|
2019-04-03 13:41:56 +00:00
|
|
|
#include <linux/usb/otg.h>
|
2012-02-08 22:33:25 +00:00
|
|
|
|
|
|
|
#include "ehci.h"
|
|
|
|
|
2016-12-22 09:06:42 +00:00
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
2012-02-08 22:33:25 +00:00
|
|
|
#define USB_OTGREGS_OFFSET 0x000
|
|
|
|
#define USB_H1REGS_OFFSET 0x200
|
|
|
|
#define USB_H2REGS_OFFSET 0x400
|
|
|
|
#define USB_H3REGS_OFFSET 0x600
|
|
|
|
#define USB_OTHERREGS_OFFSET 0x800
|
|
|
|
|
|
|
|
#define USB_H1_CTRL_OFFSET 0x04
|
|
|
|
|
|
|
|
#define USBPHY_CTRL 0x00000030
|
|
|
|
#define USBPHY_CTRL_SET 0x00000034
|
|
|
|
#define USBPHY_CTRL_CLR 0x00000038
|
|
|
|
#define USBPHY_CTRL_TOG 0x0000003c
|
|
|
|
|
|
|
|
#define USBPHY_PWD 0x00000000
|
|
|
|
#define USBPHY_CTRL_SFTRST 0x80000000
|
|
|
|
#define USBPHY_CTRL_CLKGATE 0x40000000
|
|
|
|
#define USBPHY_CTRL_ENUTMILEVEL3 0x00008000
|
|
|
|
#define USBPHY_CTRL_ENUTMILEVEL2 0x00004000
|
2013-10-10 22:27:59 +00:00
|
|
|
#define USBPHY_CTRL_OTG_ID 0x08000000
|
2012-02-08 22:33:25 +00:00
|
|
|
|
|
|
|
#define ANADIG_USB2_CHRG_DETECT_EN_B 0x00100000
|
|
|
|
#define ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B 0x00080000
|
|
|
|
|
|
|
|
#define ANADIG_USB2_PLL_480_CTRL_BYPASS 0x00010000
|
|
|
|
#define ANADIG_USB2_PLL_480_CTRL_ENABLE 0x00002000
|
|
|
|
#define ANADIG_USB2_PLL_480_CTRL_POWER 0x00001000
|
|
|
|
#define ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS 0x00000040
|
|
|
|
|
2015-08-06 20:43:17 +00:00
|
|
|
#define USBNC_OFFSET 0x200
|
2016-12-22 09:06:42 +00:00
|
|
|
#define USBNC_PHY_STATUS_OFFSET 0x23C
|
2015-08-06 20:43:17 +00:00
|
|
|
#define USBNC_PHYSTATUS_ID_DIG (1 << 4) /* otg_id status */
|
|
|
|
#define USBNC_PHYCFG2_ACAENB (1 << 4) /* otg_id detection enable */
|
2016-07-13 07:25:37 +00:00
|
|
|
#define UCTRL_PWR_POL (1 << 9) /* OTG Polarity of Power Pin */
|
2012-02-08 22:33:25 +00:00
|
|
|
#define UCTRL_OVER_CUR_POL (1 << 8) /* OTG Polarity of Overcurrent */
|
|
|
|
#define UCTRL_OVER_CUR_DIS (1 << 7) /* Disable OTG Overcurrent Detection */
|
|
|
|
|
|
|
|
/* USBCMD */
|
|
|
|
#define UCMD_RUN_STOP (1 << 0) /* controller run/stop */
|
|
|
|
#define UCMD_RESET (1 << 1) /* controller reset */
|
|
|
|
|
2019-10-24 13:29:32 +00:00
|
|
|
#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)
|
2013-10-10 22:27:59 +00:00
|
|
|
static const unsigned phy_bases[] = {
|
|
|
|
USB_PHY0_BASE_ADDR,
|
2019-10-24 13:29:32 +00:00
|
|
|
#if defined(USB_PHY1_BASE_ADDR)
|
2013-10-10 22:27:59 +00:00
|
|
|
USB_PHY1_BASE_ADDR,
|
2019-10-24 13:29:32 +00:00
|
|
|
#endif
|
2013-10-10 22:27:59 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static void usb_internal_phy_clock_gate(int index, int on)
|
2012-02-08 22:33:25 +00:00
|
|
|
{
|
2013-10-10 22:27:59 +00:00
|
|
|
void __iomem *phy_reg;
|
|
|
|
|
|
|
|
if (index >= ARRAY_SIZE(phy_bases))
|
|
|
|
return;
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
phy_reg = (void __iomem *)phy_bases[index];
|
2012-02-08 22:33:25 +00:00
|
|
|
phy_reg += on ? USBPHY_CTRL_CLR : USBPHY_CTRL_SET;
|
2015-08-06 20:43:15 +00:00
|
|
|
writel(USBPHY_CTRL_CLKGATE, phy_reg);
|
2012-02-08 22:33:25 +00:00
|
|
|
}
|
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
static void usb_power_config(int index)
|
2012-02-08 22:33:25 +00:00
|
|
|
{
|
2019-10-24 13:29:32 +00:00
|
|
|
#if defined(CONFIG_MX7ULP)
|
|
|
|
struct usbphy_regs __iomem *usbphy =
|
|
|
|
(struct usbphy_regs __iomem *)USB_PHY0_BASE_ADDR;
|
|
|
|
|
|
|
|
if (index > 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
writel(ANADIG_USB2_CHRG_DETECT_EN_B |
|
|
|
|
ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B,
|
|
|
|
&usbphy->usb1_chrg_detect);
|
|
|
|
|
|
|
|
scg_enable_usb_pll(true);
|
|
|
|
|
|
|
|
#else
|
2012-05-02 04:36:39 +00:00
|
|
|
struct anatop_regs __iomem *anatop =
|
|
|
|
(struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
|
2013-10-10 22:27:59 +00:00
|
|
|
void __iomem *chrg_detect;
|
|
|
|
void __iomem *pll_480_ctrl_clr;
|
|
|
|
void __iomem *pll_480_ctrl_set;
|
|
|
|
|
|
|
|
switch (index) {
|
|
|
|
case 0:
|
|
|
|
chrg_detect = &anatop->usb1_chrg_detect;
|
|
|
|
pll_480_ctrl_clr = &anatop->usb1_pll_480_ctrl_clr;
|
|
|
|
pll_480_ctrl_set = &anatop->usb1_pll_480_ctrl_set;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
chrg_detect = &anatop->usb2_chrg_detect;
|
|
|
|
pll_480_ctrl_clr = &anatop->usb2_pll_480_ctrl_clr;
|
|
|
|
pll_480_ctrl_set = &anatop->usb2_pll_480_ctrl_set;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
2012-02-08 22:33:25 +00:00
|
|
|
/*
|
2013-10-10 22:27:59 +00:00
|
|
|
* Some phy and power's special controls
|
2012-02-08 22:33:25 +00:00
|
|
|
* 1. The external charger detector needs to be disabled
|
|
|
|
* or the signal at DP will be poor
|
2013-10-10 22:27:59 +00:00
|
|
|
* 2. The PLL's power and output to usb
|
2012-02-08 22:33:25 +00:00
|
|
|
* is totally controlled by IC, so the Software only needs
|
|
|
|
* to enable them at initializtion.
|
|
|
|
*/
|
2015-08-06 20:43:15 +00:00
|
|
|
writel(ANADIG_USB2_CHRG_DETECT_EN_B |
|
2012-02-08 22:33:25 +00:00
|
|
|
ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B,
|
2013-10-10 22:27:59 +00:00
|
|
|
chrg_detect);
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2015-08-06 20:43:15 +00:00
|
|
|
writel(ANADIG_USB2_PLL_480_CTRL_BYPASS,
|
2013-10-10 22:27:59 +00:00
|
|
|
pll_480_ctrl_clr);
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2015-08-06 20:43:15 +00:00
|
|
|
writel(ANADIG_USB2_PLL_480_CTRL_ENABLE |
|
2012-02-08 22:33:25 +00:00
|
|
|
ANADIG_USB2_PLL_480_CTRL_POWER |
|
|
|
|
ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS,
|
2013-10-10 22:27:59 +00:00
|
|
|
pll_480_ctrl_set);
|
2019-10-24 13:29:32 +00:00
|
|
|
|
|
|
|
#endif
|
2012-02-08 22:33:25 +00:00
|
|
|
}
|
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
/* Return 0 : host node, <>0 : device mode */
|
|
|
|
static int usb_phy_enable(int index, struct usb_ehci *ehci)
|
2012-02-08 22:33:25 +00:00
|
|
|
{
|
2013-10-10 22:27:59 +00:00
|
|
|
void __iomem *phy_reg;
|
|
|
|
void __iomem *phy_ctrl;
|
|
|
|
void __iomem *usb_cmd;
|
2015-08-06 20:46:03 +00:00
|
|
|
int ret;
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
if (index >= ARRAY_SIZE(phy_bases))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
phy_reg = (void __iomem *)phy_bases[index];
|
|
|
|
phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
|
|
|
|
usb_cmd = (void __iomem *)&ehci->usbcmd;
|
|
|
|
|
2012-02-08 22:33:25 +00:00
|
|
|
/* Stop then Reset */
|
2015-08-06 20:43:15 +00:00
|
|
|
clrbits_le32(usb_cmd, UCMD_RUN_STOP);
|
2018-01-23 16:14:55 +00:00
|
|
|
ret = wait_for_bit_le32(usb_cmd, UCMD_RUN_STOP, false, 10000, false);
|
2015-08-06 20:46:03 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2015-08-06 20:43:15 +00:00
|
|
|
setbits_le32(usb_cmd, UCMD_RESET);
|
2018-01-23 16:14:55 +00:00
|
|
|
ret = wait_for_bit_le32(usb_cmd, UCMD_RESET, false, 10000, false);
|
2015-08-06 20:46:03 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2012-02-08 22:33:25 +00:00
|
|
|
|
|
|
|
/* Reset USBPHY module */
|
2015-08-06 20:43:15 +00:00
|
|
|
setbits_le32(phy_ctrl, USBPHY_CTRL_SFTRST);
|
2012-02-08 22:33:25 +00:00
|
|
|
udelay(10);
|
|
|
|
|
|
|
|
/* Remove CLKGATE and SFTRST */
|
2015-08-06 20:43:15 +00:00
|
|
|
clrbits_le32(phy_ctrl, USBPHY_CTRL_CLKGATE | USBPHY_CTRL_SFTRST);
|
2012-02-08 22:33:25 +00:00
|
|
|
udelay(10);
|
|
|
|
|
|
|
|
/* Power up the PHY */
|
2015-08-06 20:43:15 +00:00
|
|
|
writel(0, phy_reg + USBPHY_PWD);
|
2012-02-08 22:33:25 +00:00
|
|
|
/* enable FS/LS device */
|
2015-08-06 20:43:15 +00:00
|
|
|
setbits_le32(phy_ctrl, USBPHY_CTRL_ENUTMILEVEL2 |
|
|
|
|
USBPHY_CTRL_ENUTMILEVEL3);
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2014-11-10 00:50:39 +00:00
|
|
|
return 0;
|
2012-02-08 22:33:25 +00:00
|
|
|
}
|
|
|
|
|
2015-08-06 20:43:17 +00:00
|
|
|
int usb_phy_mode(int port)
|
|
|
|
{
|
|
|
|
void __iomem *phy_reg;
|
|
|
|
void __iomem *phy_ctrl;
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
phy_reg = (void __iomem *)phy_bases[port];
|
|
|
|
phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
|
|
|
|
|
|
|
|
val = readl(phy_ctrl);
|
|
|
|
|
|
|
|
if (val & USBPHY_CTRL_OTG_ID)
|
|
|
|
return USB_INIT_DEVICE;
|
|
|
|
else
|
|
|
|
return USB_INIT_HOST;
|
|
|
|
}
|
|
|
|
|
2019-10-24 13:29:32 +00:00
|
|
|
#if defined(CONFIG_MX7ULP)
|
|
|
|
struct usbnc_regs {
|
|
|
|
u32 ctrl1;
|
|
|
|
u32 ctrl2;
|
|
|
|
u32 reserve0[2];
|
|
|
|
u32 hsic_ctrl;
|
|
|
|
};
|
|
|
|
#else
|
2013-10-10 22:27:59 +00:00
|
|
|
/* Base address for this IP block is 0x02184800 */
|
|
|
|
struct usbnc_regs {
|
|
|
|
u32 ctrl[4]; /* otg/host1-3 */
|
|
|
|
u32 uh2_hsic_ctrl;
|
|
|
|
u32 uh3_hsic_ctrl;
|
|
|
|
u32 otg_phy_ctrl_0;
|
|
|
|
u32 uh1_phy_ctrl_0;
|
|
|
|
};
|
2019-10-24 13:29:32 +00:00
|
|
|
#endif
|
|
|
|
|
2015-08-06 20:43:17 +00:00
|
|
|
#elif defined(CONFIG_MX7)
|
|
|
|
struct usbnc_regs {
|
|
|
|
u32 ctrl1;
|
|
|
|
u32 ctrl2;
|
|
|
|
u32 reserve1[10];
|
|
|
|
u32 phy_cfg1;
|
|
|
|
u32 phy_cfg2;
|
2016-06-20 01:43:08 +00:00
|
|
|
u32 reserve2;
|
2015-08-06 20:43:17 +00:00
|
|
|
u32 phy_status;
|
2016-06-20 01:43:08 +00:00
|
|
|
u32 reserve3[4];
|
2015-08-06 20:43:17 +00:00
|
|
|
u32 adp_cfg1;
|
|
|
|
u32 adp_cfg2;
|
|
|
|
u32 adp_status;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void usb_power_config(int index)
|
|
|
|
{
|
|
|
|
struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
|
|
|
|
(0x10000 * index) + USBNC_OFFSET);
|
|
|
|
void __iomem *phy_cfg2 = (void __iomem *)(&usbnc->phy_cfg2);
|
|
|
|
|
2016-06-20 01:43:09 +00:00
|
|
|
/*
|
|
|
|
* Clear the ACAENB to enable usb_otg_id detection,
|
|
|
|
* otherwise it is the ACA detection enabled.
|
|
|
|
*/
|
|
|
|
clrbits_le32(phy_cfg2, USBNC_PHYCFG2_ACAENB);
|
2015-08-06 20:43:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int usb_phy_mode(int port)
|
|
|
|
{
|
|
|
|
struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
|
|
|
|
(0x10000 * port) + USBNC_OFFSET);
|
|
|
|
void __iomem *status = (void __iomem *)(&usbnc->phy_status);
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
val = readl(status);
|
|
|
|
|
|
|
|
if (val & USBNC_PHYSTATUS_ID_DIG)
|
|
|
|
return USB_INIT_DEVICE;
|
|
|
|
else
|
|
|
|
return USB_INIT_HOST;
|
|
|
|
}
|
|
|
|
#endif
|
2013-10-10 22:27:59 +00:00
|
|
|
|
|
|
|
static void usb_oc_config(int index)
|
2012-02-08 22:33:25 +00:00
|
|
|
{
|
2015-08-06 20:43:17 +00:00
|
|
|
#if defined(CONFIG_MX6)
|
2014-09-15 09:23:14 +00:00
|
|
|
struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
|
2013-10-10 22:27:59 +00:00
|
|
|
USB_OTHERREGS_OFFSET);
|
|
|
|
void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
|
2019-10-24 13:29:32 +00:00
|
|
|
#elif defined(CONFIG_MX7) || defined(CONFIG_MX7ULP)
|
2015-08-06 20:43:17 +00:00
|
|
|
struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
|
|
|
|
(0x10000 * index) + USBNC_OFFSET);
|
|
|
|
void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
|
|
|
|
#endif
|
2012-02-08 22:33:25 +00:00
|
|
|
|
|
|
|
#if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2
|
|
|
|
/* mx6qarm2 seems to required a different setting*/
|
2015-08-06 20:43:15 +00:00
|
|
|
clrbits_le32(ctrl, UCTRL_OVER_CUR_POL);
|
2012-02-08 22:33:25 +00:00
|
|
|
#else
|
2015-08-06 20:43:15 +00:00
|
|
|
setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
|
2012-02-08 22:33:25 +00:00
|
|
|
#endif
|
|
|
|
|
2015-08-06 20:43:15 +00:00
|
|
|
setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
|
2019-10-24 13:29:32 +00:00
|
|
|
|
|
|
|
/* Set power polarity to high active */
|
|
|
|
#ifdef CONFIG_MXC_USB_OTG_HACTIVE
|
|
|
|
setbits_le32(ctrl, UCTRL_PWR_POL);
|
|
|
|
#else
|
|
|
|
clrbits_le32(ctrl, UCTRL_PWR_POL);
|
|
|
|
#endif
|
2014-11-10 00:50:39 +00:00
|
|
|
}
|
|
|
|
|
2015-08-06 20:43:16 +00:00
|
|
|
/**
|
2016-05-05 23:59:12 +00:00
|
|
|
* board_usb_phy_mode - override usb phy mode
|
2015-08-06 20:43:16 +00:00
|
|
|
* @port: usb host/otg port
|
|
|
|
*
|
|
|
|
* Target board specific, override usb_phy_mode.
|
|
|
|
* When usb-otg is used as usb host port, iomux pad usb_otg_id can be
|
|
|
|
* left disconnected in this case usb_phy_mode will not be able to identify
|
|
|
|
* the phy mode that usb port is used.
|
|
|
|
* Machine file overrides board_usb_phy_mode.
|
|
|
|
*
|
|
|
|
* Return: USB_INIT_DEVICE or USB_INIT_HOST
|
|
|
|
*/
|
2014-11-10 00:50:39 +00:00
|
|
|
int __weak board_usb_phy_mode(int port)
|
|
|
|
{
|
|
|
|
return usb_phy_mode(port);
|
|
|
|
}
|
|
|
|
|
2015-08-06 20:43:16 +00:00
|
|
|
/**
|
|
|
|
* board_ehci_hcd_init - set usb vbus voltage
|
|
|
|
* @port: usb otg port
|
|
|
|
*
|
|
|
|
* Target board specific, setup iomux pad to setup supply vbus voltage
|
|
|
|
* for usb otg port. Machine board file overrides board_ehci_hcd_init
|
|
|
|
*
|
|
|
|
* Return: 0 Success
|
|
|
|
*/
|
2012-11-13 09:58:35 +00:00
|
|
|
int __weak board_ehci_hcd_init(int port)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-06 20:43:16 +00:00
|
|
|
/**
|
|
|
|
* board_ehci_power - enables/disables usb vbus voltage
|
|
|
|
* @port: usb otg port
|
|
|
|
* @on: on/off vbus voltage
|
|
|
|
*
|
|
|
|
* Enables/disables supply vbus voltage for usb otg port.
|
|
|
|
* Machine board file overrides board_ehci_power
|
|
|
|
*
|
|
|
|
* Return: 0 Success
|
|
|
|
*/
|
2013-10-10 22:27:59 +00:00
|
|
|
int __weak board_ehci_power(int port, int on)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-17 06:19:27 +00:00
|
|
|
int ehci_mx6_common_init(struct usb_ehci *ehci, int index)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
enable_usboh3_clk(1);
|
|
|
|
mdelay(1);
|
|
|
|
|
|
|
|
/* Do board specific initialization */
|
|
|
|
ret = board_ehci_hcd_init(index);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
usb_power_config(index);
|
|
|
|
usb_oc_config(index);
|
|
|
|
|
2019-10-24 13:29:32 +00:00
|
|
|
#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)
|
2016-06-17 06:19:27 +00:00
|
|
|
usb_internal_phy_clock_gate(index, 1);
|
|
|
|
usb_phy_enable(index, ehci);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-11-21 07:43:56 +00:00
|
|
|
#if !CONFIG_IS_ENABLED(DM_USB)
|
2013-10-10 22:27:57 +00:00
|
|
|
int ehci_hcd_init(int index, enum usb_init_type init,
|
|
|
|
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
|
2012-02-08 22:33:25 +00:00
|
|
|
{
|
2013-10-10 22:27:59 +00:00
|
|
|
enum usb_init_type type;
|
2015-08-06 20:43:17 +00:00
|
|
|
#if defined(CONFIG_MX6)
|
|
|
|
u32 controller_spacing = 0x200;
|
2019-10-24 13:29:32 +00:00
|
|
|
#elif defined(CONFIG_MX7) || defined(CONFIG_MX7ULP)
|
2015-08-06 20:43:17 +00:00
|
|
|
u32 controller_spacing = 0x10000;
|
|
|
|
#endif
|
2014-09-15 09:23:14 +00:00
|
|
|
struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR +
|
2015-08-06 20:43:17 +00:00
|
|
|
(controller_spacing * index));
|
2016-05-05 23:59:12 +00:00
|
|
|
int ret;
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
if (index > 3)
|
|
|
|
return -EINVAL;
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2020-05-01 14:08:36 +00:00
|
|
|
if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
|
|
|
|
if (usb_fused((ulong)ehci)) {
|
|
|
|
printf("SoC fuse indicates USB@0x%lx is unavailable.\n",
|
|
|
|
(ulong)ehci);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-17 06:19:27 +00:00
|
|
|
ret = ehci_mx6_common_init(ehci, index);
|
2016-05-05 23:59:12 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2013-10-10 22:27:59 +00:00
|
|
|
|
2014-11-10 00:50:39 +00:00
|
|
|
type = board_usb_phy_mode(index);
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2016-06-17 06:19:27 +00:00
|
|
|
if (hccr && hcor) {
|
|
|
|
*hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
|
|
|
|
*hcor = (struct ehci_hcor *)((uint32_t)*hccr +
|
|
|
|
HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
|
|
|
|
}
|
2012-02-08 22:33:25 +00:00
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
if ((type == init) || (type == USB_INIT_DEVICE))
|
|
|
|
board_ehci_power(index, (type == USB_INIT_DEVICE) ? 0 : 1);
|
|
|
|
if (type != init)
|
|
|
|
return -ENODEV;
|
|
|
|
if (type == USB_INIT_DEVICE)
|
|
|
|
return 0;
|
2015-08-06 20:43:17 +00:00
|
|
|
|
2013-10-10 22:27:59 +00:00
|
|
|
setbits_le32(&ehci->usbmode, CM_HOST);
|
2015-08-06 20:43:15 +00:00
|
|
|
writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
|
2012-02-08 22:33:25 +00:00
|
|
|
setbits_le32(&ehci->portsc, USB_EN);
|
|
|
|
|
|
|
|
mdelay(10);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-25 22:14:35 +00:00
|
|
|
int ehci_hcd_stop(int index)
|
2012-02-08 22:33:25 +00:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2016-06-17 06:19:27 +00:00
|
|
|
#else
|
|
|
|
struct ehci_mx6_priv_data {
|
|
|
|
struct ehci_ctrl ctrl;
|
|
|
|
struct usb_ehci *ehci;
|
2016-12-22 09:06:43 +00:00
|
|
|
struct udevice *vbus_supply;
|
2016-06-17 06:19:27 +00:00
|
|
|
enum usb_init_type init_type;
|
|
|
|
int portnr;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int mx6_init_after_reset(struct ehci_ctrl *dev)
|
|
|
|
{
|
|
|
|
struct ehci_mx6_priv_data *priv = dev->priv;
|
|
|
|
enum usb_init_type type = priv->init_type;
|
|
|
|
struct usb_ehci *ehci = priv->ehci;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = ehci_mx6_common_init(priv->ehci, priv->portnr);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2019-02-01 16:40:08 +00:00
|
|
|
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
2016-12-22 09:06:43 +00:00
|
|
|
if (priv->vbus_supply) {
|
|
|
|
ret = regulator_set_enable(priv->vbus_supply,
|
|
|
|
(type == USB_INIT_DEVICE) ?
|
|
|
|
false : true);
|
2020-05-21 21:32:23 +00:00
|
|
|
if (ret && ret != -ENOSYS) {
|
2020-05-21 21:34:06 +00:00
|
|
|
printf("Error enabling VBUS supply (ret=%i)\n", ret);
|
2016-12-22 09:06:43 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2019-02-01 16:40:08 +00:00
|
|
|
#endif
|
2016-06-17 06:19:27 +00:00
|
|
|
|
|
|
|
if (type == USB_INIT_DEVICE)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
setbits_le32(&ehci->usbmode, CM_HOST);
|
|
|
|
writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
|
|
|
|
setbits_le32(&ehci->portsc, USB_EN);
|
|
|
|
|
|
|
|
mdelay(10);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct ehci_ops mx6_ehci_ops = {
|
|
|
|
.init_after_reset = mx6_init_after_reset
|
|
|
|
};
|
|
|
|
|
2016-12-22 09:06:42 +00:00
|
|
|
static int ehci_usb_phy_mode(struct udevice *dev)
|
|
|
|
{
|
|
|
|
struct usb_platdata *plat = dev_get_platdata(dev);
|
2017-05-17 23:18:05 +00:00
|
|
|
void *__iomem addr = (void *__iomem)devfdt_get_addr(dev);
|
2016-12-22 09:06:42 +00:00
|
|
|
void *__iomem phy_ctrl, *__iomem phy_status;
|
|
|
|
const void *blob = gd->fdt_blob;
|
2017-01-17 23:52:55 +00:00
|
|
|
int offset = dev_of_offset(dev), phy_off;
|
2016-12-22 09:06:42 +00:00
|
|
|
u32 val;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* About fsl,usbphy, Refer to
|
|
|
|
* Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt.
|
|
|
|
*/
|
2019-10-24 13:29:32 +00:00
|
|
|
if (is_mx6() || is_mx7ulp()) {
|
2016-12-22 09:06:42 +00:00
|
|
|
phy_off = fdtdec_lookup_phandle(blob,
|
|
|
|
offset,
|
|
|
|
"fsl,usbphy");
|
|
|
|
if (phy_off < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
addr = (void __iomem *)fdtdec_get_addr(blob, phy_off,
|
|
|
|
"reg");
|
|
|
|
if ((fdt_addr_t)addr == FDT_ADDR_T_NONE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
phy_ctrl = (void __iomem *)(addr + USBPHY_CTRL);
|
|
|
|
val = readl(phy_ctrl);
|
|
|
|
|
|
|
|
if (val & USBPHY_CTRL_OTG_ID)
|
|
|
|
plat->init_type = USB_INIT_DEVICE;
|
|
|
|
else
|
|
|
|
plat->init_type = USB_INIT_HOST;
|
|
|
|
} else if (is_mx7()) {
|
|
|
|
phy_status = (void __iomem *)(addr +
|
|
|
|
USBNC_PHY_STATUS_OFFSET);
|
|
|
|
val = readl(phy_status);
|
|
|
|
|
|
|
|
if (val & USBNC_PHYSTATUS_ID_DIG)
|
|
|
|
plat->init_type = USB_INIT_DEVICE;
|
|
|
|
else
|
|
|
|
plat->init_type = USB_INIT_HOST;
|
|
|
|
} else {
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
|
|
|
|
{
|
|
|
|
struct usb_platdata *plat = dev_get_platdata(dev);
|
2019-04-03 13:41:56 +00:00
|
|
|
enum usb_dr_mode dr_mode;
|
2016-12-22 09:06:42 +00:00
|
|
|
|
2020-03-04 00:59:50 +00:00
|
|
|
dr_mode = usb_get_dr_mode(dev->node);
|
2016-12-22 09:06:42 +00:00
|
|
|
|
2019-04-03 13:41:56 +00:00
|
|
|
switch (dr_mode) {
|
|
|
|
case USB_DR_MODE_HOST:
|
|
|
|
plat->init_type = USB_INIT_HOST;
|
|
|
|
break;
|
|
|
|
case USB_DR_MODE_PERIPHERAL:
|
|
|
|
plat->init_type = USB_INIT_DEVICE;
|
|
|
|
break;
|
|
|
|
case USB_DR_MODE_OTG:
|
|
|
|
case USB_DR_MODE_UNKNOWN:
|
|
|
|
return ehci_usb_phy_mode(dev);
|
|
|
|
};
|
2016-12-22 09:06:42 +00:00
|
|
|
|
2019-04-03 13:41:56 +00:00
|
|
|
return 0;
|
2016-12-22 09:06:42 +00:00
|
|
|
}
|
|
|
|
|
usb: ehci-mx6: Fix bus enumeration for DM case
The EHCI iMX6 driver is only partly converted to DT probing and
still uses a tremendous amount of hard-coded addresses. Worse,
the driver uses hard-coded SoC-model-specific base addresses, which
are derived from values protected by SoC-specific macros, hence the
driver is also compiled for a specific SoC model. Even worse, the
driver depends on specific sequential indexing of the controllers,
from which it derives offsets in the PHY and ANATOP register sets.
However, when the driver is probed from DT, the indexing is not
correct. In fact, each controller has index 0. This patch derives
the index for DT probing case from the controller base addresses,
which is not the way this should be done, however it is the least
intrusive approach, favorable this close to release.
The necessary steps to convert this driver fully to DT probing are
described inside the patch, however this should be done in the next
release and depends on iMX clock driver patches.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Adam Ford <aford173@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>
2019-06-24 17:05:47 +00:00
|
|
|
static int ehci_usb_bind(struct udevice *dev)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* TODO:
|
|
|
|
* This driver is only partly converted to DT probing and still uses
|
|
|
|
* a tremendous amount of hard-coded addresses. To make things worse,
|
|
|
|
* the driver depends on specific sequential indexing of controllers,
|
|
|
|
* from which it derives offsets in the PHY and ANATOP register sets.
|
|
|
|
*
|
|
|
|
* Here we attempt to calculate these indexes from DT information as
|
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
This fixes the issues with calculation of controller indexes in
ehci_usb_bind() for iMX7, as USB controllers on iMX7 SoCs aren't
placed next to each other, and their addresses incremented by 0x10000.
Example of USB nodes for iMX7S/D:
usbotg1: usb@30b10000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b10000 0x200>;
^^^^^^^^^^
....
usbotg2: usb@30b20000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b20000 0x200>;
^^^^^^^^^^
....
usbh: usb@30b30000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b30000 0x200>;
^^^^^^^^^^
....
Which was leading to usb enumeration issues:
Colibri iMX7 # usb start
starting USB...
Bus usb@30b10000: USB EHCI 1.00
Bus usb@30b20000: probe failed, error -22
scanning bus usb@30b10000 for devices... 1 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Fixes: 501547cec1("usb: ehci-mx6: Fix bus enumeration for DM case")
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-10-10 13:09:35 +00:00
|
|
|
* well as we can. The USB controllers on all existing iMX6 SoCs
|
|
|
|
* are placed next to each other, at addresses incremented by 0x200,
|
|
|
|
* and iMX7 their addresses are shifted by 0x10000.
|
|
|
|
* Thus, the index is derived from the multiple of 0x200 (0x10000 for
|
|
|
|
* iMX7) offset from the first controller address.
|
usb: ehci-mx6: Fix bus enumeration for DM case
The EHCI iMX6 driver is only partly converted to DT probing and
still uses a tremendous amount of hard-coded addresses. Worse,
the driver uses hard-coded SoC-model-specific base addresses, which
are derived from values protected by SoC-specific macros, hence the
driver is also compiled for a specific SoC model. Even worse, the
driver depends on specific sequential indexing of the controllers,
from which it derives offsets in the PHY and ANATOP register sets.
However, when the driver is probed from DT, the indexing is not
correct. In fact, each controller has index 0. This patch derives
the index for DT probing case from the controller base addresses,
which is not the way this should be done, however it is the least
intrusive approach, favorable this close to release.
The necessary steps to convert this driver fully to DT probing are
described inside the patch, however this should be done in the next
release and depends on iMX clock driver patches.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Adam Ford <aford173@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>
2019-06-24 17:05:47 +00:00
|
|
|
*
|
|
|
|
* However, to complete conversion of this driver to DT probing, the
|
|
|
|
* following has to be done:
|
|
|
|
* - DM clock framework support for iMX must be implemented
|
|
|
|
* - usb_power_config() has to be converted to clock framework
|
|
|
|
* -> Thus, the ad-hoc "index" variable goes away.
|
|
|
|
* - USB PHY handling has to be factored out into separate driver
|
|
|
|
* -> Thus, the ad-hoc "index" variable goes away from the PHY
|
|
|
|
* code, the PHY driver must parse it's address from DT. This
|
|
|
|
* USB driver must find the PHY driver via DT phandle.
|
|
|
|
* -> usb_power_config() shall be moved to PHY driver
|
|
|
|
* With these changes in place, the ad-hoc indexing goes away and
|
|
|
|
* the driver is fully converted to DT probing.
|
|
|
|
*/
|
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
This fixes the issues with calculation of controller indexes in
ehci_usb_bind() for iMX7, as USB controllers on iMX7 SoCs aren't
placed next to each other, and their addresses incremented by 0x10000.
Example of USB nodes for iMX7S/D:
usbotg1: usb@30b10000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b10000 0x200>;
^^^^^^^^^^
....
usbotg2: usb@30b20000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b20000 0x200>;
^^^^^^^^^^
....
usbh: usb@30b30000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b30000 0x200>;
^^^^^^^^^^
....
Which was leading to usb enumeration issues:
Colibri iMX7 # usb start
starting USB...
Bus usb@30b10000: USB EHCI 1.00
Bus usb@30b20000: probe failed, error -22
scanning bus usb@30b10000 for devices... 1 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Fixes: 501547cec1("usb: ehci-mx6: Fix bus enumeration for DM case")
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-10-10 13:09:35 +00:00
|
|
|
u32 controller_spacing = is_mx7() ? 0x10000 : 0x200;
|
|
|
|
fdt_addr_t addr = devfdt_get_addr_index(dev, 0);
|
usb: ehci-mx6: Fix bus enumeration for DM case
The EHCI iMX6 driver is only partly converted to DT probing and
still uses a tremendous amount of hard-coded addresses. Worse,
the driver uses hard-coded SoC-model-specific base addresses, which
are derived from values protected by SoC-specific macros, hence the
driver is also compiled for a specific SoC model. Even worse, the
driver depends on specific sequential indexing of the controllers,
from which it derives offsets in the PHY and ANATOP register sets.
However, when the driver is probed from DT, the indexing is not
correct. In fact, each controller has index 0. This patch derives
the index for DT probing case from the controller base addresses,
which is not the way this should be done, however it is the least
intrusive approach, favorable this close to release.
The necessary steps to convert this driver fully to DT probing are
described inside the patch, however this should be done in the next
release and depends on iMX clock driver patches.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Adam Ford <aford173@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>
2019-06-24 17:05:47 +00:00
|
|
|
|
usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs
This fixes the issues with calculation of controller indexes in
ehci_usb_bind() for iMX7, as USB controllers on iMX7 SoCs aren't
placed next to each other, and their addresses incremented by 0x10000.
Example of USB nodes for iMX7S/D:
usbotg1: usb@30b10000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b10000 0x200>;
^^^^^^^^^^
....
usbotg2: usb@30b20000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b20000 0x200>;
^^^^^^^^^^
....
usbh: usb@30b30000 {
compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
reg = <0x30b30000 0x200>;
^^^^^^^^^^
....
Which was leading to usb enumeration issues:
Colibri iMX7 # usb start
starting USB...
Bus usb@30b10000: USB EHCI 1.00
Bus usb@30b20000: probe failed, error -22
scanning bus usb@30b10000 for devices... 1 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Fixes: 501547cec1("usb: ehci-mx6: Fix bus enumeration for DM case")
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-10-10 13:09:35 +00:00
|
|
|
dev->req_seq = (addr - USB_BASE_ADDR) / controller_spacing;
|
usb: ehci-mx6: Fix bus enumeration for DM case
The EHCI iMX6 driver is only partly converted to DT probing and
still uses a tremendous amount of hard-coded addresses. Worse,
the driver uses hard-coded SoC-model-specific base addresses, which
are derived from values protected by SoC-specific macros, hence the
driver is also compiled for a specific SoC model. Even worse, the
driver depends on specific sequential indexing of the controllers,
from which it derives offsets in the PHY and ANATOP register sets.
However, when the driver is probed from DT, the indexing is not
correct. In fact, each controller has index 0. This patch derives
the index for DT probing case from the controller base addresses,
which is not the way this should be done, however it is the least
intrusive approach, favorable this close to release.
The necessary steps to convert this driver fully to DT probing are
described inside the patch, however this should be done in the next
release and depends on iMX clock driver patches.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Adam Ford <aford173@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>
2019-06-24 17:05:47 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-17 06:19:27 +00:00
|
|
|
static int ehci_usb_probe(struct udevice *dev)
|
|
|
|
{
|
|
|
|
struct usb_platdata *plat = dev_get_platdata(dev);
|
2017-05-17 23:18:05 +00:00
|
|
|
struct usb_ehci *ehci = (struct usb_ehci *)devfdt_get_addr(dev);
|
2016-06-17 06:19:27 +00:00
|
|
|
struct ehci_mx6_priv_data *priv = dev_get_priv(dev);
|
2016-12-22 09:06:43 +00:00
|
|
|
enum usb_init_type type = plat->init_type;
|
2016-06-17 06:19:27 +00:00
|
|
|
struct ehci_hccr *hccr;
|
|
|
|
struct ehci_hcor *hcor;
|
|
|
|
int ret;
|
|
|
|
|
2020-05-01 14:08:36 +00:00
|
|
|
if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
|
|
|
|
if (usb_fused((ulong)ehci)) {
|
|
|
|
printf("SoC fuse indicates USB@0x%lx is unavailable.\n",
|
|
|
|
(ulong)ehci);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-17 06:19:27 +00:00
|
|
|
priv->ehci = ehci;
|
|
|
|
priv->portnr = dev->seq;
|
2016-12-22 09:06:43 +00:00
|
|
|
priv->init_type = type;
|
|
|
|
|
2019-02-01 16:40:08 +00:00
|
|
|
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
2016-12-22 09:06:43 +00:00
|
|
|
ret = device_get_supply_regulator(dev, "vbus-supply",
|
|
|
|
&priv->vbus_supply);
|
|
|
|
if (ret)
|
|
|
|
debug("%s: No vbus supply\n", dev->name);
|
2019-02-01 16:40:08 +00:00
|
|
|
#endif
|
2016-06-17 06:19:27 +00:00
|
|
|
ret = ehci_mx6_common_init(ehci, priv->portnr);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2019-02-01 16:40:08 +00:00
|
|
|
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
2016-12-22 09:06:43 +00:00
|
|
|
if (priv->vbus_supply) {
|
|
|
|
ret = regulator_set_enable(priv->vbus_supply,
|
|
|
|
(type == USB_INIT_DEVICE) ?
|
|
|
|
false : true);
|
2020-05-21 21:32:23 +00:00
|
|
|
if (ret && ret != -ENOSYS) {
|
2020-05-21 21:34:06 +00:00
|
|
|
printf("Error enabling VBUS supply (ret=%i)\n", ret);
|
2016-12-22 09:06:43 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2019-02-01 16:40:08 +00:00
|
|
|
#endif
|
2016-06-17 06:19:27 +00:00
|
|
|
|
|
|
|
if (priv->init_type == USB_INIT_HOST) {
|
|
|
|
setbits_le32(&ehci->usbmode, CM_HOST);
|
|
|
|
writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
|
|
|
|
setbits_le32(&ehci->portsc, USB_EN);
|
|
|
|
}
|
|
|
|
|
|
|
|
mdelay(10);
|
|
|
|
|
|
|
|
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
|
|
|
|
hcor = (struct ehci_hcor *)((uint32_t)hccr +
|
|
|
|
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
|
|
|
|
|
|
|
|
return ehci_register(dev, hccr, hcor, &mx6_ehci_ops, 0, priv->init_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct udevice_id mx6_usb_ids[] = {
|
|
|
|
{ .compatible = "fsl,imx27-usb" },
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
U_BOOT_DRIVER(usb_mx6) = {
|
|
|
|
.name = "ehci_mx6",
|
|
|
|
.id = UCLASS_USB,
|
|
|
|
.of_match = mx6_usb_ids,
|
2016-12-22 09:06:42 +00:00
|
|
|
.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
|
usb: ehci-mx6: Fix bus enumeration for DM case
The EHCI iMX6 driver is only partly converted to DT probing and
still uses a tremendous amount of hard-coded addresses. Worse,
the driver uses hard-coded SoC-model-specific base addresses, which
are derived from values protected by SoC-specific macros, hence the
driver is also compiled for a specific SoC model. Even worse, the
driver depends on specific sequential indexing of the controllers,
from which it derives offsets in the PHY and ANATOP register sets.
However, when the driver is probed from DT, the indexing is not
correct. In fact, each controller has index 0. This patch derives
the index for DT probing case from the controller base addresses,
which is not the way this should be done, however it is the least
intrusive approach, favorable this close to release.
The necessary steps to convert this driver fully to DT probing are
described inside the patch, however this should be done in the next
release and depends on iMX clock driver patches.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Abel Vesa <abel.vesa@nxp.com>
Cc: Adam Ford <aford173@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>
2019-06-24 17:05:47 +00:00
|
|
|
.bind = ehci_usb_bind,
|
2016-06-17 06:19:27 +00:00
|
|
|
.probe = ehci_usb_probe,
|
2016-09-06 13:17:34 +00:00
|
|
|
.remove = ehci_deregister,
|
2016-06-17 06:19:27 +00:00
|
|
|
.ops = &ehci_usb_ops,
|
|
|
|
.platdata_auto_alloc_size = sizeof(struct usb_platdata),
|
|
|
|
.priv_auto_alloc_size = sizeof(struct ehci_mx6_priv_data),
|
|
|
|
.flags = DM_FLAG_ALLOC_PRIV_DMA,
|
|
|
|
};
|
|
|
|
#endif
|