Merge remote-tracking branch 'scott/next' into next

<<
Highlights include a few new boards, a device tree binding for CCF
(including backwards-compatible device tree updates to distinguish
incompatible versions), and some fixes.
>>

5 files changed, 104 insertions, 37 deletions

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index c17aae80e7ff..f442120e0033 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -38,6 +38,15 @@ config C293_PCIE
           help
           This option enables support for the C293PCIE board
 
+config BSC9132_QDS
+        bool "Freescale BSC9132QDS"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the Freescale BSC9132 QDS board.
+          BSC9132 is a heterogeneous SoC containing dual e500v2 powerpc cores
+          and dual StarCore SC3850 DSP cores.
+          Manufacturer : Freescale Semiconductor, Inc
+
 config MPC8540_ADS
         bool "Freescale MPC8540 ADS"
         select DEFAULT_UIMAGE
@@ -117,11 +126,11 @@ config P1022_RDK
           This option enables support for the Freescale / iVeia P1022RDK
           reference board.
 
-config P1023_RDS
-        bool "Freescale P1023 RDS/RDB"
+config P1023_RDB
+        bool "Freescale P1023 RDB"
         select DEFAULT_UIMAGE
         help
-          This option enables support for the P1023 RDS and RDB boards
+          This option enables support for the P1023 RDB board.
 
 config TWR_P102x
         bool "Freescale TWR-P102x"
@@ -263,11 +272,11 @@ config CORENET_GENERIC
         help
           This option enables support for the FSL CoreNet based boards.
           For 32bit kernel, the following boards are supported:
-            P2041 RDB, P3041 DS and P4080 DS
+            P2041 RDB, P3041 DS, P4080 DS, kmcoge4, and OCA4080
           For 64bit kernel, the following boards are supported:
             T4240 QDS and B4 QDS
           The following boards are supported for both 32bit and 64bit kernel:
-            P5020 DS and P5040 DS
+            P5020 DS, P5040 DS and T104xQDS
 
 endif # FSL_SOC_BOOKE
 
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 25cebe74ac46..730326046625 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_SMP) += smp.o
 obj-y += common.o
 
 obj-$(CONFIG_BSC9131_RDB) += bsc913x_rdb.o
+obj-$(CONFIG_BSC9132_QDS) += bsc913x_qds.o
 obj-$(CONFIG_C293_PCIE)   += c293pcie.o
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
@@ -17,7 +18,7 @@ obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o
 obj-$(CONFIG_P1010_RDB)   += p1010rdb.o
 obj-$(CONFIG_P1022_DS)    += p1022_ds.o
 obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o
-obj-$(CONFIG_P1023_RDS)   += p1023_rds.o
+obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o
 obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
 obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
 obj-$(CONFIG_STX_GP3)     += stx_gp3.o
diff --git a/arch/powerpc/platforms/85xx/bsc913x_qds.c b/arch/powerpc/platforms/85xx/bsc913x_qds.c
new file mode 100644
index 000000000000..f0927e58af25
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/bsc913x_qds.c
@@ -0,0 +1,74 @@
+/*
+ * BSC913xQDS Board Setup
+ *
+ * Author:
+ *   Harninder Rai <harninder.rai@freescale.com>
+ *   Priyanka Jain <Priyanka.Jain@freescale.com>
+ *
+ * Copyright 2014 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/of_platform.h>
+#include <linux/pci.h>
+#include <asm/mpic.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/udbg.h>
+
+#include "mpc85xx.h"
+#include "smp.h"
+
+void __init bsc913x_qds_pic_init(void)
+{
+        struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
+          MPIC_SINGLE_DEST_CPU,
+          0, 256, " OpenPIC  ");
+
+        if (!mpic)
+                pr_err("bsc913x: Failed to allocate MPIC structure\n");
+        else
+                mpic_init(mpic);
+}
+
+/*
+ * Setup the architecture
+ */
+static void __init bsc913x_qds_setup_arch(void)
+{
+        if (ppc_md.progress)
+                ppc_md.progress("bsc913x_qds_setup_arch()", 0);
+
+#if defined(CONFIG_SMP)
+        mpc85xx_smp_init();
+#endif
+
+        pr_info("bsc913x board from Freescale Semiconductor\n");
+}
+
+machine_device_initcall(bsc9132_qds, mpc85xx_common_publish_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+
+static int __init bsc9132_qds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,bsc9132qds");
+}
+
+define_machine(bsc9132_qds) {
+        .name                   = "BSC9132 QDS",
+        .probe                  = bsc9132_qds_probe,
+        .setup_arch             = bsc913x_qds_setup_arch,
+        .init_IRQ               = bsc913x_qds_pic_init,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 8e4b1e1a4911..5db1e117fdde 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -67,7 +67,7 @@ void __init corenet_gen_setup_arch(void)
 
         swiotlb_detect_4g();
 
-        pr_info("%s board from Freescale Semiconductor\n", ppc_md.name);
+        pr_info("%s board\n", ppc_md.name);
 
         mpc85xx_qe_init();
 }
@@ -115,6 +115,7 @@ int __init corenet_gen_publish_devices(void)
 static const char * const boards[] __initconst = {
         "fsl,P2041RDB",
         "fsl,P3041DS",
+        "fsl,OCA4080",
         "fsl,P4080DS",
         "fsl,P5020DS",
         "fsl,P5040DS",
@@ -122,12 +123,16 @@ static const char * const boards[] __initconst = {
         "fsl,B4860QDS",
         "fsl,B4420QDS",
         "fsl,B4220QDS",
+        "fsl,T1040QDS",
+        "fsl,T1042QDS",
+        "keymile,kmcoge4",
         NULL
 };
 
 static const char * const hv_boards[] __initconst = {
         "fsl,P2041RDB-hv",
         "fsl,P3041DS-hv",
+        "fsl,OCA4080-hv",
         "fsl,P4080DS-hv",
         "fsl,P5020DS-hv",
         "fsl,P5040DS-hv",
@@ -135,6 +140,8 @@ static const char * const hv_boards[] __initconst = {
         "fsl,B4860QDS-hv",
         "fsl,B4420QDS-hv",
         "fsl,B4220QDS-hv",
+        "fsl,T1040QDS-hv",
+        "fsl,T1042QDS-hv",
         NULL
 };
 
diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rdb.c
index 0e614007acfb..d5b7509825de 100644
--- a/arch/powerpc/platforms/85xx/p1023_rds.c
+++ b/arch/powerpc/platforms/85xx/p1023_rdb.c
@@ -4,7 +4,7 @@
  * Author: Roy Zang <tie-fei.zang@freescale.com>
  *
  * Description:
- * P1023 RDS Board Setup
+ * P1023 RDB Board Setup
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -41,12 +41,12 @@
  * Setup the architecture
  *
  */
-static void __init mpc85xx_rds_setup_arch(void)
+static void __init mpc85xx_rdb_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("p1023_rds_setup_arch()", 0);
+                ppc_md.progress("p1023_rdb_setup_arch()", 0);
 
         /* Map BCSR area */
         np = of_find_node_by_name(NULL, "bcsr");
@@ -85,10 +85,9 @@ static void __init mpc85xx_rds_setup_arch(void)
         fsl_pci_assign_primary();
 }
 
-machine_arch_initcall(p1023_rds, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1023_rdb, mpc85xx_common_publish_devices);
 
-static void __init mpc85xx_rds_pic_init(void)
+static void __init mpc85xx_rdb_pic_init(void)
 {
         struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
                 MPIC_SINGLE_DEST_CPU,
@@ -99,14 +98,6 @@ static void __init mpc85xx_rds_pic_init(void)
         mpic_init(mpic);
 }
 
-static int __init p1023_rds_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        return of_flat_dt_is_compatible(root, "fsl,P1023RDS");
-
-}
-
 static int __init p1023_rdb_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
@@ -115,26 +106,11 @@ static int __init p1023_rdb_probe(void)
 
 }
 
-define_machine(p1023_rds) {
-        .name                   = "P1023 RDS",
-        .probe                  = p1023_rds_probe,
-        .setup_arch             = mpc85xx_rds_setup_arch,
-        .init_IRQ               = mpc85xx_rds_pic_init,
-        .get_irq                = mpic_get_irq,
-        .restart                = fsl_rstcr_restart,
-        .calibrate_decr         = generic_calibrate_decr,
-        .progress               = udbg_progress,
-#ifdef CONFIG_PCI
-        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
-        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
-#endif
-};
-
 define_machine(p1023_rdb) {
         .name                   = "P1023 RDB",
         .probe                  = p1023_rdb_probe,
-        .setup_arch             = mpc85xx_rds_setup_arch,
-        .init_IRQ               = mpc85xx_rds_pic_init,
+        .setup_arch             = mpc85xx_rdb_setup_arch,
+        .init_IRQ               = mpc85xx_rdb_pic_init,
         .get_irq                = mpic_get_irq,
         .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,