Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (28 commits)
  powerpc: Fix oops when loading modules
  powerpc: Wire up preadv and pwritev
  powerpc/ftrace: Fix printf format warning
  powerpc/ftrace: Fix #if that should be #ifdef
  powerpc: Fix ptrace compat wrapper for FPU register access
  powerpc: Print information about mapping hw irqs to virtual irqs
  powerpc: Correct dependency of KEXEC
  powerpc: Disable VSX or current process in giveup_fpu/altivec
  powerpc/pseries: Enable relay in pseries_defconfig
  powerpc/pseries: Fix ibm,client-architecture comment
  powerpc/pseries: Scan for all events in rtasd
  powerpc/pseries: Add dispatch dispersion statistics
  powerpc: Clean up some prom printouts
  powerpc: Print progress of ibm,client-architecture method
  powerpc: Remove duplicated #include's
  powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook
  powerpc/wdrtas: Update wdrtas_get_interval to use rtas_data_buf
  fsl-diu-fb: Pass the proper device for dma mapping routines
  powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot.
  cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.
  ...

4 files changed, 54 insertions, 22 deletions

diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 5c6ef51da274..f8df0681e160 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1106,6 +1106,10 @@ static int cpm_uart_init_port(struct device_node *np,
         for (i = 0; i < NUM_GPIOS; i++)
                 pinfo->gpios[i] = of_get_gpio(np, i);
 
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+        udbg_putc = NULL;
+#endif
+
         return cpm_uart_request_port(&pinfo->port);
 
 out_pram:
@@ -1255,10 +1259,6 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
                         baud = 9600;
         }
 
-#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
-        udbg_putc = NULL;
-#endif
-
         if (IS_SMC(pinfo)) {
                 out_be16(&pinfo->smcup->smc_brkcr, 0);
                 cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX);
@@ -1339,13 +1339,13 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
 
         dev_set_drvdata(&ofdev->dev, pinfo);
 
+        /* initialize the device pointer for the port */
+        pinfo->port.dev = &ofdev->dev;
+
         ret = cpm_uart_init_port(ofdev->node, pinfo);
         if (ret)
                 return ret;
 
-        /* initialize the device pointer for the port */
-        pinfo->port.dev = &ofdev->dev;
-
         return uart_add_one_port(&cpm_reg, &pinfo->port);
 }
 
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index ad3488504010..9c1243fbd512 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1538,6 +1538,21 @@ no_dma:
         uap->port.type = PORT_PMAC_ZILOG;
         uap->port.flags = 0;
 
+        /*
+         * Fixup for the port on Gatwick for which the device-tree has
+         * missing interrupts. Normally, the macio_dev would contain
+         * fixed up interrupt info, but we use the device-tree directly
+         * here due to early probing so we need the fixup too.
+         */
+        if (uap->port.irq == NO_IRQ &&
+            np->parent && np->parent->parent &&
+            of_device_is_compatible(np->parent->parent, "gatwick")) {
+                /* IRQs on gatwick are offset by 64 */
+                uap->port.irq = irq_create_mapping(NULL, 64 + 15);
+                uap->tx_dma_irq = irq_create_mapping(NULL, 64 + 4);
+                uap->rx_dma_irq = irq_create_mapping(NULL, 64 + 5);
+        }
+
         /* Setup some valid baud rate information in the register
          * shadows so we don't write crap there before baud rate is
          * first initialized.
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index fb51197d1c98..f153c581cbd7 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1352,14 +1352,15 @@ static int fsl_diu_resume(struct of_device *ofdev)
 #endif                          /* CONFIG_PM */
 
 /* Align to 64-bit(8-byte), 32-byte, etc. */
-static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align)
+static int allocate_buf(struct device *dev, struct diu_addr *buf, u32 size,
+                        u32 bytes_align)
 {
         u32 offset, ssize;
         u32 mask;
         dma_addr_t paddr = 0;
 
         ssize = size + bytes_align;
-        buf->vaddr = dma_alloc_coherent(NULL, ssize, &paddr, GFP_DMA |
+        buf->vaddr = dma_alloc_coherent(dev, ssize, &paddr, GFP_DMA |
                                                              __GFP_ZERO);
         if (!buf->vaddr)
                 return -ENOMEM;
@@ -1376,9 +1377,10 @@ static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align)
         return 0;
 }
 
-static void free_buf(struct diu_addr *buf, u32 size, u32 bytes_align)
+static void free_buf(struct device *dev, struct diu_addr *buf, u32 size,
+                     u32 bytes_align)
 {
-        dma_free_coherent(NULL, size + bytes_align,
+        dma_free_coherent(dev, size + bytes_align,
                                 buf->vaddr, (buf->paddr - buf->offset));
         return;
 }
@@ -1476,17 +1478,19 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
         machine_data->monitor_port = monitor_port;
 
         /* Area descriptor memory pool aligns to 64-bit boundary */
-        if (allocate_buf(&pool.ad, sizeof(struct diu_ad) * FSL_AOI_NUM, 8))
+        if (allocate_buf(&ofdev->dev, &pool.ad,
+                         sizeof(struct diu_ad) * FSL_AOI_NUM, 8))
                 return -ENOMEM;
 
         /* Get memory for Gamma Table  - 32-byte aligned memory */
-        if (allocate_buf(&pool.gamma, 768, 32)) {
+        if (allocate_buf(&ofdev->dev, &pool.gamma, 768, 32)) {
                 ret = -ENOMEM;
                 goto error;
         }
 
         /* For performance, cursor bitmap buffer aligns to 32-byte boundary */
-        if (allocate_buf(&pool.cursor, MAX_CURS * MAX_CURS * 2, 32)) {
+        if (allocate_buf(&ofdev->dev, &pool.cursor, MAX_CURS * MAX_CURS * 2,
+                         32)) {
                 ret = -ENOMEM;
                 goto error;
         }
@@ -1554,11 +1558,13 @@ error:
                 i > 0; i--)
                 uninstall_fb(machine_data->fsl_diu_info[i - 1]);
         if (pool.ad.vaddr)
-                free_buf(&pool.ad, sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
+                free_buf(&ofdev->dev, &pool.ad,
+                         sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
         if (pool.gamma.vaddr)
-                free_buf(&pool.gamma, 768, 32);
+                free_buf(&ofdev->dev, &pool.gamma, 768, 32);
         if (pool.cursor.vaddr)
-                free_buf(&pool.cursor, MAX_CURS * MAX_CURS * 2, 32);
+                free_buf(&ofdev->dev, &pool.cursor, MAX_CURS * MAX_CURS * 2,
+                         32);
         if (machine_data->dummy_aoi_virt)
                 fsl_diu_free(machine_data->dummy_aoi_virt, 64);
         iounmap(dr.diu_reg);
@@ -1584,11 +1590,13 @@ static int fsl_diu_remove(struct of_device *ofdev)
         for (i = ARRAY_SIZE(machine_data->fsl_diu_info); i > 0; i--)
                 uninstall_fb(machine_data->fsl_diu_info[i - 1]);
         if (pool.ad.vaddr)
-                free_buf(&pool.ad, sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
+                free_buf(&ofdev->dev, &pool.ad,
+                         sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
         if (pool.gamma.vaddr)
-                free_buf(&pool.gamma, 768, 32);
+                free_buf(&ofdev->dev, &pool.gamma, 768, 32);
         if (pool.cursor.vaddr)
-                free_buf(&pool.cursor, MAX_CURS * MAX_CURS * 2, 32);
+                free_buf(&ofdev->dev, &pool.cursor, MAX_CURS * MAX_CURS * 2,
+                         32);
         if (machine_data->dummy_aoi_virt)
                 fsl_diu_free(machine_data->dummy_aoi_virt, 64);
         iounmap(dr.diu_reg);
diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c
index 5d3b1a8e28b0..a38fa4907c92 100644
--- a/drivers/watchdog/wdrtas.c
+++ b/drivers/watchdog/wdrtas.c
@@ -106,6 +106,8 @@ static int wdrtas_set_interval(int interval)
         return result;
 }
 
+#define WDRTAS_SP_SPI_LEN 4
+
 /**
  * wdrtas_get_interval - returns the current watchdog interval
  * @fallback_value: value (in seconds) to use, if the RTAS call fails
@@ -119,10 +121,17 @@ static int wdrtas_set_interval(int interval)
 static int wdrtas_get_interval(int fallback_value)
 {
         long result;
-        char value[4];
+        char value[WDRTAS_SP_SPI_LEN];
 
+        spin_lock(&rtas_data_buf_lock);
+        memset(rtas_data_buf, 0, WDRTAS_SP_SPI_LEN);
         result = rtas_call(wdrtas_token_get_sp, 3, 1, NULL,
-                           WDRTAS_SP_SPI, (void *)__pa(&value), 4);
+                           WDRTAS_SP_SPI, __pa(rtas_data_buf),
+                           WDRTAS_SP_SPI_LEN);
+
+        memcpy(value, rtas_data_buf, WDRTAS_SP_SPI_LEN);
+        spin_unlock(&rtas_data_buf_lock);
+
         if (value[0] != 0 || value[1] != 2 || value[3] != 0 || result < 0) {
                 printk(KERN_WARNING "wdrtas: could not get sp_spi watchdog "
                        "timeout (%li). Continuing\n", result);