Hi Simon,
> -----Original Message-----
> From: Siva Durga Prasad Paladugu
> Sent: Tuesday, June 28, 2016 11:38 AM
> To: 'Simon Glass' <s...@chromium.org>; U-Boot Mailing List <u-
> b...@lists.denx.de>
> Cc: Marek Vasut <ma...@denx.de>; 'Hans de Goede' <hdego...@redhat.com>
> Subject: RE: [U-Boot] [PATCH 24/27] dm: zynq: usb: Convert to
> CONFIG_DM_USB
>
> Hi Simon,
>
> > -----Original Message-----
> > From: U-Boot [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Simon
> > Glass
> > Sent: Monday, June 13, 2016 11:01 AM
> > To: U-Boot Mailing List <u-boot@lists.denx.de>
> > Cc: Marek Vasut <ma...@denx.de>
> > Subject: [U-Boot] [PATCH 24/27] dm: zynq: usb: Convert to
> > CONFIG_DM_USB
> >
> > Convert zynq USB to driver model. It does not actually work, but the
> > error is similar.
> >
> > Before:
> >
> > Zynq> dm tree
> > Class Probed Name
> > ----------------------------------------
> > root [ + ] root_driver
> > rsa_mod_exp [ ] |-- mod_exp_sw
> > simple_bus [ + ] `-- amba
> > gpio [ ] |-- gpio@e000a000
> > serial [ + ] |-- serial@e0001000
> > spi [ + ] |-- spi@e000d000
> > spi_flash [ ] | `-- spi_flash@0:0
> > eth [ + ] |-- ethernet@e000b000
> > mmc [ + ] |-- sdhci@e0100000
> > simple_bus [ ] `-- slcr@f8000000
> > Zynq> usb start
> > starting USB...
> > USB0: USB EHCI 1.00
> > scanning bus 0 for devices... 2 USB Device(s) found
> > USB1: usb1 wrong num MIO: 0, Index 1
> > lowlevel init failed
> > scanning usb for storage devices... 0 Storage Device(s) found
> > Zynq>
> >
> > After:
> >
> > Zynq> dm tree
> > Class Probed Name
> > ----------------------------------------
> > root [ + ] root_driver
> > rsa_mod_exp [ ] |-- mod_exp_sw
> > simple_bus [ + ] `-- amba
> > gpio [ ] |-- gpio@e000a000
> > serial [ + ] |-- serial@e0001000
> > spi [ + ] |-- spi@e000d000
> > spi_flash [ ] | `-- spi_flash@0:0
> > eth [ + ] |-- ethernet@e000b000
> > mmc [ + ] |-- sdhci@e0100000
> > blk [ + ] | `-- sd...@e0100000.blk
> > simple_bus [ ] |-- slcr@f8000000
> > usb [ + ] `-- usb@e0002000
> > Zynq> usb start
> > starting USB...
> > USB0: USB EHCI 1.00
> > scanning bus 0 for devices... Error: Cannot find high speed parent of
> > usb-1 device EHCI timed out on TD - token=0x80008c80 unable to get
> > device descriptor (error=-1) failed, error -1
> > Zynq>
> >
> > Signed-off-by: Simon Glass <s...@chromium.org>
> > ---
> >
> > arch/arm/Kconfig | 2 +
> > drivers/usb/host/ehci-zynq.c | 102
> > +++++++++++++++++++++----------------------
> > 2 files changed, 52 insertions(+), 52 deletions(-)
> >
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index
> > 1af9c35..2b501eb
> > 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -643,6 +643,7 @@ config ARCH_ZYNQ
> > select DM_SERIAL
> > select DM_SPI_FLASH
> > select SPL_SEPARATE_BSS if SPL
> > + select DM_USB
> >
> > config ARCH_ZYNQMP
> > bool "Support Xilinx ZynqMP Platform"
> > @@ -651,6 +652,7 @@ config ARCH_ZYNQMP
> > select OF_CONTROL
> > select DM_SERIAL
> > select SUPPORT_SPL
> > + select DM_USB
> >
> > config TEGRA
> > bool "NVIDIA Tegra"
> > diff --git a/drivers/usb/host/ehci-zynq.c
> > b/drivers/usb/host/ehci-zynq.c index 37a7935..b45c68d 100644
> > --- a/drivers/usb/host/ehci-zynq.c
> > +++ b/drivers/usb/host/ehci-zynq.c
> > @@ -7,55 +7,47 @@
> > */
> >
> > #include <common.h>
> > +#include <dm.h>
> > +#include <usb.h>
> > #include <asm/arch/hardware.h>
> > #include <asm/arch/sys_proto.h>
> > #include <asm/io.h>
> > -#include <usb.h>
> > #include <usb/ehci-ci.h>
> > #include <usb/ulpi.h>
> >
> > #include "ehci.h"
> >
> > -#define ZYNQ_USB_USBCMD_RST 0x0000002
> > -#define ZYNQ_USB_USBCMD_STOP 0x0000000
> > -#define ZYNQ_USB_NUM_MIO 12
> > +struct zynq_ehci_priv {
> Please add below member to this structure as per my conversation with Hans de
> Goede.
> This solves the usb issue which you stated,
> Struct struct ehci_ctrl ehcictrl;
Can you add this element to structure (zynq_ehic_priv) as mentioned above in
your patch?
Thanks,
Siva
>
>
> Thanks,
> Siva
>
> > + struct usb_ehci *ehci;
> > +};
> >
> > -/*
> > - * Create the appropriate control structures to manage
> > - * a new EHCI host controller.
> > - */
> > -int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr
> > **hccr,
> > - struct ehci_hcor **hcor)
> > +static int ehci_zynq_ofdata_to_platdata(struct udevice *dev)
> > {
> > - struct usb_ehci *ehci;
> > + struct zynq_ehci_priv *priv = dev_get_priv(dev);
> > +
> > + priv->ehci = (struct usb_ehci *)dev_get_addr_ptr(dev);
> > + if (!priv->ehci)
> > + return -EINVAL;
> > +
> > + return 0;
> > +}
> > +
> > +static int ehci_zynq_probe(struct udevice *dev) {
> > + struct usb_platdata *plat = dev_get_platdata(dev);
> > + struct zynq_ehci_priv *priv = dev_get_priv(dev);
> > + struct ehci_hccr *hccr;
> > + struct ehci_hcor *hcor;
> > struct ulpi_viewport ulpi_vp;
> > - int ret, mio_usb;
> > /* Used for writing the ULPI data address */
> > struct ulpi_regs *ulpi = (struct ulpi_regs *)0;
> > + int ret;
> >
> > - if (!index) {
> > - mio_usb = zynq_slcr_get_mio_pin_status("usb0");
> > - if (mio_usb != ZYNQ_USB_NUM_MIO) {
> > - printf("usb0 wrong num MIO: %d, Index %d\n",
> > mio_usb,
> > - index);
> > - return -1;
> > - }
> > - ehci = (struct usb_ehci *)ZYNQ_USB_BASEADDR0;
> > - } else {
> > - mio_usb = zynq_slcr_get_mio_pin_status("usb1");
> > - if (mio_usb != ZYNQ_USB_NUM_MIO) {
> > - printf("usb1 wrong num MIO: %d, Index %d\n",
> > mio_usb,
> > - index);
> > - return -1;
> > - }
> > - ehci = (struct usb_ehci *)ZYNQ_USB_BASEADDR1;
> > - }
> > -
> > - *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
> > - *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
> > - HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
> > + hccr = (struct ehci_hccr *)((uint32_t)&priv->ehci->caplength);
> > + hcor = (struct ehci_hcor *)((uint32_t) hccr +
> > + HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> >
> > - ulpi_vp.viewport_addr = (u32)&ehci->ulpi_viewpoint;
> > + ulpi_vp.viewport_addr = (u32)&priv->ehci->ulpi_viewpoint;
> > ulpi_vp.port_num = 0;
> >
> > ret = ulpi_init(&ulpi_vp);
> > @@ -77,28 +69,34 @@ int ehci_hcd_init(int index, enum usb_init_type
> > init, struct ehci_hccr **hccr,
> > ulpi_write(&ulpi_vp, &ulpi->otg_ctrl_set,
> > ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
> >
> > - return 0;
> > + return ehci_register(dev, hccr, hcor, NULL, 0, plat->init_type);
> > }
> >
> > -/*
> > - * Destroy the appropriate control structures corresponding
> > - * the the EHCI host controller.
> > - */
> > -int ehci_hcd_stop(int index)
> > +static int ehci_zynq_remove(struct udevice *dev)
> > {
> > - struct usb_ehci *ehci;
> > -
> > - if (!index)
> > - ehci = (struct usb_ehci *)ZYNQ_USB_BASEADDR0;
> > - else
> > - ehci = (struct usb_ehci *)ZYNQ_USB_BASEADDR1;
> > + int ret;
> >
> > - /* Stop controller */
> > - writel(ZYNQ_USB_USBCMD_STOP, &ehci->usbcmd);
> > - udelay(1000);
> > -
> > - /* Initiate controller reset */
> > - writel(ZYNQ_USB_USBCMD_RST, &ehci->usbcmd);
> > + ret = ehci_deregister(dev);
> > + if (ret)
> > + return ret;
> >
> > return 0;
> > }
> > +
> > +static const struct udevice_id ehci_zynq_ids[] = {
> > + { .compatible = "xlnx,zynq-usb-2.20a" },
> > + { }
> > +};
> > +
> > +U_BOOT_DRIVER(ehci_zynq) = {
> > + .name = "ehci_zynq",
> > + .id = UCLASS_USB,
> > + .of_match = ehci_zynq_ids,
> > + .ofdata_to_platdata = ehci_zynq_ofdata_to_platdata,
> > + .probe = ehci_zynq_probe,
> > + .remove = ehci_zynq_remove,
> > + .ops = &ehci_usb_ops,
> > + .platdata_auto_alloc_size = sizeof(struct usb_platdata),
> > + .priv_auto_alloc_size = sizeof(struct zynq_ehci_priv),
> > + .flags = DM_FLAG_ALLOC_PRIV_DMA,
> > +};
> > --
> > 2.8.0.rc3.226.g39d4020
> >
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot@lists.denx.de
> > http://lists.denx.de/mailman/listinfo/u-boot
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
