[U-Boot] [USB EHCI V2 PATCH 0/2] Add initial support for USB ehci pci
Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware.
Signed-off-by: Michael Trimarchi trimarchimichael@yahoo.it
--- drivers/usb/Makefile | 1 + drivers/usb/usb_ehci_pci.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 drivers/usb/usb_ehci_pci.c
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 6ba154b..26189b6 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o +COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o
# device ifdef CONFIG_USB_DEVICE diff --git a/drivers/usb/usb_ehci_pci.c b/drivers/usb/usb_ehci_pci.c new file mode 100644 index 0000000..3e7143c --- /dev/null +++ b/drivers/usb/usb_ehci_pci.c @@ -0,0 +1,64 @@ +/*- + * Copyright (c) 2007-2008, Juniper Networks, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <pci.h> +#include <usb.h> +#include "usb_ehci.h" +#include "usb_ehci_core.h" + +#ifdef CONFIG_PCI_EHCI_DEVICE +static struct pci_device_id ehci_pci_ids[] = { + /* Please add supported PCI EHCI controller ids here */ + {0, 0} +}; +#endif + +/* + * Create the appropriate control structures to manage + * a new EHCI host controller. + */ +int ehci_hcd_init(void) +{ + pci_dev_t pdev; + uint32_t addr; + + pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE); + if (pdev == -1) { + printf("EHCI host controller not found\n"); + return -1; + } + + pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr); + hccr = (struct ehci_hccr *)addr; + hcor = (struct ehci_hcor *)((uint32_t) hccr + + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + + return 0; +} + +/* + * Destroy the appropriate control structures corresponding + * the the EHCI host controller. + */ +int ehci_hcd_stop(void) +{ + return 0; +}
Hello Michael,
Is this path 1/3, or 0/2 (file number 0 usually only contains some comments on the series to follow, and is thus not part of the patch series itself...)
Kind Regards,
Remy
2008/12/31 Michael Trimarchi trimarchi@gandalf.sssup.it:
Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware.
Signed-off-by: Michael Trimarchi trimarchimichael@yahoo.it
drivers/usb/Makefile | 1 + drivers/usb/usb_ehci_pci.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 drivers/usb/usb_ehci_pci.c
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 6ba154b..26189b6 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o +COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o
# device ifdef CONFIG_USB_DEVICE diff --git a/drivers/usb/usb_ehci_pci.c b/drivers/usb/usb_ehci_pci.c new file mode 100644 index 0000000..3e7143c --- /dev/null +++ b/drivers/usb/usb_ehci_pci.c @@ -0,0 +1,64 @@ +/*-
- Copyright (c) 2007-2008, Juniper Networks, Inc.
- All rights reserved.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation version 2 of
- the License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- */
+#include <common.h> +#include <pci.h> +#include <usb.h> +#include "usb_ehci.h" +#include "usb_ehci_core.h"
+#ifdef CONFIG_PCI_EHCI_DEVICE +static struct pci_device_id ehci_pci_ids[] = {
/* Please add supported PCI EHCI controller ids here */{0, 0}+}; +#endif
+/*
- Create the appropriate control structures to manage
- a new EHCI host controller.
- */
+int ehci_hcd_init(void) +{
pci_dev_t pdev;uint32_t addr;pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE);if (pdev == -1) {printf("EHCI host controller not found\n");return -1;}pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr);hccr = (struct ehci_hccr *)addr;hcor = (struct ehci_hcor *)((uint32_t) hccr +HC_LENGTH(ehci_readl(&hccr->cr_capbase)));return 0;+}
+/*
- Destroy the appropriate control structures corresponding
- the the EHCI host controller.
- */
+int ehci_hcd_stop(void) +{
return 0;+}
1.5.6.5
Hi,
Remy Bohmer wrote:
Hello Michael,
Is this path 1/3, or 0/2 (file number 0 usually only contains some comments on the series to follow, and is thus not part of the patch series itself...)
It is a mistake. I will pay attention in the feauture.
Kind Regards,
Remy
Regards Michael
Hello Michael,
2008/12/31 Michael Trimarchi trimarchi@gandalf.sssup.it:
Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware.
Signed-off-by: Michael Trimarchi trimarchimichael@yahoo.it
I applied this series to the u-boot-usb 'testing' branch. When it compiles properly, I move it to the 'next' branch for the next U-boot release.
Thanks.
Remy
drivers/usb/Makefile | 1 + drivers/usb/usb_ehci_pci.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 drivers/usb/usb_ehci_pci.c
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 6ba154b..26189b6 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o +COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o
# device ifdef CONFIG_USB_DEVICE diff --git a/drivers/usb/usb_ehci_pci.c b/drivers/usb/usb_ehci_pci.c new file mode 100644 index 0000000..3e7143c --- /dev/null +++ b/drivers/usb/usb_ehci_pci.c @@ -0,0 +1,64 @@ +/*-
- Copyright (c) 2007-2008, Juniper Networks, Inc.
- All rights reserved.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation version 2 of
- the License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- */
+#include <common.h> +#include <pci.h> +#include <usb.h> +#include "usb_ehci.h" +#include "usb_ehci_core.h"
+#ifdef CONFIG_PCI_EHCI_DEVICE +static struct pci_device_id ehci_pci_ids[] = {
/* Please add supported PCI EHCI controller ids here */{0, 0}+}; +#endif
+/*
- Create the appropriate control structures to manage
- a new EHCI host controller.
- */
+int ehci_hcd_init(void) +{
pci_dev_t pdev;uint32_t addr;pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE);if (pdev == -1) {printf("EHCI host controller not found\n");return -1;}pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr);hccr = (struct ehci_hccr *)addr;hcor = (struct ehci_hcor *)((uint32_t) hccr +HC_LENGTH(ehci_readl(&hccr->cr_capbase)));return 0;+}
+/*
- Destroy the appropriate control structures corresponding
- the the EHCI host controller.
- */
+int ehci_hcd_stop(void) +{
return 0;+}
1.5.6.5
participants (3)
-
michael -
Michael Trimarchi
-
Remy Bohmer