]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
powerpc/mpc85xx: Remove P1023 RDS support
authorLijun Pan <LIJUN.PAN@FREESCALE.COM>
Mon, 5 May 2014 18:23:15 +0000 (13:23 -0500)
committerScott Wood <scottwood@freescale.com>
Thu, 22 May 2014 23:08:31 +0000 (18:08 -0500)
P1023RDS is no longer supported/manufactured by Freescale while P1023RDB is.

Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
arch/powerpc/boot/dts/p1023rds.dts [deleted file]
arch/powerpc/configs/mpc85xx_defconfig
arch/powerpc/configs/mpc85xx_smp_defconfig
arch/powerpc/platforms/85xx/Kconfig
arch/powerpc/platforms/85xx/Makefile
arch/powerpc/platforms/85xx/p1023_rdb.c [new file with mode: 0644]
arch/powerpc/platforms/85xx/p1023_rds.c [deleted file]

diff --git a/arch/powerpc/boot/dts/p1023rds.dts b/arch/powerpc/boot/dts/p1023rds.dts
deleted file mode 100644 (file)
index beb6cb1..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * P1023 RDS Device Tree Source
- *
- * Copyright 2010-2011 Freescale Semiconductor Inc.
- *
- * Author: Roy Zang <tie-fei.zang@freescale.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Freescale Semiconductor nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/include/ "fsl/p1023si-pre.dtsi"
-
-/ {
-       model = "fsl,P1023";
-       compatible = "fsl,P1023RDS";
-       #address-cells = <2>;
-       #size-cells = <2>;
-       interrupt-parent = <&mpic>;
-
-       memory {
-               device_type = "memory";
-       };
-
-       soc: soc@ff600000 {
-               ranges = <0x0 0x0 0xff600000 0x200000>;
-
-               i2c@3000 {
-                       rtc@68 {
-                               compatible = "dallas,ds1374";
-                               reg = <0x68>;
-                       };
-               };
-
-               spi@7000 {
-                       fsl_dataflash@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "atmel,at45db081d";
-                               reg = <0>;
-                               spi-max-frequency = <40000000>; /* input clock */
-                               partition@u-boot {
-                                       /* 512KB for u-boot Bootloader Image */
-                                       label = "u-boot-spi";
-                                       reg = <0x00000000 0x00080000>;
-                                       read-only;
-                               };
-                               partition@dtb {
-                                       /* 512KB for DTB Image */
-                                       label = "dtb-spi";
-                                       reg = <0x00080000 0x00080000>;
-                                       read-only;
-                               };
-                       };
-               };
-
-               usb@22000 {
-                       dr_mode = "host";
-                       phy_type = "ulpi";
-               };
-       };
-
-       lbc: localbus@ff605000 {
-               reg = <0 0xff605000 0 0x1000>;
-
-               /* NOR Flash, BCSR */
-               ranges = <0x0 0x0 0x0 0xee000000 0x02000000
-                         0x1 0x0 0x0 0xe0000000 0x00008000>;
-
-               nor@0,0 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "cfi-flash";
-                       reg = <0x0 0x0 0x02000000>;
-                       bank-width = <2>;
-                       device-width = <1>;
-                       partition@0 {
-                               label = "ramdisk";
-                               reg = <0x00000000 0x01c00000>;
-                       };
-                       partition@1c00000 {
-                               label = "kernel";
-                               reg = <0x01c00000 0x002e0000>;
-                       };
-                       partiton@1ee0000 {
-                               label = "dtb";
-                               reg = <0x01ee0000 0x00020000>;
-                       };
-                       partition@1f00000 {
-                               label = "firmware";
-                               reg = <0x01f00000 0x00080000>;
-                               read-only;
-                       };
-                       partition@1f80000 {
-                               label = "u-boot";
-                               reg = <0x01f80000 0x00080000>;
-                               read-only;
-                       };
-               };
-
-               fpga@1,0 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "fsl,p1023rds-fpga";
-                       reg = <1 0 0x8000>;
-                       ranges = <0 1 0 0x8000>;
-
-                       bcsr@20 {
-                               compatible = "fsl,p1023rds-bcsr";
-                               reg = <0x20 0x20>;
-                       };
-               };
-       };
-
-       pci0: pcie@ff60a000 {
-               reg = <0 0xff60a000 0 0x1000>;
-               ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
-                         0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;
-               pcie@0 {
-                       /* IRQ[0:3] are pulled up on board, set to active-low */
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map = <
-                               /* IDSEL 0x0 */
-                               0000 0 0 1 &mpic 0 1 0 0
-                               0000 0 0 2 &mpic 1 1 0 0
-                               0000 0 0 3 &mpic 2 1 0 0
-                               0000 0 0 4 &mpic 3 1 0 0
-                               >;
-                       ranges = <0x2000000 0x0 0xc0000000
-                                 0x2000000 0x0 0xc0000000
-                                 0x0 0x20000000
-
-                                 0x1000000 0x0 0x0
-                                 0x1000000 0x0 0x0
-                                 0x0 0x100000>;
-               };
-       };
-
-       board_pci1: pci1: pcie@ff609000 {
-               reg = <0 0xff609000 0 0x1000>;
-               ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
-                         0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-               pcie@0 {
-                       /*
-                        * IRQ[4:6] only for PCIe, set to active-high,
-                        * IRQ[7] is pulled up on board, set to active-low
-                        */
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map = <
-                               /* IDSEL 0x0 */
-                               0000 0 0 1 &mpic 4 2 0 0
-                               0000 0 0 2 &mpic 5 2 0 0
-                               0000 0 0 3 &mpic 6 2 0 0
-                               0000 0 0 4 &mpic 7 1 0 0
-                               >;
-                       ranges = <0x2000000 0x0 0xa0000000
-                                 0x2000000 0x0 0xa0000000
-                                 0x0 0x20000000
-
-                                 0x1000000 0x0 0x0
-                                 0x1000000 0x0 0x0
-                                 0x0 0x100000>;
-               };
-       };
-
-       pci2: pcie@ff60b000 {
-               reg = <0 0xff60b000 0 0x1000>;
-               ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
-                         0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-               pcie@0 {
-                       /*
-                        * IRQ[8:10] are pulled up on board, set to active-low
-                        * IRQ[11] only for PCIe, set to active-high,
-                        */
-                       interrupt-map-mask = <0xf800 0 0 7>;
-                       interrupt-map = <
-                               /* IDSEL 0x0 */
-                               0000 0 0 1 &mpic 8 1 0 0
-                               0000 0 0 2 &mpic 9 1 0 0
-                               0000 0 0 3 &mpic 10 1 0 0
-                               0000 0 0 4 &mpic 11 2 0 0
-                               >;
-                       ranges = <0x2000000 0x0 0x80000000
-                                 0x2000000 0x0 0x80000000
-                                 0x0 0x20000000
-
-                                 0x1000000 0x0 0x0
-                                 0x1000000 0x0 0x0
-                                 0x0 0x100000>;
-               };
-       };
-};
-
-/include/ "fsl/p1023si-post.dtsi"
index 19f0fbe5ba4b43e35f9e00bca14acacf2b79f343..55765c8cb08f9067e45ec2df588bbee37af61918 100644 (file)
@@ -32,7 +32,6 @@ CONFIG_P1010_RDB=y
 CONFIG_P1022_DS=y
 CONFIG_P1022_RDK=y
 CONFIG_P1023_RDB=y
-CONFIG_P1023_RDS=y
 CONFIG_SOCRATES=y
 CONFIG_KSI8560=y
 CONFIG_XES_MPC85xx=y
index 062312e1fe1abd7b2912678f9e318f249811a8ed..5c6ecdc0f70e717b123e10abfe8d815f5e63b960 100644 (file)
@@ -35,7 +35,6 @@ CONFIG_P1010_RDB=y
 CONFIG_P1022_DS=y
 CONFIG_P1022_RDK=y
 CONFIG_P1023_RDB=y
-CONFIG_P1023_RDS=y
 CONFIG_SOCRATES=y
 CONFIG_KSI8560=y
 CONFIG_XES_MPC85xx=y
index 918b3902de6779f70dd39c743ed32bc3cf477a91..a3cd2afee511c579324eaba23db12ae19b8224a1 100644 (file)
@@ -117,11 +117,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"
index 25cebe74ac463365b7d5a4d7e89aea8088a818a4..822103e8d34f3dd78d6da6db94a677d00008408e 100644 (file)
@@ -17,7 +17,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/p1023_rdb.c b/arch/powerpc/platforms/85xx/p1023_rdb.c
new file mode 100644 (file)
index 0000000..d5b7509
--- /dev/null
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2010-2011, 2013 Freescale Semiconductor, Inc.
+ *
+ * Author: Roy Zang <tie-fei.zang@freescale.com>
+ *
+ * Description:
+ * 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
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.h>
+
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+#include "smp.h"
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+#include "mpc85xx.h"
+
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+static void __init mpc85xx_rdb_setup_arch(void)
+{
+       struct device_node *np;
+
+       if (ppc_md.progress)
+               ppc_md.progress("p1023_rdb_setup_arch()", 0);
+
+       /* Map BCSR area */
+       np = of_find_node_by_name(NULL, "bcsr");
+       if (np != NULL) {
+               static u8 __iomem *bcsr_regs;
+
+               bcsr_regs = of_iomap(np, 0);
+               of_node_put(np);
+
+               if (!bcsr_regs) {
+                       printk(KERN_ERR
+                              "BCSR: Failed to map bcsr register space\n");
+                       return;
+               } else {
+#define BCSR15_I2C_BUS0_SEG_CLR                0x07
+#define BCSR15_I2C_BUS0_SEG2           0x02
+/*
+ * Note: Accessing exclusively i2c devices.
+ *
+ * The i2c controller selects initially ID EEPROM in the u-boot;
+ * but if menu configuration selects RTC support in the kernel,
+ * the i2c controller switches to select RTC chip in the kernel.
+ */
+#ifdef CONFIG_RTC_CLASS
+                       /* Enable RTC chip on the segment #2 of i2c */
+                       clrbits8(&bcsr_regs[15], BCSR15_I2C_BUS0_SEG_CLR);
+                       setbits8(&bcsr_regs[15], BCSR15_I2C_BUS0_SEG2);
+#endif
+
+                       iounmap(bcsr_regs);
+               }
+       }
+
+       mpc85xx_smp_init();
+
+       fsl_pci_assign_primary();
+}
+
+machine_arch_initcall(p1023_rdb, mpc85xx_common_publish_devices);
+
+static void __init mpc85xx_rdb_pic_init(void)
+{
+       struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
+               MPIC_SINGLE_DEST_CPU,
+               0, 256, " OpenPIC  ");
+
+       BUG_ON(mpic == NULL);
+
+       mpic_init(mpic);
+}
+
+static int __init p1023_rdb_probe(void)
+{
+       unsigned long root = of_get_flat_dt_root();
+
+       return of_flat_dt_is_compatible(root, "fsl,P1023RDB");
+
+}
+
+define_machine(p1023_rdb) {
+       .name                   = "P1023 RDB",
+       .probe                  = p1023_rdb_probe,
+       .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,
+       .progress               = udbg_progress,
+#ifdef CONFIG_PCI
+       .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+       .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
+#endif
+};
diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c
deleted file mode 100644 (file)
index 0e61400..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2010-2011, 2013 Freescale Semiconductor, Inc.
- *
- * Author: Roy Zang <tie-fei.zang@freescale.com>
- *
- * Description:
- * P1023 RDS 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
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/fsl_devices.h>
-#include <linux/of_platform.h>
-#include <linux/of_device.h>
-
-#include <asm/time.h>
-#include <asm/machdep.h>
-#include <asm/pci-bridge.h>
-#include <mm/mmu_decl.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/mpic.h>
-#include "smp.h"
-
-#include <sysdev/fsl_soc.h>
-#include <sysdev/fsl_pci.h>
-
-#include "mpc85xx.h"
-
-/* ************************************************************************
- *
- * Setup the architecture
- *
- */
-static void __init mpc85xx_rds_setup_arch(void)
-{
-       struct device_node *np;
-
-       if (ppc_md.progress)
-               ppc_md.progress("p1023_rds_setup_arch()", 0);
-
-       /* Map BCSR area */
-       np = of_find_node_by_name(NULL, "bcsr");
-       if (np != NULL) {
-               static u8 __iomem *bcsr_regs;
-
-               bcsr_regs = of_iomap(np, 0);
-               of_node_put(np);
-
-               if (!bcsr_regs) {
-                       printk(KERN_ERR
-                              "BCSR: Failed to map bcsr register space\n");
-                       return;
-               } else {
-#define BCSR15_I2C_BUS0_SEG_CLR                0x07
-#define BCSR15_I2C_BUS0_SEG2           0x02
-/*
- * Note: Accessing exclusively i2c devices.
- *
- * The i2c controller selects initially ID EEPROM in the u-boot;
- * but if menu configuration selects RTC support in the kernel,
- * the i2c controller switches to select RTC chip in the kernel.
- */
-#ifdef CONFIG_RTC_CLASS
-                       /* Enable RTC chip on the segment #2 of i2c */
-                       clrbits8(&bcsr_regs[15], BCSR15_I2C_BUS0_SEG_CLR);
-                       setbits8(&bcsr_regs[15], BCSR15_I2C_BUS0_SEG2);
-#endif
-
-                       iounmap(bcsr_regs);
-               }
-       }
-
-       mpc85xx_smp_init();
-
-       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)
-{
-       struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
-               MPIC_SINGLE_DEST_CPU,
-               0, 256, " OpenPIC  ");
-
-       BUG_ON(mpic == NULL);
-
-       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();
-
-       return of_flat_dt_is_compatible(root, "fsl,P1023RDB");
-
-}
-
-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,
-       .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
-};