[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit 70b36104ab8c03f5be6d03344214d09447d9d4a8
Author: Balaji Rao <balajirrao at openmoko.org>
Date:   Mon Mar 9 21:01:18 2009 +0000

    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 at openmoko.org>

diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
index e4937e7..8d36bb4 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 8ffb527..9ccd1d0 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 3b6199e..6de8dd5 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 8bba2f0..2ca998e 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 953ca8d..44615a5 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 83babb0..55e43ad 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 5cf5f1e..86d9775 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 7afbecc..ee1241b 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",
 	},
 };
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko