aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalaji Rao <balajirrao@openmoko.org>2009-03-09 21:01:21 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-09 21:01:21 +0000
commit0f6f58ca20028825df5e57f09670313f23ce5a9a (patch)
treebecdd97a1bf174be513de86319e6997f389f7777
parent70b36104ab8c03f5be6d03344214d09447d9d4a8 (diff)
Subject: om3d7k: Add support for s3c_ohci device.
X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=d9235e3a8bdcef02865eed27c0d6012d253f11e7 om3d7k: Add support for s3c_ohci device. Adds s3c_ohci support to om3d7k. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
-rw-r--r--arch/arm/mach-s3c6410/Kconfig1
-rw-r--r--arch/arm/mach-s3c6410/mach-om-3d7k.c12
-rw-r--r--arch/arm/plat-s3c64xx/include/plat/irqs.h1
3 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig
index 373ce9c3ac4..34d9b65597a 100644
--- a/arch/arm/mach-s3c6410/Kconfig
+++ b/arch/arm/mach-s3c6410/Kconfig
@@ -67,6 +67,7 @@ config MACH_OM_3D7K
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_I2C1
+ select S3C_DEV_USBHOST
select S3C6410_SETUP_SDHCI
select S3C64XX_SETUP_I2C1
select S3C_DEV_FB
diff --git a/arch/arm/mach-s3c6410/mach-om-3d7k.c b/arch/arm/mach-s3c6410/mach-om-3d7k.c
index 1f684febdc9..6ec3892c139 100644
--- a/arch/arm/mach-s3c6410/mach-om-3d7k.c
+++ b/arch/arm/mach-s3c6410/mach-om-3d7k.c
@@ -68,6 +68,7 @@
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/tzic-sp890.h>
+#include <plat/usb-control.h>
/* #include <plat/udc.h> */
#include <linux/i2c.h>
@@ -1008,6 +1009,7 @@ static void om_3d7k_pmu_regulator_registered(struct pcf50633 *pcf, int id)
static struct platform_device *om_3d7k_devices_pmu_children[] = {
&om_3d7k_button_dev,
// &s3c_device_spi_acc1, /* relies on PMU reg for power */
+ &s3c_device_usb,
};
/* this is called when pc50633 is probed, unfortunately quite late in the
@@ -1140,6 +1142,15 @@ struct s3c_plat_otg_data s3c_hs_otg_plat_data = {
.phyclk = 0
};
+/* USB */
+static struct s3c2410_hcd_info om3d7k_usb_info = {
+ .port[0] = {
+ .flags = S3C_HCDFLG_USED,
+ },
+ .port[1] = {
+ .flags = 0,
+ },
+};
static void __init om_3d7k_map_io(void)
{
@@ -1152,6 +1163,7 @@ static void __init om_3d7k_machine_init(void)
{
s3c_pm_init();
+ s3c_device_usb.dev.platform_data = &om3d7k_usb_info;
s3c_device_usbgadget.dev.platform_data = &s3c_hs_otg_plat_data;
s3c_i2c0_set_platdata(NULL);
diff --git a/arch/arm/plat-s3c64xx/include/plat/irqs.h b/arch/arm/plat-s3c64xx/include/plat/irqs.h
index d5290d84aa0..4af2c787dfc 100644
--- a/arch/arm/plat-s3c64xx/include/plat/irqs.h
+++ b/arch/arm/plat-s3c64xx/include/plat/irqs.h
@@ -148,6 +148,7 @@
/* compatibility for device defines */
#define IRQ_IIC1 IRQ_S3C6410_IIC1
+#define IRQ_USBH IRQ_UHOST
/* Since the IRQ_EINT(x) are a linear mapping on current s3c64xx series
* we just defined them as an IRQ_EINT(x) macro from S3C_IRQ_EINT_BASE