[adm5120] RB153 CF driver fixes

[openwrt.git] / target / linux / adm5120 / files / drivers / usb / host / adm5120-drv.c

diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c
index 208416e..04845d9 100644 (file)
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c
@@ -1,19 +1,20 @@
 /*
- * OHCI HCD (Host Controller Driver) for USB.
+ * ADM5120 HCD (Host Controller Driver) for USB
  *
- * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
- * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * (C) Copyright 2002 Hewlett-Packard Company
+ * Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
  *
- * Bus Glue for AMD Alchemy Au1xxx
+ * This file was derived from: drivers/usb/host/ohci-au1xxx.c
+ *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ *   (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ *   (C) Copyright 2002 Hewlett-Packard Company
  *
- * Written by Christopher Hoover <ch@hpl.hp.com>
- * Based on fragments of previous driver by Rusell King et al.
+ *   Written by Christopher Hoover <ch@hpl.hp.com>
+ *   Based on fragments of previous driver by Rusell King et al.
  *
- * Modified for LH7A404 from ahcd-sa1111.c
- *  by Durgesh Pattamatta <pattamattad@sharpsec.com>
- * Modified for AMD Alchemy Au1xxx
- *  by Matt Porter <mporter@kernel.crashing.org>
+ *   Modified for LH7A404 from ahcd-sa1111.c
+ *    by Durgesh Pattamatta <pattamattad@sharpsec.com>
+ *   Modified for AMD Alchemy Au1xxx
+ *    by Matt Porter <mporter@kernel.crashing.org>
  *
  * This file is licenced under the GPL.
  */
@@ -22,7 +23,7 @@
 #include <linux/signal.h>
 
 #include <asm/bootinfo.h>
-#include <asm/mach-adm5120/adm5120_defs.h>
+#include <adm5120_defs.h>
 
 #ifdef DEBUG
 #define HCD_DBG(f, a...)       printk(KERN_DEBUG "%s: " f, hcd_name, ## a)
@@ -163,15 +164,15 @@ static const struct hc_driver adm5120_hc_driver = {
        /*
         * scheduling support
         */
-       .get_frame_number =     admhc_get_frame,
+       .get_frame_number =     admhc_get_frame_number,
 
        /*
         * root hub support
         */
        .hub_status_data =      admhc_hub_status_data,
        .hub_control =          admhc_hub_control,
-       .hub_irq_enable =       admhc_rhsc_enable,
-#ifdef CONFIG_PM
+       .hub_irq_enable =       admhc_hub_irq_enable,
+#ifdef CONFIG_PM
        .bus_suspend =          admhc_bus_suspend,
        .bus_resume =           admhc_bus_resume,
 #endif
@@ -201,7 +202,7 @@ static int usb_hcd_adm5120_remove(struct platform_device *pdev)
        return 0;
 }
 
-#if 0
+#ifdef CONFIG_PM
 /* TODO */
 static int usb_hcd_adm5120_suspend(struct platform_device *dev)
 {
@@ -216,17 +217,17 @@ static int usb_hcd_adm5120_resume(struct platform_device *dev)
 
        return 0;
 }
-#endif
+#else
+#define usb_hcd_adm5120_suspend        NULL
+#define usb_hcd_adm5120_resume NULL
+#endif /* CONFIG_PM */
 
 static struct platform_driver usb_hcd_adm5120_driver = {
        .probe          = usb_hcd_adm5120_probe,
        .remove         = usb_hcd_adm5120_remove,
        .shutdown       = usb_hcd_platform_shutdown,
-#if 0
-       /* TODO */
        .suspend        = usb_hcd_adm5120_suspend,
        .resume         = usb_hcd_adm5120_resume,
-#endif
        .driver         = {
                .name   = "adm5120-hcd",
                .owner  = THIS_MODULE,