* [U-Boot] [PATCH 02/15][v3] imx: usb: ehci-mx7 add usb driver for i.MX7D
@ 2015-07-22 22:24 Adrian Alonso
2015-07-23 5:56 ` Marek Vasut
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Alonso @ 2015-07-22 22:24 UTC (permalink / raw)
To: u-boot
* Add support for usb driver for i.MX7D SoC
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
---
Changes for V2: Resend
Changes for V3:
- Integrate review obserbations
- Add comments for fucntions board_ehci_hcd_init/board_ehci_power
drivers/usb/host/Makefile | 1 +
drivers/usb/host/ehci-mx7.c | 112 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 113 insertions(+)
create mode 100644 drivers/usb/host/ehci-mx7.c
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 4d35d3e..7267160 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
obj-$(CONFIG_USB_EHCI_MXS) += ehci-mxs.o
obj-$(CONFIG_USB_EHCI_MX5) += ehci-mx5.o
obj-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o
+obj-$(CONFIG_USB_EHCI_MX7) += ehci-mx7.o
obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o
obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
diff --git a/drivers/usb/host/ehci-mx7.c b/drivers/usb/host/ehci-mx7.c
new file mode 100644
index 0000000..40aed07
--- /dev/null
+++ b/drivers/usb/host/ehci-mx7.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <usb.h>
+#include <errno.h>
+#include <linux/compiler.h>
+#include <usb/ehci-fsl.h>
+#include <asm/io.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/clock.h>
+#include <asm/imx-common/iomux-v3.h>
+
+#include "ehci.h"
+
+#define USB_NC_OFFSET 0x200
+
+#define UCTRL_PM (1 << 9) /* OTG Power Mask */
+#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 */
+
+/* Base address for this IP block is 0x02184800 */
+struct usbnc_regs {
+ u32 ctrl1;
+ u32 ctrl2;
+ u32 reserve1[11];
+ u32 phy_ctrl2;
+ u32 reserve2[6];
+ u32 adp_cfg1;
+ u32 reserve3;
+ u32 adp_status;
+};
+
+static void usb_oc_config(int index)
+{
+ struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+ (0x10000 * index) + USB_NC_OFFSET);
+ void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
+
+ setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
+ setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM);
+}
+
+/*
+ * board_ehci_hcd_init - set usb vbus voltage
+ * Setup iomux pad to setup supply vbus voltage for usb otg port.
+ * Machine board file overrides board_ehci_hcd_init
+ * @port: usb otg port
+ *
+ */
+int __weak board_ehci_hcd_init(int port)
+{
+ return 0;
+}
+
+/*
+ * board_ehci_power - enables/disables usb vbus voltage
+ * Enables/disables supply vbus voltage for usb otg port.
+ * Machine board file overrides board_ehci_power
+ * @port: usb otg port
+ * @on: on/off vbus voltage
+ *
+ */
+int __weak board_ehci_power(int port, int on)
+{
+ return 0;
+}
+
+int ehci_hcd_init(int index, enum usb_init_type init,
+ struct ehci_hccr **hccr, struct ehci_hcor **hcor)
+{
+ struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR +
+ (0x10000 * index));
+
+ if (index > 3)
+ return -EINVAL;
+ enable_usboh3_clk(1);
+ mdelay(1);
+
+ /* Do board specific initialization */
+ board_ehci_hcd_init(index);
+
+ usb_oc_config(index);
+
+ *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
+ *hcor = (struct ehci_hcor *)((uint32_t)*hccr +
+ HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
+
+ board_ehci_power(index, (init == USB_INIT_DEVICE) ? 0 : 1);
+ if (init == 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;
+}
+
+int ehci_hcd_stop(int index)
+{
+ return 0;
+}
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH 02/15][v3] imx: usb: ehci-mx7 add usb driver for i.MX7D
2015-07-22 22:24 [U-Boot] [PATCH 02/15][v3] imx: usb: ehci-mx7 add usb driver for i.MX7D Adrian Alonso
@ 2015-07-23 5:56 ` Marek Vasut
0 siblings, 0 replies; 2+ messages in thread
From: Marek Vasut @ 2015-07-23 5:56 UTC (permalink / raw)
To: u-boot
On Thursday, July 23, 2015 at 12:24:22 AM, Adrian Alonso wrote:
> * Add support for usb driver for i.MX7D SoC
Please drop this asterisk, it's pointless.
> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
> Signed-off-by: Ye.Li <B37916@freescale.com>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> ---
> Changes for V2: Resend
> Changes for V3:
> - Integrate review obserbations
> - Add comments for fucntions board_ehci_hcd_init/board_ehci_power
>
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-mx7.c | 112
> ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113
> insertions(+)
> create mode 100644 drivers/usb/host/ehci-mx7.c
>
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 4d35d3e..7267160 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -36,6 +36,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
> obj-$(CONFIG_USB_EHCI_MXS) += ehci-mxs.o
> obj-$(CONFIG_USB_EHCI_MX5) += ehci-mx5.o
> obj-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o
> +obj-$(CONFIG_USB_EHCI_MX7) += ehci-mx7.o
> obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o
> obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
> obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
> diff --git a/drivers/usb/host/ehci-mx7.c b/drivers/usb/host/ehci-mx7.c
> new file mode 100644
> index 0000000..40aed07
> --- /dev/null
> +++ b/drivers/usb/host/ehci-mx7.c
> @@ -0,0 +1,112 @@
> +/*
> + * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
> + * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <usb.h>
> +#include <errno.h>
> +#include <linux/compiler.h>
> +#include <usb/ehci-fsl.h>
> +#include <asm/io.h>
> +#include <asm/arch/crm_regs.h>
> +#include <asm/arch/clock.h>
> +#include <asm/imx-common/iomux-v3.h>
> +
> +#include "ehci.h"
> +
> +#define USB_NC_OFFSET 0x200
> +
> +#define UCTRL_PM (1 << 9) /* OTG Power Mask */
> +#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 */
> +
> +/* Base address for this IP block is 0x02184800 */
> +struct usbnc_regs {
> + u32 ctrl1;
> + u32 ctrl2;
> + u32 reserve1[11];
> + u32 phy_ctrl2;
> + u32 reserve2[6];
> + u32 adp_cfg1;
> + u32 reserve3;
> + u32 adp_status;
> +};
> +
> +static void usb_oc_config(int index)
> +{
> + struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
> + (0x10000 * index) + USB_NC_OFFSET);
> + void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
> +
> + setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
> + setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM);
> +}
> +
> +/*
This is not valid kerneldoc, see documentation here:
https://www.kernel.org/doc/Documentation/kernel-doc-nano-HOWTO.txt
> + * board_ehci_hcd_init - set usb vbus voltage
> + * Setup iomux pad to setup supply vbus voltage for usb otg port.
> + * Machine board file overrides board_ehci_hcd_init
> + * @port: usb otg port
> + *
> + */
Other than that, it's cool. Can you please re-send it in-reply-to to
the original series ?
Thanks!
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-23 5:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-22 22:24 [U-Boot] [PATCH 02/15][v3] imx: usb: ehci-mx7 add usb driver for i.MX7D Adrian Alonso
2015-07-23 5:56 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox