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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
  [POWERPC] Fix compile breakage for 64-bit UP configs
  [POWERPC] Define copy_siginfo_from_user32
  [POWERPC] Add compat handler for PTRACE_GETSIGINFO
  [POWERPC] i2c: Fix build breakage introduced by OF helpers
  [POWERPC] Optimize fls64() on 64-bit processors
  [POWERPC] irqtrace support for 64-bit powerpc
  [POWERPC] Stacktrace support for lockdep
  [POWERPC] Move stackframe definitions to common header
  [POWERPC] Fix device-tree locking vs. interrupts
  [POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
  [POWERPC] Remove unused __max_memory variable
  [POWERPC] Simplify xics direct/lpar irq_host setup
  [POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
  [POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
  [POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
  [POWERPC] Use asm-generic/bitops/find.h in bitops.h
  [POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
  [POWERPC] 85xx: Fix the size of qe muram for MPC8568E
  [POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
  [POWERPC] 86xx: mark functions static, other minor cleanups
  ...

6 files changed, 93 insertions, 15 deletions

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index 32b9737759c4..0cc39f82d7c5 100644
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -92,6 +92,9 @@ extern struct uart_cpm_port cpm_uart_ports[UART_NR];
 
 /* these are located in their respective files */
 void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);
+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
+                                struct device_node *np);
+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram);
 int cpm_uart_init_portdesc(void);
 int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 236af9d33851..a638ba0679ac 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -966,24 +966,23 @@ static int cpm_uart_init_port(struct device_node *np,
         if (!mem)
                 return -ENOMEM;
 
-        pram = of_iomap(np, 1);
-        if (!pram) {
-                ret = -ENOMEM;
-                goto out_mem;
-        }
-
         if (of_device_is_compatible(np, "fsl,cpm1-scc-uart") ||
             of_device_is_compatible(np, "fsl,cpm2-scc-uart")) {
                 pinfo->sccp = mem;
-                pinfo->sccup = pram;
+                pinfo->sccup = pram = cpm_uart_map_pram(pinfo, np);
         } else if (of_device_is_compatible(np, "fsl,cpm1-smc-uart") ||
                    of_device_is_compatible(np, "fsl,cpm2-smc-uart")) {
                 pinfo->flags |= FLAG_SMC;
                 pinfo->smcp = mem;
-                pinfo->smcup = pram;
+                pinfo->smcup = pram = cpm_uart_map_pram(pinfo, np);
         } else {
                 ret = -ENODEV;
-                goto out_pram;
+                goto out_mem;
+        }
+
+        if (!pram) {
+                ret = -ENOMEM;
+                goto out_mem;
         }
 
         pinfo->tx_nrfifos = TX_NUM_FIFO;
@@ -1007,7 +1006,7 @@ static int cpm_uart_init_port(struct device_node *np,
         return cpm_uart_request_port(&pinfo->port);
 
 out_pram:
-        iounmap(pram);
+        cpm_uart_unmap_pram(pinfo, pram);
 out_mem:
         iounmap(mem);
         return ret;
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 6ea0366e26ae..74f1432bb248 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -45,6 +45,8 @@
 #include <linux/serial_core.h>
 #include <linux/kernel.h>
 
+#include <linux/of.h>
+
 #include "cpm_uart.h"
 
 /**************************************************************/
@@ -54,6 +56,18 @@ void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 {
         cpm_command(port->command, cmd);
 }
+
+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
+                                struct device_node *np)
+{
+        return of_iomap(np, 1);
+}
+
+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
+{
+        iounmap(pram);
+}
+
 #else
 void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 {
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index d9af06a791ba..bb862e2f54cf 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -41,6 +41,9 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/fs_pd.h>
+#ifdef CONFIG_PPC_CPM_NEW_BINDING
+#include <asm/prom.h>
+#endif
 
 #include <linux/serial_core.h>
 #include <linux/kernel.h>
@@ -54,6 +57,55 @@ void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 {
         cpm_command(port->command, cmd);
 }
+
+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
+                                struct device_node *np)
+{
+        void __iomem *pram;
+        unsigned long offset;
+        struct resource res;
+        unsigned long len;
+
+        /* Don't remap parameter RAM if it has already been initialized
+         * during console setup.
+         */
+        if (IS_SMC(port) && port->smcup)
+                return port->smcup;
+        else if (!IS_SMC(port) && port->sccup)
+                return port->sccup;
+
+        if (of_address_to_resource(np, 1, &res))
+                return NULL;
+
+        len = 1 + res.end - res.start;
+        pram = ioremap(res.start, len);
+        if (!pram)
+                return NULL;
+
+        if (!IS_SMC(port))
+                return pram;
+
+        if (len != 2) {
+                printk(KERN_WARNING "cpm_uart[%d]: device tree references "
+                        "SMC pram, using boot loader/wrapper pram mapping. "
+                        "Please fix your device tree to reference the pram "
+                        "base register instead.\n",
+                        port->port.line);
+                return pram;
+        }
+
+        offset = cpm_dpalloc(PROFF_SMC_SIZE, 64);
+        out_be16(pram, offset);
+        iounmap(pram);
+        return cpm_muram_addr(offset);
+}
+
+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
+{
+        if (!IS_SMC(port))
+                iounmap(pram);
+}
+
 #else
 void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 {
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index c0e50a461055..8aacfb78deab 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -56,7 +56,9 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
         port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
                 | UPF_FIXED_PORT;
         port->dev = &ofdev->dev;
-        port->custom_divisor = *clk / (16 * (*spd));
+        /* If current-speed was set, then try not to change it. */
+        if (spd)
+                port->custom_divisor = *clk / (16 * (*spd));
 
         return 0;
 }
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index e0994f061001..5e4310ccd591 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_device *ofdev,
 
         /* Get the UCC number (device ID) */
         /* UCCs are numbered 1-7 */
-        iprop = of_get_property(np, "device-id", NULL);
-        if (!iprop || (*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
-                dev_err(&ofdev->dev,
-                        "missing or invalid UCC specified in device tree\n");
+        iprop = of_get_property(np, "cell-index", NULL);
+        if (!iprop) {
+                iprop = of_get_property(np, "device-id", NULL);
+                if (!iprop) {
+                        dev_err(&ofdev->dev, "UCC is unspecified in "
+                                "device tree\n");
+                        return -EINVAL;
+                }
+        }
+
+        if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
+                dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop);
                 kfree(qe_port);
                 return -ENODEV;
         }