[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers

Direct access to USB host controller registers is considered to be not
portable, and is usually a bad sign for poorly abstracted interface.
Introduce .flags and .power_on_delay to "struct pxaohci_platform_data"
so that most platforms don't bother to write their own .init/.exit()
sequences.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 files changed, 33 insertions, 104 deletions

diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index 102a43186618..a82dad1a8cc8 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -257,18 +257,9 @@ static inline void cmx270_init_2700G(void) {}
 
 /* PXA27x OHCI controller setup */
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-static int cmx270_ohci_init(struct device *dev)
-{
-        /* Set the Power Control Polarity Low */
-        UHCHR = (UHCHR | UHCHR_PCPL) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);
-
-        return 0;
-}
-
 static struct pxaohci_platform_data cmx270_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
-        .init           = cmx270_ohci_init,
+        .flags          = ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,
 };
 
 static void __init cmx270_init_ohci(void)
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 7bc5679b41ba..deb46cd144bf 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -365,19 +365,11 @@ static inline void cm_x300_init_mmc(void) {}
 #endif
 
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-static int cm_x300_ohci_init(struct device *dev)
-{
-        /* Set the Power Control Polarity Low */
-        UHCHR = (UHCHR | UHCHR_PCPL) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);
-
-        return 0;
-}
-
 static struct pxaohci_platform_data cm_x300_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
-        .init           = cm_x300_ohci_init,
+        .flags          = ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,
 };
+
 static void __init cm_x300_init_ohci(void)
 {
         pxa_set_ohci_info(&cm_x300_ohci_platform_data);
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 7a0a681a5847..f5ed8038ede5 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -373,10 +373,6 @@ static inline void em_x270_init_nand(void) {}
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 static int em_x270_ohci_init(struct device *dev)
 {
-        /* Set the Power Control Polarity Low */
-        UHCHR = (UHCHR | UHCHR_PCPL) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);
-
         /* enable port 2 transiever */
         UP2OCR = UP2OCR_HXS | UP2OCR_HXOE;
 
@@ -385,6 +381,7 @@ static int em_x270_ohci_init(struct device *dev)
 
 static struct pxaohci_platform_data em_x270_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
+        .flags          = ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,
         .init           = em_x270_ohci_init,
 };
 
diff --git a/arch/arm/mach-pxa/include/mach/ohci.h b/arch/arm/mach-pxa/include/mach/ohci.h
index e848a47128cd..95b6e2a6e514 100644
--- a/arch/arm/mach-pxa/include/mach/ohci.h
+++ b/arch/arm/mach-pxa/include/mach/ohci.h
@@ -7,6 +7,22 @@ struct pxaohci_platform_data {
         int (*init)(struct device *);
         void (*exit)(struct device *);
 
+        unsigned long flags;
+#define ENABLE_PORT1            (1 << 0)
+#define ENABLE_PORT2            (1 << 1)
+#define ENABLE_PORT3            (1 << 2)
+#define ENABLE_PORT_ALL         (ENABLE_PORT1 | ENABLE_PORT2 | ENABLE_PORT3)
+
+#define POWER_SENSE_LOW         (1 << 3)
+#define POWER_CONTROL_LOW       (1 << 4)
+#define NO_OC_PROTECTION        (1 << 5)
+#define OC_MODE_GLOBAL          (0 << 6)
+#define OC_MODE_PERPORT         (1 << 6)
+
+        int power_on_delay;     /* Power On to Power Good time - in ms
+                                 * HCD must wait for this duration before
+                                 * accessing a powered on port
+                                 */
         int port_mode;
 #define PMM_NPS_MODE           1
 #define PMM_GLOBAL_MODE        2
diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h
index 98ded450d0fe..b34e8a735391 100644
--- a/arch/arm/mach-pxa/include/mach/pxa-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa-regs.h
@@ -784,6 +784,9 @@
 
 #define UHCRHDA         __REG(0x4C000048) /* UHC Root Hub Descriptor A */
 #define UHCRHDA_NOCP    (1 << 12)       /* No over current protection */
+#define UHCRHDA_OCPM    (1 << 11)       /* Over Current Protection Mode */
+#define UHCRHDA_POTPGT(x) \
+                        (((x) & 0xff) << 24) /* Power On To Power Good Time */
 
 #define UHCRHDB         __REG(0x4C00004C) /* UHC Root Hub Descriptor B */
 #define UHCRHS          __REG(0x4C000050) /* UHC Root Hub Status */
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 7b158e5248ad..92728a37298a 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -448,19 +448,9 @@ static struct platform_device *platform_devices[] __initdata = {
         &lpd270_flash_device[1],
 };
 
-static int lpd270_ohci_init(struct device *dev)
-{
-        /* Set the Power Control Polarity Low and Power Sense
-           Polarity Low to active low. */
-        UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);
-
-        return 0;
-}
-
 static struct pxaohci_platform_data lpd270_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
-        .init           = lpd270_ohci_init,
+        .flags          = ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,
 };
 
 static void __init lpd270_init(void)
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 8ebdac7e9a13..519138bc5f85 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -669,18 +669,10 @@ static struct pxamci_platform_data magician_mci_info = {
  * USB OHCI
  */
 
-static int magician_ohci_init(struct device *dev)
-{
-        UHCHR = (UHCHR | UHCHR_SSEP2 | UHCHR_PCPL | UHCHR_CGR) &
-            ~(UHCHR_SSEP1 | UHCHR_SSEP3 | UHCHR_SSE);
-
-        return 0;
-}
-
 static struct pxaohci_platform_data magician_ohci_info = {
-        .port_mode    = PMM_PERPORT_MODE,
-        .init         = magician_ohci_init,
-        .power_budget = 0,
+        .port_mode      = PMM_PERPORT_MODE,
+        .flags          = ENABLE_PORT1 | ENABLE_PORT3 | POWER_CONTROL_LOW,
+        .power_budget   = 0,
 };
 
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index d44af761564d..a02edfd4fc0a 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -508,19 +508,9 @@ static struct platform_device *platform_devices[] __initdata = {
         &mst_gpio_keys_device,
 };
 
-static int mainstone_ohci_init(struct device *dev)
-{
-        /* Set the Power Control Polarity Low and Power Sense
-           Polarity Low to active low. */
-        UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);
-
-        return 0;
-}
-
 static struct pxaohci_platform_data mainstone_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
-        .init           = mainstone_ohci_init,
+        .flags          = ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,
 };
 
 #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 420c9b3813f6..e9efb80bb339 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -328,36 +328,10 @@ static struct pxamci_platform_data pcm990_mci_platform_data = {
         .exit           = pcm990_mci_exit,
 };
 
-/*
- * init OHCI hardware to work with
- *
- * Note: Only USB port 1 (host only) is connected
- *
- * GPIO88 (USBHPWR#1): overcurrent in, overcurrent when low
- * GPIO89 (USBHPEN#1): power-on out, on when low
- */
-static int pcm990_ohci_init(struct device *dev)
-{
-        /*
-         * disable USB port 2 and 3
-         * power sense is active low
-         */
-        UHCHR = ((UHCHR) | UHCHR_PCPL | UHCHR_PSPL | UHCHR_SSEP2 |
-                                UHCHR_SSEP3) & ~(UHCHR_SSEP1 | UHCHR_SSE);
-        /*
-         * wait 10ms after Power on
-         * overcurrent per port
-         * power switch per port
-         */
-        UHCRHDA = (5<<24) | (1<<11) | (1<<8);   /* FIXME: Required? */
-
-        return 0;
-}
-
 static struct pxaohci_platform_data pcm990_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
-        .init           = pcm990_ohci_init,
-        .exit           = NULL,
+        .flags          = ENABLE_PORT1 | POWER_CONTROL_LOW | POWER_SENSE_LOW,
+        .power_on_delay = 10,
 };
 
 /*
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 245890d2b6b5..7ef346182371 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -495,19 +495,13 @@ static int spitz_ohci_init(struct device *dev)
          */
         UP2OCR = UP2OCR_HXS | UP2OCR_HXOE | UP2OCR_DPPDE | UP2OCR_DMPDE;
 
-        gpio_direction_output(SPITZ_GPIO_USB_HOST, 1);
-
-        UHCHR = (UHCHR) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);
-
-        UHCRHDA |= UHCRHDA_NOCP;
-
-        return 0;
+        return gpio_direction_output(SPITZ_GPIO_USB_HOST, 1);
 }
 
 static struct pxaohci_platform_data spitz_ohci_platform_data = {
         .port_mode      = PMM_NPS_MODE,
         .init           = spitz_ohci_init,
+        .flags          = ENABLE_PORT_ALL | NO_OC_PROTECTION,
         .power_budget   = 150,
 };
 
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 75ff8f4243f1..a13dbf3c2c05 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -425,19 +425,9 @@ static struct pxaficp_platform_data trizeps4_ficp_platform_data = {
 /****************************************************************************
  * OHCI USB port
  ****************************************************************************/
-static int trizeps4_ohci_init(struct device *dev)
-{
-        /* Set the Power Control Polarity Low and Power Sense
-           Polarity Low to active low. */
-        UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
-                ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);
-
-        return 0;
-}
-
 static struct pxaohci_platform_data trizeps4_ohci_platform_data = {
         .port_mode      = PMM_PERPORT_MODE,
-        .init           = trizeps4_ohci_init,
+        .flags          = ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,
 };
 
 static struct map_desc trizeps4_io_desc[] __initdata = {