From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 01/32 v4] USB: EHCI: remove IXP4xx EHCI driver
Date: Mon, 8 Oct 2012 15:11:15 +0200 [thread overview]
Message-ID: <1349701906-16481-2-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349701906-16481-1-git-send-email-florian@openwrt.org>
This driver is not registered by any in-tree user. If needed it the EHCI
driver can be reinstatied using the ehci-platform driver with caps_offset to
0x100.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Changes in v4:
- rebased against greg's latest usb-next
No changes in v3
Changes in v2:
- slightly reworded commit message
drivers/usb/host/ehci-hcd.c | 5 --
drivers/usb/host/ehci-ixp4xx.c | 139 ----------------------------------------
2 files changed, 144 deletions(-)
delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 6bf6c42..442f774 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1249,11 +1249,6 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_orion_driver
#endif
-#ifdef CONFIG_ARCH_IXP4XX
-#include "ehci-ixp4xx.c"
-#define PLATFORM_DRIVER ixp4xx_ehci_driver
-#endif
-
#ifdef CONFIG_USB_W90X900_EHCI
#include "ehci-w90x900.c"
#define PLATFORM_DRIVER ehci_hcd_w90x900_driver
diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c
deleted file mode 100644
index f224c0a..0000000
--- a/drivers/usb/host/ehci-ixp4xx.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * IXP4XX EHCI Host Controller Driver
- *
- * Author: Vladimir Barinov <vbarinov@embeddedalley.com>
- *
- * Based on "ehci-fsl.c" by Randy Vinson <rvinson@mvista.com>
- *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#include <linux/platform_device.h>
-
-static int ixp4xx_ehci_init(struct usb_hcd *hcd)
-{
- struct ehci_hcd *ehci = hcd_to_ehci(hcd);
- int retval = 0;
-
- ehci->big_endian_desc = 1;
- ehci->big_endian_mmio = 1;
-
- ehci->caps = hcd->regs + 0x100;
-
- hcd->has_tt = 1;
-
- retval = ehci_setup(hcd);
- if (retval)
- return retval;
-
- ehci_port_power(ehci, 0);
-
- return retval;
-}
-
-static const struct hc_driver ixp4xx_ehci_hc_driver = {
- .description = hcd_name,
- .product_desc = "IXP4XX EHCI Host Controller",
- .hcd_priv_size = sizeof(struct ehci_hcd),
- .irq = ehci_irq,
- .flags = HCD_MEMORY | HCD_USB2,
- .reset = ixp4xx_ehci_init,
- .start = ehci_run,
- .stop = ehci_stop,
- .shutdown = ehci_shutdown,
- .urb_enqueue = ehci_urb_enqueue,
- .urb_dequeue = ehci_urb_dequeue,
- .endpoint_disable = ehci_endpoint_disable,
- .endpoint_reset = ehci_endpoint_reset,
- .get_frame_number = ehci_get_frame,
- .hub_status_data = ehci_hub_status_data,
- .hub_control = ehci_hub_control,
-#if defined(CONFIG_PM)
- .bus_suspend = ehci_bus_suspend,
- .bus_resume = ehci_bus_resume,
-#endif
- .relinquish_port = ehci_relinquish_port,
- .port_handed_over = ehci_port_handed_over,
-
- .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
-};
-
-static int ixp4xx_ehci_probe(struct platform_device *pdev)
-{
- struct usb_hcd *hcd;
- const struct hc_driver *driver = &ixp4xx_ehci_hc_driver;
- struct resource *res;
- int irq;
- int retval;
-
- if (usb_disabled())
- return -ENODEV;
-
- res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- if (!res) {
- dev_err(&pdev->dev,
- "Found HC with no IRQ. Check %s setup!\n",
- dev_name(&pdev->dev));
- return -ENODEV;
- }
- irq = res->start;
-
- hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
- if (!hcd) {
- retval = -ENOMEM;
- goto fail_create_hcd;
- }
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- dev_err(&pdev->dev,
- "Found HC with no register addr. Check %s setup!\n",
- dev_name(&pdev->dev));
- retval = -ENODEV;
- goto fail_request_resource;
- }
- hcd->rsrc_start = res->start;
- hcd->rsrc_len = resource_size(res);
-
- hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
- if (hcd->regs == NULL) {
- dev_dbg(&pdev->dev, "error mapping memory\n");
- retval = -EFAULT;
- goto fail_request_resource;
- }
-
- retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
- if (retval)
- goto fail_request_resource;
-
- return retval;
-
-fail_request_resource:
- usb_put_hcd(hcd);
-fail_create_hcd:
- dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval);
- return retval;
-}
-
-static int ixp4xx_ehci_remove(struct platform_device *pdev)
-{
- struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
- usb_remove_hcd(hcd);
- usb_put_hcd(hcd);
-
- return 0;
-}
-
-MODULE_ALIAS("platform:ixp4xx-ehci");
-
-static struct platform_driver ixp4xx_ehci_driver = {
- .probe = ixp4xx_ehci_probe,
- .remove = ixp4xx_ehci_remove,
- .driver = {
- .name = "ixp4xx-ehci",
- },
-};
--
1.7.9.5
next parent reply other threads:[~2012-10-08 13:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349701906-16481-1-git-send-email-florian@openwrt.org>
2012-10-08 13:11 ` Florian Fainelli [this message]
2012-10-08 13:11 ` [PATCH 02/32 v2] USB: OHCI: remove ohci-pcc-soc driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 03/32 v4] MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x Florian Fainelli
[not found] ` <CAJhJPsV5mFmOgU38ZpnYqUTNuOPmvRXjsf31XdFUqNOzsd_Edg@mail.gmail.com>
2012-10-23 8:46 ` Florian Fainelli
2012-10-23 8:53 ` Florian Fainelli
2012-10-08 13:11 ` [PATCH 04/32 v4] USB: EHCI: remove Loongson 1B EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 05/32 v4] MIPS: Netlogic: use ehci-platform driver Florian Fainelli
2012-10-08 14:06 ` Jayachandran C.
2012-10-08 13:11 ` [PATCH 06/32 v4] USB: EHCI: remove Netlogic XLS EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 07/32 v4] USB: EHCI: add no_io_watchdog platform_data parameter to ehci-platform Florian Fainelli
2012-10-08 13:11 ` [PATCH 08/32 v4] MIPS: Alchemy: use the ehci platform driver Florian Fainelli
2012-10-22 18:19 ` Greg KH
2012-10-08 13:11 ` [PATCH 09/32 v4] USB: EHCI: remove Alchemy EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 10/32 v4] ARM: cns3xxx: use ehci platform driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 11/32 v4] USB: EHCI: remove CNS3xxx EHCI " Florian Fainelli
2012-10-08 13:11 ` [PATCH 12/32 v4] USB: ohci: allow platform driver to specify the number of ports Florian Fainelli
2012-10-08 13:11 ` [PATCH 13/32 v3] USB: ohci: move ohci_pci_{suspend,resume} to ohci-hcd.c Florian Fainelli
2012-10-08 13:11 ` [PATCH 14/32 v3] USB: ohci: remove check for RH already suspended in ohci_suspend Florian Fainelli
2012-10-08 13:11 ` [PATCH 15/32 v3] USB: ohci: merge ohci_finish_controller_resume with ohci_resume Florian Fainelli
2012-10-08 13:11 ` [PATCH 16/32 v4] MIPS: PNX8550: use OHCI platform driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 17/32 v4] USB: OHCI: remove PNX8550 OHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 18/32 v4] ARM: cns3xxx: use OHCI platform driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 19/32 v4] USB: OHCI: remove CNS3xxx " Florian Fainelli
2012-10-08 13:11 ` [PATCH 20/32 v4] MIPS: Netlogic: convert to use " Florian Fainelli
2012-10-08 13:11 ` [PATCH 21/32 v4] USB: OHCI: remove Netlogic XLS " Florian Fainelli
2012-10-08 13:11 ` [PATCH 22/32 v4] sh: convert boards to use the " Florian Fainelli
2012-10-08 13:11 ` [PATCH 23/32 v4] USB: OHCI: remove OHCI SH " Florian Fainelli
2012-10-08 13:11 ` [PATCH 24/32 v4] MIPS: Alchemy: use the OHCI " Florian Fainelli
2012-10-22 18:27 ` Greg KH
2012-10-08 13:11 ` [PATCH 25/32 v4] USB: OHCI: remove Alchemy " Florian Fainelli
2012-10-08 13:11 ` [PATCH 26/32 v2] USB: move common alchemy USB routines to arch/mips/alchemy/common.c Florian Fainelli
2012-10-08 13:11 ` [PATCH 27/32 v2] USB: EHCI: make ehci-platform use dev_err() instead of pr_err() Florian Fainelli
2012-10-08 13:11 ` [PATCH 28/32 v2] USB: OHCI: make ohci-platform " Florian Fainelli
2012-10-08 13:11 ` [PATCH 29/32 v2] USB: EHCI: fix typo in ehci-platform driver on the word "resource" Florian Fainelli
2012-10-08 13:11 ` [PATCH 30/32 v2] USB: OHCI: fix typo in ohci-platform " Florian Fainelli
2012-10-08 13:11 ` [PATCH 31/32 v3] USB: EHCI: make ehci-platform use devm_request_and_ioremap helper Florian Fainelli
2012-10-08 13:11 ` [PATCH 32/32 v3] USB: OHCI: make ohci-platform " Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349701906-16481-2-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox