diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2009-03-09 21:01:18 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-09 21:01:18 +0000 |
| commit | 70b36104ab8c03f5be6d03344214d09447d9d4a8 (patch) | |
| tree | 31e487dfbdc33c6c068ea7bd0daa7365eaee8513 /drivers/usb | |
| parent | ad420b5e1f221549781498c8c1cf805ea658870f (diff) | |
Subject: USB: Change s3c2410_ohci into s3c_ohci and change gta02 to use it
X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=b55b8e56a4a7e43b7243be48f77a326236a37c68
USB: Change s3c2410_ohci into s3c_ohci and change gta02 to use it
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 18 |
3 files changed, 13 insertions, 10 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 83babb0a1df..55e43ad5aa8 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -31,7 +31,7 @@ config USB_ARCH_HAS_OHCI default y if SA1111 default y if ARCH_OMAP default y if ARCH_LH7A404 - default y if ARCH_S3C2410 + default y if PLAT_S3C default y if PXA27x default y if PXA3xx default y if ARCH_EP93XX diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 5cf5f1eca4f..86d9775e071 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -18,6 +18,7 @@ * This file is licenced under the GPL. */ +#define DEBUG 2 #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/pci.h> @@ -997,7 +998,7 @@ MODULE_LICENSE ("GPL"); #define SA1111_DRIVER ohci_hcd_sa1111_driver #endif -#ifdef CONFIG_ARCH_S3C2410 +#ifdef CONFIG_PLAT_S3C #include "ohci-s3c2410.c" #define PLATFORM_DRIVER ohci_hcd_s3c2410_driver #endif diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 7afbecc1681..ee1241b31e3 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -22,9 +22,9 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <mach/hardware.h> -#include <mach/usb-control.h> -#include <mach/regs-gpio.h> +//#include <mach/hardware.h> +#include <plat/usb-control.h> +//#include <mach/regs-gpio.h> #define valid_port(idx) ((idx) == 1 || (idx) == 2) @@ -309,6 +309,7 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc) local_irq_restore(flags); } +#if 0 /* switching of USB pads */ static ssize_t show_usb_mode(struct device *dev, struct device_attribute *attr, char *buf) @@ -344,6 +345,7 @@ static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode); +#endif /* may be called without controller electrically present */ /* may be called with controller, bus, and devices active */ @@ -362,7 +364,7 @@ static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode); static void usb_hcd_s3c2410_remove (struct usb_hcd *hcd, struct platform_device *dev) { - device_remove_file(&dev->dev, &dev_attr_usb_mode); + //device_remove_file(&dev->dev, &dev_attr_usb_mode); usb_remove_hcd(hcd); s3c2410_stop_hc(dev); iounmap(hcd->regs); @@ -430,9 +432,9 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver, if (retval != 0) goto err_ioremap; - retval = device_create_file(&dev->dev, &dev_attr_usb_mode); - if (retval != 0) - goto err_hcd; +// retval = device_create_file(&dev->dev, &dev_attr_usb_mode); +// if (retval != 0) +// goto err_hcd; return 0; @@ -549,7 +551,7 @@ static struct platform_driver ohci_hcd_s3c2410_driver = { .resume = ohci_hcd_s3c2410_drv_resume, .driver = { .owner = THIS_MODULE, - .name = "s3c2410-ohci", + .name = "s3c-ohci", }, }; |