Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

1 files changed, 205 insertions, 54 deletions

diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 7f0f35c78185..e294d430733b 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -23,17 +23,90 @@
 #include <linux/signal.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
-#include <mach/pxa2xx-regs.h> /* FIXME: for PSSR */
 #include <mach/ohci.h>
 
+/*
+ * UHC: USB Host Controller (OHCI-like) register definitions
+ */
+#define UHCREV          (0x0000) /* UHC HCI Spec Revision */
+#define UHCHCON         (0x0004) /* UHC Host Control Register */
+#define UHCCOMS         (0x0008) /* UHC Command Status Register */
+#define UHCINTS         (0x000C) /* UHC Interrupt Status Register */
+#define UHCINTE         (0x0010) /* UHC Interrupt Enable */
+#define UHCINTD         (0x0014) /* UHC Interrupt Disable */
+#define UHCHCCA         (0x0018) /* UHC Host Controller Comm. Area */
+#define UHCPCED         (0x001C) /* UHC Period Current Endpt Descr */
+#define UHCCHED         (0x0020) /* UHC Control Head Endpt Descr */
+#define UHCCCED         (0x0024) /* UHC Control Current Endpt Descr */
+#define UHCBHED         (0x0028) /* UHC Bulk Head Endpt Descr */
+#define UHCBCED         (0x002C) /* UHC Bulk Current Endpt Descr */
+#define UHCDHEAD        (0x0030) /* UHC Done Head */
+#define UHCFMI          (0x0034) /* UHC Frame Interval */
+#define UHCFMR          (0x0038) /* UHC Frame Remaining */
+#define UHCFMN          (0x003C) /* UHC Frame Number */
+#define UHCPERS         (0x0040) /* UHC Periodic Start */
+#define UHCLS           (0x0044) /* UHC Low Speed Threshold */
+
+#define UHCRHDA         (0x0048) /* 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         (0x004C) /* UHC Root Hub Descriptor B */
+#define UHCRHS          (0x0050) /* UHC Root Hub Status */
+#define UHCRHPS1        (0x0054) /* UHC Root Hub Port 1 Status */
+#define UHCRHPS2        (0x0058) /* UHC Root Hub Port 2 Status */
+#define UHCRHPS3        (0x005C) /* UHC Root Hub Port 3 Status */
+
+#define UHCSTAT         (0x0060) /* UHC Status Register */
+#define UHCSTAT_UPS3    (1 << 16)       /* USB Power Sense Port3 */
+#define UHCSTAT_SBMAI   (1 << 15)       /* System Bus Master Abort Interrupt*/
+#define UHCSTAT_SBTAI   (1 << 14)       /* System Bus Target Abort Interrupt*/
+#define UHCSTAT_UPRI    (1 << 13)       /* USB Port Resume Interrupt */
+#define UHCSTAT_UPS2    (1 << 12)       /* USB Power Sense Port 2 */
+#define UHCSTAT_UPS1    (1 << 11)       /* USB Power Sense Port 1 */
+#define UHCSTAT_HTA     (1 << 10)       /* HCI Target Abort */
+#define UHCSTAT_HBA     (1 << 8)        /* HCI Buffer Active */
+#define UHCSTAT_RWUE    (1 << 7)        /* HCI Remote Wake Up Event */
+
+#define UHCHR           (0x0064) /* UHC Reset Register */
+#define UHCHR_SSEP3     (1 << 11)       /* Sleep Standby Enable for Port3 */
+#define UHCHR_SSEP2     (1 << 10)       /* Sleep Standby Enable for Port2 */
+#define UHCHR_SSEP1     (1 << 9)        /* Sleep Standby Enable for Port1 */
+#define UHCHR_PCPL      (1 << 7)        /* Power control polarity low */
+#define UHCHR_PSPL      (1 << 6)        /* Power sense polarity low */
+#define UHCHR_SSE       (1 << 5)        /* Sleep Standby Enable */
+#define UHCHR_UIT       (1 << 4)        /* USB Interrupt Test */
+#define UHCHR_SSDC      (1 << 3)        /* Simulation Scale Down Clock */
+#define UHCHR_CGR       (1 << 2)        /* Clock Generation Reset */
+#define UHCHR_FHR       (1 << 1)        /* Force Host Controller Reset */
+#define UHCHR_FSBIR     (1 << 0)        /* Force System Bus Iface Reset */
+
+#define UHCHIE          (0x0068) /* UHC Interrupt Enable Register*/
+#define UHCHIE_UPS3IE   (1 << 14)       /* Power Sense Port3 IntEn */
+#define UHCHIE_UPRIE    (1 << 13)       /* Port Resume IntEn */
+#define UHCHIE_UPS2IE   (1 << 12)       /* Power Sense Port2 IntEn */
+#define UHCHIE_UPS1IE   (1 << 11)       /* Power Sense Port1 IntEn */
+#define UHCHIE_TAIE     (1 << 10)       /* HCI Interface Transfer Abort
+                                           Interrupt Enable*/
+#define UHCHIE_HBAIE    (1 << 8)        /* HCI Buffer Active IntEn */
+#define UHCHIE_RWIE     (1 << 7)        /* Remote Wake-up IntEn */
+
+#define UHCHIT          (0x006C) /* UHC Interrupt Test register */
+
 #define PXA_UHC_MAX_PORTNUM    3
 
-#define UHCRHPS(x)              __REG2( 0x4C000050, (x)<<2 )
+struct pxa27x_ohci {
+        /* must be 1st member here for hcd_to_ohci() to work */
+        struct ohci_hcd ohci;
+
+        struct device   *dev;
+        struct clk      *clk;
+        void __iomem    *mmio_base;
+};
 
-static struct clk *usb_clk;
+#define to_pxa27x_ohci(hcd)     (struct pxa27x_ohci *)hcd_to_ohci(hcd)
 
 /*
   PMM_NPS_MODE -- PMM Non-power switching mode
@@ -45,30 +118,35 @@ static struct clk *usb_clk;
   PMM_PERPORT_MODE -- PMM per port switching mode
       Ports are powered individually.
  */
-static int pxa27x_ohci_select_pmm( int mode )
+static int pxa27x_ohci_select_pmm(struct pxa27x_ohci *ohci, int mode)
 {
-        switch ( mode ) {
+        uint32_t uhcrhda = __raw_readl(ohci->mmio_base + UHCRHDA);
+        uint32_t uhcrhdb = __raw_readl(ohci->mmio_base + UHCRHDB);
+
+        switch (mode) {
         case PMM_NPS_MODE:
-                UHCRHDA |= RH_A_NPS;
+                uhcrhda |= RH_A_NPS;
                 break;
         case PMM_GLOBAL_MODE:
-                UHCRHDA &= ~(RH_A_NPS & RH_A_PSM);
+                uhcrhda &= ~(RH_A_NPS & RH_A_PSM);
                 break;
         case PMM_PERPORT_MODE:
-                UHCRHDA &= ~(RH_A_NPS);
-                UHCRHDA |= RH_A_PSM;
+                uhcrhda &= ~(RH_A_NPS);
+                uhcrhda |= RH_A_PSM;
 
                 /* Set port power control mask bits, only 3 ports. */
-                UHCRHDB |= (0x7<<17);
+                uhcrhdb |= (0x7<<17);
                 break;
         default:
                 printk( KERN_ERR
                         "Invalid mode %d, set to non-power switch mode.\n",
                         mode );
 
-                UHCRHDA |= RH_A_NPS;
+                uhcrhda |= RH_A_NPS;
         }
 
+        __raw_writel(uhcrhda, ohci->mmio_base + UHCRHDA);
+        __raw_writel(uhcrhdb, ohci->mmio_base + UHCRHDB);
         return 0;
 }
 
@@ -76,57 +154,110 @@ extern int usb_disabled(void);
 
 /*-------------------------------------------------------------------------*/
 
-static int pxa27x_start_hc(struct device *dev)
+static inline void pxa27x_setup_hc(struct pxa27x_ohci *ohci,
+                                   struct pxaohci_platform_data *inf)
+{
+        uint32_t uhchr = __raw_readl(ohci->mmio_base + UHCHR);
+        uint32_t uhcrhda = __raw_readl(ohci->mmio_base + UHCRHDA);
+
+        if (inf->flags & ENABLE_PORT1)
+                uhchr &= ~UHCHR_SSEP1;
+
+        if (inf->flags & ENABLE_PORT2)
+                uhchr &= ~UHCHR_SSEP2;
+
+        if (inf->flags & ENABLE_PORT3)
+                uhchr &= ~UHCHR_SSEP3;
+
+        if (inf->flags & POWER_CONTROL_LOW)
+                uhchr |= UHCHR_PCPL;
+
+        if (inf->flags & POWER_SENSE_LOW)
+                uhchr |= UHCHR_PSPL;
+
+        if (inf->flags & NO_OC_PROTECTION)
+                uhcrhda |= UHCRHDA_NOCP;
+
+        if (inf->flags & OC_MODE_PERPORT)
+                uhcrhda |= UHCRHDA_OCPM;
+
+        if (inf->power_on_delay) {
+                uhcrhda &= ~UHCRHDA_POTPGT(0xff);
+                uhcrhda |= UHCRHDA_POTPGT(inf->power_on_delay / 2);
+        }
+
+        __raw_writel(uhchr, ohci->mmio_base + UHCHR);
+        __raw_writel(uhcrhda, ohci->mmio_base + UHCRHDA);
+}
+
+static inline void pxa27x_reset_hc(struct pxa27x_ohci *ohci)
+{
+        uint32_t uhchr = __raw_readl(ohci->mmio_base + UHCHR);
+
+        __raw_writel(uhchr | UHCHR_FHR, ohci->mmio_base + UHCHR);
+        udelay(11);
+        __raw_writel(uhchr & ~UHCHR_FHR, ohci->mmio_base + UHCHR);
+}
+
+#ifdef CONFIG_CPU_PXA27x
+extern void pxa27x_clear_otgph(void);
+#else
+#define pxa27x_clear_otgph()    do {} while (0)
+#endif
+
+static int pxa27x_start_hc(struct pxa27x_ohci *ohci, struct device *dev)
 {
         int retval = 0;
         struct pxaohci_platform_data *inf;
+        uint32_t uhchr;
 
         inf = dev->platform_data;
 
-        clk_enable(usb_clk);
+        clk_enable(ohci->clk);
 
-        UHCHR |= UHCHR_FHR;
-        udelay(11);
-        UHCHR &= ~UHCHR_FHR;
+        pxa27x_reset_hc(ohci);
+
+        uhchr = __raw_readl(ohci->mmio_base + UHCHR) | UHCHR_FSBIR;
+        __raw_writel(uhchr, ohci->mmio_base + UHCHR);
 
-        UHCHR |= UHCHR_FSBIR;
-        while (UHCHR & UHCHR_FSBIR)
+        while (__raw_readl(ohci->mmio_base + UHCHR) & UHCHR_FSBIR)
                 cpu_relax();
 
+        pxa27x_setup_hc(ohci, inf);
+
         if (inf->init)
                 retval = inf->init(dev);
 
         if (retval < 0)
                 return retval;
 
-        UHCHR &= ~UHCHR_SSE;
-
-        UHCHIE = (UHCHIE_UPRIE | UHCHIE_RWIE);
+        uhchr = __raw_readl(ohci->mmio_base + UHCHR) & ~UHCHR_SSE;
+        __raw_writel(uhchr, ohci->mmio_base + UHCHR);
+        __raw_writel(UHCHIE_UPRIE | UHCHIE_RWIE, ohci->mmio_base + UHCHIE);
 
         /* Clear any OTG Pin Hold */
-        if (cpu_is_pxa27x() && (PSSR & PSSR_OTGPH))
-                PSSR |= PSSR_OTGPH;
-
+        pxa27x_clear_otgph();
         return 0;
 }
 
-static void pxa27x_stop_hc(struct device *dev)
+static void pxa27x_stop_hc(struct pxa27x_ohci *ohci, struct device *dev)
 {
         struct pxaohci_platform_data *inf;
+        uint32_t uhccoms;
 
         inf = dev->platform_data;
 
         if (inf->exit)
                 inf->exit(dev);
 
-        UHCHR |= UHCHR_FHR;
-        udelay(11);
-        UHCHR &= ~UHCHR_FHR;
+        pxa27x_reset_hc(ohci);
 
-        UHCCOMS |= 1;
+        /* Host Controller Reset */
+        uhccoms = __raw_readl(ohci->mmio_base + UHCCOMS) | 0x01;
+        __raw_writel(uhccoms, ohci->mmio_base + UHCCOMS);
         udelay(10);
 
-        clk_disable(usb_clk);
+        clk_disable(ohci->clk);
 }
 
 
@@ -147,18 +278,22 @@ static void pxa27x_stop_hc(struct device *dev)
  */
 int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device *pdev)
 {
-        int retval;
+        int retval, irq;
         struct usb_hcd *hcd;
         struct pxaohci_platform_data *inf;
+        struct pxa27x_ohci *ohci;
+        struct resource *r;
+        struct clk *usb_clk;
 
         inf = pdev->dev.platform_data;
 
         if (!inf)
                 return -ENODEV;
 
-        if (pdev->resource[1].flags != IORESOURCE_IRQ) {
-                pr_debug ("resource[1] is not IORESOURCE_IRQ");
-                return -ENOMEM;
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                pr_err("no resource of IORESOURCE_IRQ");
+                return -ENXIO;
         }
 
         usb_clk = clk_get(&pdev->dev, "USBCLK");
@@ -168,8 +303,16 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
         hcd = usb_create_hcd (driver, &pdev->dev, "pxa27x");
         if (!hcd)
                 return -ENOMEM;
-        hcd->rsrc_start = pdev->resource[0].start;
-        hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1;
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!r) {
+                pr_err("no resource of IORESOURCE_MEM");
+                retval = -ENXIO;
+                goto err1;
+        }
+
+        hcd->rsrc_start = r->start;
+        hcd->rsrc_len = resource_size(r);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 pr_debug("request_mem_region failed");
@@ -184,24 +327,30 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
                 goto err2;
         }
 
-        if ((retval = pxa27x_start_hc(&pdev->dev)) < 0) {
+        /* initialize "struct pxa27x_ohci" */
+        ohci = (struct pxa27x_ohci *)hcd_to_ohci(hcd);
+        ohci->dev = &pdev->dev;
+        ohci->clk = usb_clk;
+        ohci->mmio_base = (void __iomem *)hcd->regs;
+
+        if ((retval = pxa27x_start_hc(ohci, &pdev->dev)) < 0) {
                 pr_debug("pxa27x_start_hc failed");
                 goto err3;
         }
 
         /* Select Power Management Mode */
-        pxa27x_ohci_select_pmm(inf->port_mode);
+        pxa27x_ohci_select_pmm(ohci, inf->port_mode);
 
         if (inf->power_budget)
                 hcd->power_budget = inf->power_budget;
 
         ohci_hcd_init(hcd_to_ohci(hcd));
 
-        retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED);
+        retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
         if (retval == 0)
                 return retval;
 
-        pxa27x_stop_hc(&pdev->dev);
+        pxa27x_stop_hc(ohci, &pdev->dev);
  err3:
         iounmap(hcd->regs);
  err2:
@@ -228,12 +377,14 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
  */
 void usb_hcd_pxa27x_remove (struct usb_hcd *hcd, struct platform_device *pdev)
 {
+        struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
+
         usb_remove_hcd(hcd);
-        pxa27x_stop_hc(&pdev->dev);
+        pxa27x_stop_hc(ohci, &pdev->dev);
         iounmap(hcd->regs);
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
-        clk_put(usb_clk);
+        clk_put(ohci->clk);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -266,7 +417,7 @@ ohci_pxa27x_start (struct usb_hcd *hcd)
 static const struct hc_driver ohci_pxa27x_hc_driver = {
         .description =          hcd_name,
         .product_desc =         "PXA27x OHCI",
-        .hcd_priv_size =        sizeof(struct ohci_hcd),
+        .hcd_priv_size =        sizeof(struct pxa27x_ohci),
 
         /*
          * generic hardware linkage
@@ -330,13 +481,13 @@ static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)
 static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
-        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
 
-        if (time_before(jiffies, ohci->next_statechange))
+        if (time_before(jiffies, ohci->ohci.next_statechange))
                 msleep(5);
-        ohci->next_statechange = jiffies;
+        ohci->ohci.next_statechange = jiffies;
 
-        pxa27x_stop_hc(&pdev->dev);
+        pxa27x_stop_hc(ohci, &pdev->dev);
         hcd->state = HC_STATE_SUSPENDED;
 
         return 0;
@@ -345,14 +496,14 @@ static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_
 static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
 {
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
-        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
         int status;
 
-        if (time_before(jiffies, ohci->next_statechange))
+        if (time_before(jiffies, ohci->ohci.next_statechange))
                 msleep(5);
-        ohci->next_statechange = jiffies;
+        ohci->ohci.next_statechange = jiffies;
 
-        if ((status = pxa27x_start_hc(&pdev->dev)) < 0)
+        if ((status = pxa27x_start_hc(ohci, &pdev->dev)) < 0)
                 return status;
 
         ohci_finish_controller_resume(hcd);