Return-Path: Received: from mo-p07-ob.rzone.de (mo-p07-ob.rzone.de [81.169.146.190]) by ozlabs.org (Postfix) with ESMTP id 6C44967BDA for ; Fri, 24 Nov 2006 03:13:08 +1100 (EST) Date: Thu, 23 Nov 2006 17:12:00 +0100 (MET) From: nd@bplan-gmbh.de To: nd@bplan-gmbh.de Subject: [PATCH 1/2] Fixed compiled issue tu to new of_platform.h header Message-Id: <11642982461138-git-send-email-nd@bplan-gmbh.de> In-Reply-To: <11642982453599-git-send-email-nd@bplan-gmbh.de> References: <11642982453599-git-send-email-nd@bplan-gmbh.de> Cc: linux-usb-devel@lists.sourceforge.net, greg@kroah.com, sl@bplan-gmbh.de, linuxppc-dev@ozlabs.org, stern@rowland.harvard.edu List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Nicolas DET --- drivers/usb/host/ohci-ppc-of.c | 285 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 285 insertions(+), 0 deletions(-) diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c new file mode 100644 index 0000000..30ce520 --- /dev/null +++ b/drivers/usb/host/ohci-ppc-of.c @@ -0,0 +1,285 @@ +/* + * OHCI HCD (Host Controller Driver) for USB. + * + * (C) Copyright 1999 Roman Weissgaerber + * (C) Copyright 2000-2002 David Brownell + * (C) Copyright 2002 Hewlett-Packard Company + * (C) Copyright 2003-2005 MontaVista Software Inc. + * + * Probe and init OHCI Big endian HC from OpenFirmware device tree + * Tested on Efika 5k2 + * + * Modified by Dale Farnsworth from ohci-sa1111.c + * + * This file is licenced under the GPL. + */ + +#include + +#include +#include +#include + +/* configure so an HC device and id are always provided */ +/* always called with process context; sleeping is OK */ + +/* + * usb_hcd_ppc_of_probe - initialize On-Chip HCDs + * Context: !in_interrupt() + * + * Allocates basic resources for this USB host controller. + * + * Store this function in the HCD's struct pci_driver as probe(). + */ +static int usb_hcd_ppc_of_probe(const struct hc_driver *driver, + struct of_device *dev, int is_bigendian) +{ + int retval; + struct usb_hcd *hcd; + struct ohci_hcd *ohci; + struct resource res; + int irq; + int ret; + + pr_debug("initializing PPC-OF USB Controller\n"); + + if ((ret = of_address_to_resource(dev->node, 0, &res)) != 0) + return ret; + + hcd = usb_create_hcd(driver, &dev->dev, "PPC-OF USB"); + if (!hcd) + return -ENOMEM; + + hcd->rsrc_start = res.start; + hcd->rsrc_len = res.end - res.start + 1; + + if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { + pr_debug(__FILE__ ": request_mem_region failed\n"); + retval = -EBUSY; + goto err1; + } + + irq = irq_of_parse_and_map(dev->node, 0); + if (irq == NO_IRQ) { + retval = -EBUSY; + goto err2; + } + + hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); + if (!hcd->regs) { + pr_debug(__FILE__ ": ioremap failed\n"); + retval = -ENOMEM; + goto err2; + } + + ohci = hcd_to_ohci(hcd); + if (is_bigendian) + ohci->flags |= OHCI_BIG_ENDIAN; + + ohci_hcd_init(ohci); + + retval = usb_add_hcd(hcd, irq, 0); + if (retval == 0) + return retval; + + pr_debug("Removing PPC-OF USB Controller\n"); + + iounmap(hcd->regs); + err2: + release_mem_region(hcd->rsrc_start, hcd->rsrc_len); + err1: + usb_put_hcd(hcd); + return retval; +} + + +/* may be called without controller electrically present */ +/* may be called with controller, bus, and devices active */ + +/* + * usb_hcd_ppc_of_remove - shutdown processing for On-Chip HCDs + * @pdev: USB Host Controller being removed + * Context: !in_interrupt() + * + * Reverses the effect of usb_hcd_ppc_of_probe(). + * It is always called from a thread + * context, normally "rmmod", "apmd", or something similar. + * + */ +static void usb_hcd_ppc_of_remove(struct usb_hcd *hcd, + struct of_device *op) +{ + usb_remove_hcd(hcd); + + pr_debug("stopping PPC-OF USB Controller\n"); + + iounmap(hcd->regs); + release_mem_region(hcd->rsrc_start, hcd->rsrc_len); + usb_put_hcd(hcd); +} + +static int __devinit +ohci_ppc_of_start(struct usb_hcd *hcd) +{ + struct ohci_hcd *ohci = hcd_to_ohci(hcd); + int ret; + + if ((ret = ohci_init(ohci)) < 0) + return ret; + + if ((ret = ohci_run(ohci)) < 0) { + err("can't start %s", ohci_to_hcd(ohci)->self.bus_name); + ohci_stop(hcd); + return ret; + } + + return 0; +} + +static const struct hc_driver ohci_ppc_of_hc_driver = { + .description = hcd_name, + .hcd_priv_size = sizeof(struct ohci_hcd), + + /* + * generic hardware linkage + */ + .irq = ohci_irq, + .flags = HCD_USB11 | HCD_MEMORY, + + /* + * basic lifecycle operations + */ + .start = ohci_ppc_of_start, + .stop = ohci_stop, + .shutdown = ohci_shutdown, + + /* + * managing i/o requests and associated device resources + */ + .urb_enqueue = ohci_urb_enqueue, + .urb_dequeue = ohci_urb_dequeue, + .endpoint_disable = ohci_endpoint_disable, + + /* + * scheduling support + */ + .get_frame_number = ohci_get_frame, + + /* + * root hub support + */ + .hub_status_data = ohci_hub_status_data, + .hub_control = ohci_hub_control, + .hub_irq_enable = ohci_rhsc_enable, +#ifdef CONFIG_PM + .bus_suspend = ohci_bus_suspend, + .bus_resume = ohci_bus_resume, +#endif + .start_port_reset = ohci_start_port_reset, +}; + + + +static int ohci_hcd_ppc_of_drv_remove(struct of_device *op) +{ + struct usb_hcd *hcd = dev_get_drvdata(&op->dev); + dev_set_drvdata(&op->dev, NULL); + + usb_hcd_ppc_of_remove(hcd, op); + return 0; +} + +static int ohci_hcd_ppc_of_drv_shutdown(struct of_device *op) +{ + struct usb_hcd *hcd = dev_get_drvdata(&op->dev); + + if (hcd->driver->shutdown) + hcd->driver->shutdown(hcd); + + return 0; +} + +/* + * +*/ + +static struct of_device_id ohci_hcd_ppc_of_match[] = { +#ifdef CONFIG_USB_OHCI_HCD_PPC_OF_BE + { + .name = "usb", + .compatible = "ohci-bigendian", + }, + { + .name = "usb", + .compatible = "ohci-be", + }, +#endif +#ifdef CONFIG_USB_OHCI_HCD_PPC_OF_LE + { + .name = "usb", + .compatible = "ohci-littledian", + }, + { + .name = "usb", + .compatible = "ohci-le", + }, +#endif + {}, +}; + +static int __devinit +ohci_hcd_ppc_of_drv_probe(struct of_device *op, const struct of_device_id *match) +{ + struct device_node *dev; + int ret; + int is_bigendian; + + if (usb_disabled()) + return -ENODEV; + + dev = op->node; + is_bigendian = 0; + + if ( device_is_compatible(dev, "ohci-bigendian") ) + is_bigendian = 1; + + if ( device_is_compatible(dev, "ohci-be") ) + is_bigendian = 1; + + ret = usb_hcd_ppc_of_probe(&ohci_ppc_of_hc_driver, op, is_bigendian); + return ret; +} + +static struct of_platform_driver ohci_hcd_ppc_of_driver = { + .name = "ppc-of-ohci", + .match_table = ohci_hcd_ppc_of_match, + .probe = ohci_hcd_ppc_of_drv_probe, + .remove = ohci_hcd_ppc_of_drv_remove, + .shutdown = ohci_hcd_ppc_of_drv_shutdown, +#ifdef CONFIG_PM + /*.suspend = ohci_hcd_ppc_soc_drv_suspend,*/ + /*.resume = ohci_hcd_ppc_soc_drv_resume,*/ +#endif + .driver = { + .name = "ppc-of-ohci", + .owner = THIS_MODULE, + }, +}; + +static int __init ohci_hcd_ppc_of_init(void) +{ + pr_debug(DRIVER_INFO " (PPC OF)\n"); + pr_debug("block sizes: ed %d td %d\n", sizeof(struct ed), + sizeof(struct td)); + + return of_register_platform_driver(&ohci_hcd_ppc_of_driver); +} + +static void __exit ohci_hcd_ppc_of_cleanup(void) +{ + of_unregister_platform_driver(&ohci_hcd_ppc_of_driver); +} + +module_init(ohci_hcd_ppc_of_init); +module_exit(ohci_hcd_ppc_of_cleanup); + -- 1.4.3.2