aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-s3c2442/Kconfig1
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c2
-rw-r--r--arch/arm/plat-s3c/Kconfig4
-rw-r--r--arch/arm/plat-s3c/Makefile1
-rw-r--r--arch/arm/plat-s3c64xx/s3c6400-clock.c2
-rw-r--r--drivers/usb/Kconfig2
-rw-r--r--drivers/usb/host/ohci-hcd.c3
-rw-r--r--drivers/usb/host/ohci-s3c2410.c18
8 files changed, 21 insertions, 12 deletions
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
index e4937e7689e..8d36bb4aaa7 100644
--- a/arch/arm/mach-s3c2442/Kconfig
+++ b/arch/arm/mach-s3c2442/Kconfig
@@ -35,6 +35,7 @@ config MACH_NEO1973_GTA02
select MACH_NEO1973
select S3C_PWM
select FIQ
+ select S3C_DEV_USBHOST
help
Say Y here if you are using the FIC Neo1973 GSM Phone
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 8ffb527ebd2..9ccd1d0594b 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -74,7 +74,6 @@
#include <mach/ts.h>
#include <mach/spi.h>
#include <mach/spi-gpio.h>
-#include <mach/usb-control.h>
#include <mach/regs-mem.h>
#include <mach/spi-gpio.h>
#include <plat/pwm.h>
@@ -88,6 +87,7 @@
#include <plat/pm.h>
#include <plat/udc.h>
#include <plat/iic.h>
+#include <plat/usb-control.h>
#include <asm/plat-s3c24xx/neo1973.h>
#include <mach/neo1973-pm-gsm.h>
#include <mach/gta02-pm-wlan.h>
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 3b6199edcae..6de8dd59ad3 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -197,5 +197,9 @@ config S3C_DEV_CAMIF
bool
help
Compile in platform device definitions for camera interface code
+config S3C_DEV_USBHOST
+ bool
+ help
+ Compile in platform device definition for USB OHCI 1.0 host
endif
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index 8bba2f03880..2ca998e8c20 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -36,6 +36,7 @@ obj-y += dev-i2c0.o
obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
obj-$(CONFIG_S3C_DEV_CAMIF) += dev-camif.o
+obj-$(CONFIG_S3C_DEV_USBHOST) += dev-usbhost.o
obj-$(CONFIG_S3C_PWM) += pwm.o
obj-$(CONFIG_S3C_DMA) += dma.o
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index 953ca8d93fe..44615a51a36 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -353,7 +353,7 @@ static struct clksrc_clk clk_mmc2 = {
static struct clksrc_clk clk_usbhost = {
.clk = {
- .name = "usb-host-bus",
+ .name = "usb-bus-host",
.id = -1,
.ctrlbit = S3C_CLKCON_SCLK_UHOST,
.enable = s3c64xx_sclk_ctrl,
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",
},
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:55:19 +0000