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 /arch/arm | |
| 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 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s3c64xx/s3c6400-clock.c | 2 |
5 files changed, 8 insertions, 2 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, |