6 files changed, 121 insertions, 54 deletions

diff --git a/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts b/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts
index 852e5b27485d..57573bd52caa 100644
--- a/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts
+++ b/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts
@@ -56,7 +56,7 @@
                 ranges = <0x0 0x0 0xffe00000 0x100000>;
         };
 
-        pci0: pcie@ffe08000 {
+        pci2: pcie@ffe08000 {
                 reg = <0 0xffe08000 0 0x1000>;
                 status = "disabled";
         };
@@ -76,7 +76,7 @@
                 };
         };
 
-        pci2: pcie@ffe0a000 {
+        pci0: pcie@ffe0a000 {
                 reg = <0 0xffe0a000 0 0x1000>;
                 ranges = <0x2000000 0x0 0xe0000000 0 0x80000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
diff --git a/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts b/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts
index b5a56ca51cf7..470247ea68b4 100644
--- a/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts
+++ b/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts
@@ -56,7 +56,7 @@
                 ranges = <0x0 0xf 0xffe00000 0x100000>;
         };
 
-        pci0: pcie@fffe08000 {
+        pci2: pcie@fffe08000 {
                 reg = <0xf 0xffe08000 0 0x1000>;
                 status = "disabled";
         };
@@ -76,7 +76,7 @@
                 };
         };
 
-        pci2: pcie@fffe0a000 {
+        pci0: pcie@fffe0a000 {
                 reg = <0xf 0xffe0a000 0 0x1000>;
                 ranges = <0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>;
diff --git a/arch/powerpc/boot/dts/p3041ds.dts b/arch/powerpc/boot/dts/p3041ds.dts
index 22a215e94162..6cdcadc80c30 100644
--- a/arch/powerpc/boot/dts/p3041ds.dts
+++ b/arch/powerpc/boot/dts/p3041ds.dts
@@ -58,7 +58,7 @@
                                 #size-cells = <1>;
                                 compatible = "spansion,s25sl12801";
                                 reg = <0>;
-                                spi-max-frequency = <40000000>; /* input clock */
+                                spi-max-frequency = <35000000>; /* input clock */
                                 partition@u-boot {
                                         label = "u-boot";
                                         reg = <0x00000000 0x00100000>;
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 89ee02c54561..3c732acf331d 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -208,6 +208,7 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
         u8 __iomem *lbc_lcs0_ba = NULL;
         u8 __iomem *lbc_lcs1_ba = NULL;
         phys_addr_t cs0_addr, cs1_addr;
+        u32 br0, or0, br1, or1;
         const __be32 *iprop;
         unsigned int num_laws;
         u8 b;
@@ -256,11 +257,70 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
         }
         num_laws = be32_to_cpup(iprop);
 
-        cs0_addr = lbc_br_to_phys(ecm, num_laws, in_be32(&lbc->bank[0].br));
-        cs1_addr = lbc_br_to_phys(ecm, num_laws, in_be32(&lbc->bank[1].br));
+        /*
+         * Indirect mode requires both BR0 and BR1 to be set to "GPCM",
+         * otherwise writes to these addresses won't actually appear on the
+         * local bus, and so the PIXIS won't see them.
+         *
+         * In FCM mode, writes go to the NAND controller, which does not pass
+         * them to the localbus directly.  So we force BR0 and BR1 into GPCM
+         * mode, since we don't care about what's behind the localbus any
+         * more.
+         */
+        br0 = in_be32(&lbc->bank[0].br);
+        br1 = in_be32(&lbc->bank[1].br);
+        or0 = in_be32(&lbc->bank[0].or);
+        or1 = in_be32(&lbc->bank[1].or);
+
+        /* Make sure CS0 and CS1 are programmed */
+        if (!(br0 & BR_V) || !(br1 & BR_V)) {
+                pr_err("p1022ds: CS0 and/or CS1 is not programmed\n");
+                goto exit;
+        }
+
+        /*
+         * Use the existing BRx/ORx values if it's already GPCM. Otherwise,
+         * force the values to simple 32KB GPCM windows with the most
+         * conservative timing.
+         */
+        if ((br0 & BR_MSEL) != BR_MS_GPCM) {
+                br0 = (br0 & BR_BA) | BR_V;
+                or0 = 0xFFFF8000 | 0xFF7;
+                out_be32(&lbc->bank[0].br, br0);
+                out_be32(&lbc->bank[0].or, or0);
+        }
+        if ((br1 & BR_MSEL) != BR_MS_GPCM) {
+                br1 = (br1 & BR_BA) | BR_V;
+                or1 = 0xFFFF8000 | 0xFF7;
+                out_be32(&lbc->bank[1].br, br1);
+                out_be32(&lbc->bank[1].or, or1);
+        }
+
+        cs0_addr = lbc_br_to_phys(ecm, num_laws, br0);
+        if (!cs0_addr) {
+                pr_err("p1022ds: could not determine physical address for CS0"
+                       " (BR0=%08x)\n", br0);
+                goto exit;
+        }
+        cs1_addr = lbc_br_to_phys(ecm, num_laws, br1);
+        if (!cs0_addr) {
+                pr_err("p1022ds: could not determine physical address for CS1"
+                       " (BR1=%08x)\n", br1);
+                goto exit;
+        }
 
         lbc_lcs0_ba = ioremap(cs0_addr, 1);
+        if (!lbc_lcs0_ba) {
+                pr_err("p1022ds: could not ioremap CS0 address %llx\n",
+                       (unsigned long long)cs0_addr);
+                goto exit;
+        }
         lbc_lcs1_ba = ioremap(cs1_addr, 1);
+        if (!lbc_lcs1_ba) {
+                pr_err("p1022ds: could not ioremap CS1 address %llx\n",
+                       (unsigned long long)cs1_addr);
+                goto exit;
+        }
 
         /* Make sure we're in indirect mode first. */
         if ((in_be32(&guts->pmuxcr) & PMUXCR_ELBCDIU_MASK) !=
@@ -419,18 +479,6 @@ void __init p1022_ds_pic_init(void)
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
 
-/*
- * Disables a node in the device tree.
- *
- * This function is called before kmalloc() is available, so the 'new' object
- * should be allocated in the global area.  The easiest way is to do that is
- * to allocate one static local variable for each call to this function.
- */
-static void __init disable_one_node(struct device_node *np, struct property *new)
-{
-        prom_update_property(np, new);
-}
-
 /* TRUE if there is a "video=fslfb" command-line parameter. */
 static bool fslfb;
 
@@ -493,28 +541,58 @@ static void __init p1022_ds_setup_arch(void)
         diu_ops.valid_monitor_port      = p1022ds_valid_monitor_port;
 
         /*
-         * Disable the NOR flash node if there is video=fslfb... command-line
-         * parameter.  When the DIU is active, NOR flash is unavailable, so we
-         * have to disable the node before the MTD driver loads.
+         * Disable the NOR and NAND flash nodes if there is video=fslfb...
+         * command-line parameter.  When the DIU is active, the localbus is
+         * unavailable, so we have to disable these nodes before the MTD
+         * driver loads.
          */
         if (fslfb) {
                 struct device_node *np =
                         of_find_compatible_node(NULL, NULL, "fsl,p1022-elbc");
 
                 if (np) {
-                        np = of_find_compatible_node(np, NULL, "cfi-flash");
-                        if (np) {
+                        struct device_node *np2;
+
+                        of_node_get(np);
+                        np2 = of_find_compatible_node(np, NULL, "cfi-flash");
+                        if (np2) {
                                 static struct property nor_status = {
                                         .name = "status",
                                         .value = "disabled",
                                         .length = sizeof("disabled"),
                                 };
 
+                                /*
+                                 * prom_update_property() is called before
+                                 * kmalloc() is available, so the 'new' object
+                                 * should be allocated in the global area.
+                                 * The easiest way is to do that is to
+                                 * allocate one static local variable for each
+                                 * call to this function.
+                                 */
                                 pr_info("p1022ds: disabling %s node",
-                                        np->full_name);
-                                disable_one_node(np, &nor_status);
-                                of_node_put(np);
+                                        np2->full_name);
+                                prom_update_property(np2, &nor_status);
+                                of_node_put(np2);
                         }
+
+                        of_node_get(np);
+                        np2 = of_find_compatible_node(np, NULL,
+                                                      "fsl,elbc-fcm-nand");
+                        if (np2) {
+                                static struct property nand_status = {
+                                        .name = "status",
+                                        .value = "disabled",
+                                        .length = sizeof("disabled"),
+                                };
+
+                                pr_info("p1022ds: disabling %s node",
+                                        np2->full_name);
+                                prom_update_property(np2, &nand_status);
+                                of_node_put(np2);
+                        }
+
+                        of_node_put(np);
                 }
 
         }
diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h b/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
index 60c9c0bd5ba2..2aa97ddb7b78 100644
--- a/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
+++ b/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Freescale Semiconductor, Inc
+ * Copyright 2009-2010, 2012 Freescale Semiconductor, Inc
  *
  * QorIQ based Cache Controller Memory Mapped Registers
  *
@@ -91,7 +91,7 @@ struct mpc85xx_l2ctlr {
 
 struct sram_parameters {
         unsigned int sram_size;
-        uint64_t sram_offset;
+        phys_addr_t sram_offset;
 };
 
 extern int instantiate_cache_sram(struct platform_device *dev,
diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
index cedabd0f4bfe..68ac3aacb191 100644
--- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
+++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2010, 2012 Freescale Semiconductor, Inc.
  *
  * QorIQ (P1/P2) L2 controller init for Cache-SRAM instantiation
  *
@@ -31,24 +31,21 @@ static char *sram_size;
 static char *sram_offset;
 struct mpc85xx_l2ctlr __iomem *l2ctlr;
 
-static long get_cache_sram_size(void)
+static int get_cache_sram_params(struct sram_parameters *sram_params)
 {
-        unsigned long val;
+        unsigned long long addr;
+        unsigned int size;
 
-        if (!sram_size || (strict_strtoul(sram_size, 0, &val) < 0))
+        if (!sram_size || (kstrtouint(sram_size, 0, &size) < 0))
                 return -EINVAL;
 
-        return val;
-}
-
-static long get_cache_sram_offset(void)
-{
-        unsigned long val;
-
-        if (!sram_offset || (strict_strtoul(sram_offset, 0, &val) < 0))
+        if (!sram_offset || (kstrtoull(sram_offset, 0, &addr) < 0))
                 return -EINVAL;
 
-        return val;
+        sram_params->sram_offset = addr;
+        sram_params->sram_size = size;
+
+        return 0;
 }
 
 static int __init get_size_from_cmdline(char *str)
@@ -93,17 +90,9 @@ static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev)
         }
         l2cache_size = *prop;
 
-        sram_params.sram_size  = get_cache_sram_size();
-        if ((int)sram_params.sram_size <= 0) {
-                dev_err(&dev->dev,
-                        "Entire L2 as cache, Aborting Cache-SRAM stuff\n");
-                return -EINVAL;
-        }
-
-        sram_params.sram_offset  = get_cache_sram_offset();
-        if ((int64_t)sram_params.sram_offset <= 0) {
+        if (get_cache_sram_params(&sram_params)) {
                 dev_err(&dev->dev,
-                        "Entire L2 as cache, provide a valid sram offset\n");
+                        "Entire L2 as cache, provide valid sram offset and size\n");
                 return -EINVAL;
         }
 
@@ -125,14 +114,14 @@ static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev)
          * Write bits[0-17] to srbar0
          */
         out_be32(&l2ctlr->srbar0,
-                sram_params.sram_offset & L2SRAM_BAR_MSK_LO18);
+                lower_32_bits(sram_params.sram_offset) & L2SRAM_BAR_MSK_LO18);
 
         /*
          * Write bits[18-21] to srbare0
          */
 #ifdef CONFIG_PHYS_64BIT
         out_be32(&l2ctlr->srbarea0,
-                (sram_params.sram_offset >> 32) & L2SRAM_BARE_MSK_HI4);
+                upper_32_bits(sram_params.sram_offset) & L2SRAM_BARE_MSK_HI4);
 #endif
 
         clrsetbits_be32(&l2ctlr->ctl, L2CR_L2E, L2CR_L2FI);