ARM: clps711x: Rename board files to match functionality
authorAlexander Shiyan <shc_work@mail.ru>
Sat, 17 Nov 2012 13:57:22 +0000 (17:57 +0400)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 17:57:46 +0000 (09:57 -0800)
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
13 files changed:
arch/arm/mach-clps711x/Makefile
arch/arm/mach-clps711x/autcpu12.c [deleted file]
arch/arm/mach-clps711x/board-autcpu12.c [new file with mode: 0644]
arch/arm/mach-clps711x/board-cdb89712.c [new file with mode: 0644]
arch/arm/mach-clps711x/board-clep7312.c [new file with mode: 0644]
arch/arm/mach-clps711x/board-edb7211.c [new file with mode: 0644]
arch/arm/mach-clps711x/board-fortunet.c [new file with mode: 0644]
arch/arm/mach-clps711x/board-p720t.c [new file with mode: 0644]
arch/arm/mach-clps711x/cdb89712.c [deleted file]
arch/arm/mach-clps711x/clep7312.c [deleted file]
arch/arm/mach-clps711x/edb7211.c [deleted file]
arch/arm/mach-clps711x/fortunet.c [deleted file]
arch/arm/mach-clps711x/p720t.c [deleted file]

index 9cf2d1c6a54800ab9042f029f5cb22f3dc538a91..992995af666a58e9b0f4af3c4127dff55476eba4 100644 (file)
@@ -9,9 +9,9 @@ obj-m                   :=
 obj-n                  :=
 obj-                   :=
 
-obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o
-obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o
-obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o
-obj-$(CONFIG_ARCH_EDB7211)  += edb7211.o
-obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o
-obj-$(CONFIG_ARCH_P720T)    += p720t.o
+obj-$(CONFIG_ARCH_AUTCPU12)    += board-autcpu12.o
+obj-$(CONFIG_ARCH_CDB89712)    += board-cdb89712.o
+obj-$(CONFIG_ARCH_CLEP7312)    += board-clep7312.o
+obj-$(CONFIG_ARCH_EDB7211)     += board-edb7211.o
+obj-$(CONFIG_ARCH_FORTUNET)    += board-fortunet.o
+obj-$(CONFIG_ARCH_P720T)       += board-p720t.o
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c
deleted file mode 100644 (file)
index 3fbf43f..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/autcpu12.c
- *
- * (c) 2001 Thomas Gleixner, autronix automation <gleixner@autronix.de>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand-gpio.h>
-#include <linux/platform_device.h>
-#include <linux/basic_mmio_gpio.h>
-
-#include <mach/hardware.h>
-#include <asm/sizes.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-
-#include <asm/mach/map.h>
-#include <mach/autcpu12.h>
-
-#include "common.h"
-
-#define AUTCPU12_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
-#define AUTCPU12_CS8900_IRQ    (IRQ_EINT3)
-
-#define AUTCPU12_SMC_BASE      (CS1_PHYS_BASE + 0x06000000)
-#define AUTCPU12_SMC_SEL_BASE  (AUTCPU12_SMC_BASE + 0x10)
-
-#define AUTCPU12_MMGPIO_BASE   (CLPS711X_NR_GPIO)
-#define AUTCPU12_SMC_NCE       (AUTCPU12_MMGPIO_BASE + 0) /* Bit 0 */
-#define AUTCPU12_SMC_RDY       CLPS711X_GPIO(1, 2)
-#define AUTCPU12_SMC_ALE       CLPS711X_GPIO(1, 3)
-#define AUTCPU12_SMC_CLE       CLPS711X_GPIO(1, 3)
-
-static struct resource autcpu12_cs8900_resource[] __initdata = {
-       DEFINE_RES_MEM(AUTCPU12_CS8900_BASE, SZ_1K),
-       DEFINE_RES_IRQ(AUTCPU12_CS8900_IRQ),
-};
-
-static struct resource autcpu12_nvram_resource[] __initdata = {
-       DEFINE_RES_MEM_NAMED(AUTCPU12_PHYS_NVRAM, SZ_128K, "SRAM"),
-};
-
-static struct platform_device autcpu12_nvram_pdev __initdata = {
-       .name           = "autcpu12_nvram",
-       .id             = -1,
-       .resource       = autcpu12_nvram_resource,
-       .num_resources  = ARRAY_SIZE(autcpu12_nvram_resource),
-};
-
-static struct resource autcpu12_nand_resource[] __initdata = {
-       DEFINE_RES_MEM(AUTCPU12_SMC_BASE, SZ_16),
-};
-
-static struct mtd_partition autcpu12_nand_parts[] __initdata = {
-       {
-               .name   = "Flash partition 1",
-               .offset = 0,
-               .size   = SZ_8M,
-       },
-       {
-               .name   = "Flash partition 2",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static void __init autcpu12_adjust_parts(struct gpio_nand_platdata *pdata,
-                                        size_t sz)
-{
-       switch (sz) {
-       case SZ_16M:
-       case SZ_32M:
-               break;
-       case SZ_64M:
-       case SZ_128M:
-               pdata->parts[0].size = SZ_16M;
-               break;
-       default:
-               pr_warn("Unsupported SmartMedia device size %u\n", sz);
-               break;
-       }
-}
-
-static struct gpio_nand_platdata autcpu12_nand_pdata __initdata = {
-       .gpio_rdy       = AUTCPU12_SMC_RDY,
-       .gpio_nce       = AUTCPU12_SMC_NCE,
-       .gpio_ale       = AUTCPU12_SMC_ALE,
-       .gpio_cle       = AUTCPU12_SMC_CLE,
-       .gpio_nwp       = -1,
-       .chip_delay     = 20,
-       .parts          = autcpu12_nand_parts,
-       .num_parts      = ARRAY_SIZE(autcpu12_nand_parts),
-       .adjust_parts   = autcpu12_adjust_parts,
-};
-
-static struct platform_device autcpu12_nand_pdev __initdata = {
-       .name           = "gpio-nand",
-       .id             = -1,
-       .resource       = autcpu12_nand_resource,
-       .num_resources  = ARRAY_SIZE(autcpu12_nand_resource),
-       .dev            = {
-               .platform_data = &autcpu12_nand_pdata,
-       },
-};
-
-static struct resource autcpu12_mmgpio_resource[] __initdata = {
-       DEFINE_RES_MEM_NAMED(AUTCPU12_SMC_SEL_BASE, SZ_1, "dat"),
-};
-
-static struct bgpio_pdata autcpu12_mmgpio_pdata __initdata = {
-       .base   = AUTCPU12_MMGPIO_BASE,
-       .ngpio  = 8,
-};
-
-static struct platform_device autcpu12_mmgpio_pdev __initdata = {
-       .name           = "basic-mmio-gpio",
-       .id             = -1,
-       .resource       = autcpu12_mmgpio_resource,
-       .num_resources  = ARRAY_SIZE(autcpu12_mmgpio_resource),
-       .dev            = {
-               .platform_data = &autcpu12_mmgpio_pdata,
-       },
-};
-
-static void __init autcpu12_init(void)
-{
-       platform_device_register_simple("video-clps711x", 0, NULL, 0);
-       platform_device_register_simple("cs89x0", 0, autcpu12_cs8900_resource,
-                                       ARRAY_SIZE(autcpu12_cs8900_resource));
-       platform_device_register(&autcpu12_mmgpio_pdev);
-       platform_device_register(&autcpu12_nvram_pdev);
-}
-
-static void __init autcpu12_init_late(void)
-{
-       if (IS_ENABLED(MTD_NAND_GPIO) && IS_ENABLED(GPIO_GENERIC_PLATFORM)) {
-               /* We are need both drivers to handle NAND */
-               platform_device_register(&autcpu12_nand_pdev);
-       }
-}
-
-MACHINE_START(AUTCPU12, "autronix autcpu12")
-       /* Maintainer: Thomas Gleixner */
-       .atag_offset    = 0x20000,
-       .nr_irqs        = CLPS711X_NR_IRQS,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .timer          = &clps711x_timer,
-       .init_machine   = autcpu12_init,
-       .init_late      = autcpu12_init_late,
-       .handle_irq     = clps711x_handle_irq,
-       .restart        = clps711x_restart,
-MACHINE_END
-
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
new file mode 100644 (file)
index 0000000..3fbf43f
--- /dev/null
@@ -0,0 +1,179 @@
+/*
+ *  linux/arch/arm/mach-clps711x/autcpu12.c
+ *
+ * (c) 2001 Thomas Gleixner, autronix automation <gleixner@autronix.de>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/nand-gpio.h>
+#include <linux/platform_device.h>
+#include <linux/basic_mmio_gpio.h>
+
+#include <mach/hardware.h>
+#include <asm/sizes.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+
+#include <asm/mach/map.h>
+#include <mach/autcpu12.h>
+
+#include "common.h"
+
+#define AUTCPU12_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
+#define AUTCPU12_CS8900_IRQ    (IRQ_EINT3)
+
+#define AUTCPU12_SMC_BASE      (CS1_PHYS_BASE + 0x06000000)
+#define AUTCPU12_SMC_SEL_BASE  (AUTCPU12_SMC_BASE + 0x10)
+
+#define AUTCPU12_MMGPIO_BASE   (CLPS711X_NR_GPIO)
+#define AUTCPU12_SMC_NCE       (AUTCPU12_MMGPIO_BASE + 0) /* Bit 0 */
+#define AUTCPU12_SMC_RDY       CLPS711X_GPIO(1, 2)
+#define AUTCPU12_SMC_ALE       CLPS711X_GPIO(1, 3)
+#define AUTCPU12_SMC_CLE       CLPS711X_GPIO(1, 3)
+
+static struct resource autcpu12_cs8900_resource[] __initdata = {
+       DEFINE_RES_MEM(AUTCPU12_CS8900_BASE, SZ_1K),
+       DEFINE_RES_IRQ(AUTCPU12_CS8900_IRQ),
+};
+
+static struct resource autcpu12_nvram_resource[] __initdata = {
+       DEFINE_RES_MEM_NAMED(AUTCPU12_PHYS_NVRAM, SZ_128K, "SRAM"),
+};
+
+static struct platform_device autcpu12_nvram_pdev __initdata = {
+       .name           = "autcpu12_nvram",
+       .id             = -1,
+       .resource       = autcpu12_nvram_resource,
+       .num_resources  = ARRAY_SIZE(autcpu12_nvram_resource),
+};
+
+static struct resource autcpu12_nand_resource[] __initdata = {
+       DEFINE_RES_MEM(AUTCPU12_SMC_BASE, SZ_16),
+};
+
+static struct mtd_partition autcpu12_nand_parts[] __initdata = {
+       {
+               .name   = "Flash partition 1",
+               .offset = 0,
+               .size   = SZ_8M,
+       },
+       {
+               .name   = "Flash partition 2",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = MTDPART_SIZ_FULL,
+       },
+};
+
+static void __init autcpu12_adjust_parts(struct gpio_nand_platdata *pdata,
+                                        size_t sz)
+{
+       switch (sz) {
+       case SZ_16M:
+       case SZ_32M:
+               break;
+       case SZ_64M:
+       case SZ_128M:
+               pdata->parts[0].size = SZ_16M;
+               break;
+       default:
+               pr_warn("Unsupported SmartMedia device size %u\n", sz);
+               break;
+       }
+}
+
+static struct gpio_nand_platdata autcpu12_nand_pdata __initdata = {
+       .gpio_rdy       = AUTCPU12_SMC_RDY,
+       .gpio_nce       = AUTCPU12_SMC_NCE,
+       .gpio_ale       = AUTCPU12_SMC_ALE,
+       .gpio_cle       = AUTCPU12_SMC_CLE,
+       .gpio_nwp       = -1,
+       .chip_delay     = 20,
+       .parts          = autcpu12_nand_parts,
+       .num_parts      = ARRAY_SIZE(autcpu12_nand_parts),
+       .adjust_parts   = autcpu12_adjust_parts,
+};
+
+static struct platform_device autcpu12_nand_pdev __initdata = {
+       .name           = "gpio-nand",
+       .id             = -1,
+       .resource       = autcpu12_nand_resource,
+       .num_resources  = ARRAY_SIZE(autcpu12_nand_resource),
+       .dev            = {
+               .platform_data = &autcpu12_nand_pdata,
+       },
+};
+
+static struct resource autcpu12_mmgpio_resource[] __initdata = {
+       DEFINE_RES_MEM_NAMED(AUTCPU12_SMC_SEL_BASE, SZ_1, "dat"),
+};
+
+static struct bgpio_pdata autcpu12_mmgpio_pdata __initdata = {
+       .base   = AUTCPU12_MMGPIO_BASE,
+       .ngpio  = 8,
+};
+
+static struct platform_device autcpu12_mmgpio_pdev __initdata = {
+       .name           = "basic-mmio-gpio",
+       .id             = -1,
+       .resource       = autcpu12_mmgpio_resource,
+       .num_resources  = ARRAY_SIZE(autcpu12_mmgpio_resource),
+       .dev            = {
+               .platform_data = &autcpu12_mmgpio_pdata,
+       },
+};
+
+static void __init autcpu12_init(void)
+{
+       platform_device_register_simple("video-clps711x", 0, NULL, 0);
+       platform_device_register_simple("cs89x0", 0, autcpu12_cs8900_resource,
+                                       ARRAY_SIZE(autcpu12_cs8900_resource));
+       platform_device_register(&autcpu12_mmgpio_pdev);
+       platform_device_register(&autcpu12_nvram_pdev);
+}
+
+static void __init autcpu12_init_late(void)
+{
+       if (IS_ENABLED(MTD_NAND_GPIO) && IS_ENABLED(GPIO_GENERIC_PLATFORM)) {
+               /* We are need both drivers to handle NAND */
+               platform_device_register(&autcpu12_nand_pdev);
+       }
+}
+
+MACHINE_START(AUTCPU12, "autronix autcpu12")
+       /* Maintainer: Thomas Gleixner */
+       .atag_offset    = 0x20000,
+       .nr_irqs        = CLPS711X_NR_IRQS,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
+       .timer          = &clps711x_timer,
+       .init_machine   = autcpu12_init,
+       .init_late      = autcpu12_init_late,
+       .handle_irq     = clps711x_handle_irq,
+       .restart        = clps711x_restart,
+MACHINE_END
+
diff --git a/arch/arm/mach-clps711x/board-cdb89712.c b/arch/arm/mach-clps711x/board-cdb89712.c
new file mode 100644 (file)
index 0000000..60900dd
--- /dev/null
@@ -0,0 +1,147 @@
+/*
+ *  linux/arch/arm/mach-clps711x/cdb89712.c
+ *
+ *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/plat-ram.h>
+#include <linux/mtd/partitions.h>
+
+#include <mach/hardware.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include "common.h"
+
+#define CDB89712_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
+#define CDB89712_CS8900_IRQ    (IRQ_EINT3)
+
+static struct resource cdb89712_cs8900_resource[] __initdata = {
+       DEFINE_RES_MEM(CDB89712_CS8900_BASE, SZ_1K),
+       DEFINE_RES_IRQ(CDB89712_CS8900_IRQ),
+};
+
+static struct mtd_partition cdb89712_flash_partitions[] __initdata = {
+       {
+               .name   = "Flash",
+               .offset = 0,
+               .size   = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct physmap_flash_data cdb89712_flash_pdata __initdata = {
+       .width          = 4,
+       .probe_type     = "map_rom",
+       .parts          = cdb89712_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(cdb89712_flash_partitions),
+};
+
+static struct resource cdb89712_flash_resources[] __initdata = {
+       DEFINE_RES_MEM(CS0_PHYS_BASE, SZ_8M),
+};
+
+static struct platform_device cdb89712_flash_pdev __initdata = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .resource       = cdb89712_flash_resources,
+       .num_resources  = ARRAY_SIZE(cdb89712_flash_resources),
+       .dev    = {
+               .platform_data  = &cdb89712_flash_pdata,
+       },
+};
+
+static struct mtd_partition cdb89712_bootrom_partitions[] __initdata = {
+       {
+               .name   = "BootROM",
+               .offset = 0,
+               .size   = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct physmap_flash_data cdb89712_bootrom_pdata __initdata = {
+       .width          = 4,
+       .probe_type     = "map_rom",
+       .parts          = cdb89712_bootrom_partitions,
+       .nr_parts       = ARRAY_SIZE(cdb89712_bootrom_partitions),
+};
+
+static struct resource cdb89712_bootrom_resources[] __initdata = {
+       DEFINE_RES_NAMED(CS7_PHYS_BASE, SZ_128, "BOOTROM", IORESOURCE_MEM |
+                        IORESOURCE_CACHEABLE | IORESOURCE_READONLY),
+};
+
+static struct platform_device cdb89712_bootrom_pdev __initdata = {
+       .name           = "physmap-flash",
+       .id             = 1,
+       .resource       = cdb89712_bootrom_resources,
+       .num_resources  = ARRAY_SIZE(cdb89712_bootrom_resources),
+       .dev    = {
+               .platform_data  = &cdb89712_bootrom_pdata,
+       },
+};
+
+static struct platdata_mtd_ram cdb89712_sram_pdata __initdata = {
+       .bankwidth      = 4,
+};
+
+static struct resource cdb89712_sram_resources[] __initdata = {
+       DEFINE_RES_MEM(CLPS711X_SRAM_BASE, CLPS711X_SRAM_SIZE),
+};
+
+static struct platform_device cdb89712_sram_pdev __initdata = {
+       .name           = "mtd-ram",
+       .id             = 0,
+       .resource       = cdb89712_sram_resources,
+       .num_resources  = ARRAY_SIZE(cdb89712_sram_resources),
+       .dev    = {
+               .platform_data  = &cdb89712_sram_pdata,
+       },
+};
+
+static void __init cdb89712_init(void)
+{
+       platform_device_register(&cdb89712_flash_pdev);
+       platform_device_register(&cdb89712_bootrom_pdev);
+       platform_device_register(&cdb89712_sram_pdev);
+       platform_device_register_simple("cs89x0", 0, cdb89712_cs8900_resource,
+                                       ARRAY_SIZE(cdb89712_cs8900_resource));
+}
+
+MACHINE_START(CDB89712, "Cirrus-CDB89712")
+       /* Maintainer: Ray Lehtiniemi */
+       .atag_offset    = 0x100,
+       .nr_irqs        = CLPS711X_NR_IRQS,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
+       .timer          = &clps711x_timer,
+       .init_machine   = cdb89712_init,
+       .handle_irq     = clps711x_handle_irq,
+       .restart        = clps711x_restart,
+MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-clep7312.c b/arch/arm/mach-clps711x/board-clep7312.c
new file mode 100644 (file)
index 0000000..0b32a48
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ *  linux/arch/arm/mach-clps711x/clep7312.c
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/string.h>
+
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include "common.h"
+
+static void __init
+fixup_clep7312(struct tag *tags, char **cmdline, struct meminfo *mi)
+{
+       mi->nr_banks=1;
+       mi->bank[0].start = 0xc0000000;
+       mi->bank[0].size = 0x01000000;
+}
+
+MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
+       /* Maintainer: Nobody */
+       .atag_offset    = 0x0100,
+       .nr_irqs        = CLPS711X_NR_IRQS,
+       .fixup          = fixup_clep7312,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
+       .timer          = &clps711x_timer,
+       .handle_irq     = clps711x_handle_irq,
+       .restart        = clps711x_restart,
+MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
new file mode 100644 (file)
index 0000000..71aa5cf
--- /dev/null
@@ -0,0 +1,180 @@
+/*
+ *  Copyright (C) 2000, 2001 Blue Mug, Inc.  All Rights Reserved.
+ *
+ * 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/init.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/memblock.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/backlight.h>
+#include <linux/platform_device.h>
+
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/setup.h>
+#include <asm/mach/map.h>
+#include <asm/mach/arch.h>
+#include <asm/mach-types.h>
+
+#include <video/platform_lcd.h>
+
+#include <mach/hardware.h>
+
+#include "common.h"
+
+#define VIDEORAM_SIZE          SZ_128K
+
+#define EDB7211_LCD_DC_DC_EN   CLPS711X_GPIO(3, 1)
+#define EDB7211_LCDEN          CLPS711X_GPIO(3, 2)
+#define EDB7211_LCDBL          CLPS711X_GPIO(3, 3)
+
+#define EDB7211_FLASH0_BASE    (CS0_PHYS_BASE)
+#define EDB7211_FLASH1_BASE    (CS1_PHYS_BASE)
+#define EDB7211_CS8900_BASE    (CS2_PHYS_BASE + 0x300)
+#define EDB7211_CS8900_IRQ     (IRQ_EINT3)
+
+static struct resource edb7211_cs8900_resource[] __initdata = {
+       DEFINE_RES_MEM(EDB7211_CS8900_BASE, SZ_1K),
+       DEFINE_RES_IRQ(EDB7211_CS8900_IRQ),
+};
+
+static struct mtd_partition edb7211_flash_partitions[] __initdata = {
+       {
+               .name   = "Flash",
+               .offset = 0,
+               .size   = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct physmap_flash_data edb7211_flash_pdata __initdata = {
+       .width          = 4,
+       .parts          = edb7211_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(edb7211_flash_partitions),
+};
+
+static struct resource edb7211_flash_resources[] __initdata = {
+       DEFINE_RES_MEM(EDB7211_FLASH0_BASE, SZ_8M),
+       DEFINE_RES_MEM(EDB7211_FLASH1_BASE, SZ_8M),
+};
+
+static struct platform_device edb7211_flash_pdev __initdata = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .resource       = edb7211_flash_resources,
+       .num_resources  = ARRAY_SIZE(edb7211_flash_resources),
+       .dev    = {
+               .platform_data  = &edb7211_flash_pdata,
+       },
+};
+
+static void edb7211_lcd_power_set(struct plat_lcd_data *pd, unsigned int power)
+{
+       if (power) {
+               gpio_set_value(EDB7211_LCDEN, 1);
+               udelay(100);
+               gpio_set_value(EDB7211_LCD_DC_DC_EN, 1);
+       } else {
+               gpio_set_value(EDB7211_LCD_DC_DC_EN, 0);
+               udelay(100);
+               gpio_set_value(EDB7211_LCDEN, 0);
+       }
+}
+
+static struct plat_lcd_data edb7211_lcd_power_pdata = {
+       .set_power      = edb7211_lcd_power_set,
+};
+
+static void edb7211_lcd_backlight_set_intensity(int intensity)
+{
+       gpio_set_value(EDB7211_LCDBL, intensity);
+}
+
+static struct generic_bl_info edb7211_lcd_backlight_pdata = {
+       .name                   = "lcd-backlight.0",
+       .default_intensity      = 0x01,
+       .max_intensity          = 0x01,
+       .set_bl_intensity       = edb7211_lcd_backlight_set_intensity,
+};
+
+static struct gpio edb7211_gpios[] __initconst = {
+       { EDB7211_LCD_DC_DC_EN, GPIOF_OUT_INIT_LOW,     "LCD DC-DC" },
+       { EDB7211_LCDEN,        GPIOF_OUT_INIT_LOW,     "LCD POWER" },
+       { EDB7211_LCDBL,        GPIOF_OUT_INIT_LOW,     "LCD BACKLIGHT" },
+};
+
+static struct map_desc edb7211_io_desc[] __initdata = {
+       {       /* Memory-mapped extra keyboard row */
+               .virtual        = IO_ADDRESS(EP7211_PHYS_EXTKBD),
+               .pfn            = __phys_to_pfn(EP7211_PHYS_EXTKBD),
+               .length         = SZ_1M,
+               .type           = MT_DEVICE,
+       },
+};
+
+void __init edb7211_map_io(void)
+{
+       clps711x_map_io();
+       iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc));
+}
+
+/* Reserve screen memory region at the start of main system memory. */
+static void __init edb7211_reserve(void)
+{
+       memblock_reserve(PHYS_OFFSET, VIDEORAM_SIZE);
+}
+
+static void __init
+fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
+{
+       /*
+        * Bank start addresses are not present in the information
+        * passed in from the boot loader.  We could potentially
+        * detect them, but instead we hard-code them.
+        *
+        * Banks sizes _are_ present in the param block, but we're
+        * not using that information yet.
+        */
+       mi->bank[0].start = 0xc0000000;
+       mi->bank[0].size = SZ_8M;
+       mi->bank[1].start = 0xc1000000;
+       mi->bank[1].size = SZ_8M;
+       mi->nr_banks = 2;
+}
+
+static void __init edb7211_init(void)
+{
+       gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
+
+       platform_device_register(&edb7211_flash_pdev);
+       platform_device_register_data(&platform_bus, "platform-lcd", 0,
+                                     &edb7211_lcd_power_pdata,
+                                     sizeof(edb7211_lcd_power_pdata));
+       platform_device_register_data(&platform_bus, "generic-bl", 0,
+                                     &edb7211_lcd_backlight_pdata,
+                                     sizeof(edb7211_lcd_backlight_pdata));
+       platform_device_register_simple("video-clps711x", 0, NULL, 0);
+       platform_device_register_simple("cs89x0", 0, edb7211_cs8900_resource,
+                                       ARRAY_SIZE(edb7211_cs8900_resource));
+}
+
+MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
+       /* Maintainer: Jon McClintock */
+       .atag_offset    = VIDEORAM_SIZE + 0x100,
+       .nr_irqs        = CLPS711X_NR_IRQS,
+       .fixup          = fixup_edb7211,
+       .reserve        = edb7211_reserve,
+       .map_io         = edb7211_map_io,
+       .init_irq       = clps711x_init_irq,
+       .timer          = &clps711x_timer,
+       .init_machine   = edb7211_init,
+       .handle_irq     = clps711x_handle_irq,
+       .restart        = clps711x_restart,
+MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-fortunet.c b/arch/arm/mach-clps711x/board-fortunet.c
new file mode 100644 (file)
index 0000000..7d01255
--- /dev/null
@@ -0,0 +1,84 @@
+/*
+ *  linux/arch/arm/mach-clps711x/fortunet.c
+ *
+ *  Derived from linux/arch/arm/mach-integrator/arch.c
+ *
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/initrd.h>
+
+#include <mach/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+
+#include <asm/mach/arch.h>
+
+#include <asm/memory.h>
+
+#include "common.h"
+
+struct meminfo memmap = {
+       .nr_banks       = 1,
+       .bank           = {
+               {
+                       .start  = 0xC0000000,
+                       .size   = 0x01000000,
+               },
+       },
+};
+
+typedef struct tag_IMAGE_PARAMS
+{
+       int     ramdisk_ok;
+       int     ramdisk_address;
+       int     ramdisk_size;
+       int     ram_size;
+       int     extra_param_type;
+       int     extra_param_ptr;
+       int     command_line;
+} IMAGE_PARAMS;
+
+#define IMAGE_PARAMS_PHYS      0xC01F0000
+
+static void __init
+fortunet_fixup(struct tag *tags, char **cmdline, struct meminfo *mi)
+{
+       IMAGE_PARAMS *ip = phys_to_virt(IMAGE_PARAMS_PHYS);
+       *cmdline = phys_to_virt(ip->command_line);
+#ifdef CONFIG_BLK_DEV_INITRD
+       if(ip->ramdisk_ok)
+       {
+               initrd_start = __phys_to_virt(ip->ramdisk_address);
+               initrd_end = initrd_start + ip->ramdisk_size;
+       }
+#endif
+       memmap.bank[0].size = ip->ram_size;
+       *mi = memmap;
+}
+
+MACHINE_START(FORTUNET, "ARM-FortuNet")
+       /* Maintainer: FortuNet Inc. */
+       .nr_irqs        = CLPS711X_NR_IRQS,
+       .fixup          = fortunet_fixup,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
+       .timer          = &clps711x_timer,
+       .handle_irq     = clps711x_handle_irq,
+       .restart        = clps711x_restart,
+MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c
new file mode 100644 (file)
index 0000000..1518fc8
--- /dev/null
@@ -0,0 +1,232 @@
+/*
+ *  linux/arch/arm/mach-clps711x/p720t.c
+ *
+ *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
+#include <linux/sizes.h>
+#include <linux/backlight.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/nand-gpio.h>
+
+#include <mach/hardware.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/syspld.h>
+
+#include <video/platform_lcd.h>
+
+#include "common.h"
+
+#define P720T_USERLED          CLPS711X_GPIO(3, 0)
+#define P720T_NAND_CLE         CLPS711X_GPIO(4, 0)
+#define P720T_NAND_ALE         CLPS711X_GPIO(4, 1)
+#define P720T_NAND_NCE         CLPS711X_GPIO(4, 2)
+
+#define P720T_NAND_BASE                (CLPS711X_SDRAM1_BASE)
+
+static struct resource p720t_nand_resource[] __initdata = {
+       DEFINE_RES_MEM(P720T_NAND_BASE, SZ_4),
+};
+
+static struct mtd_partition p720t_nand_parts[] __initdata = {
+       {
+               .name   = "Flash partition 1",
+               .offset = 0,
+               .size   = SZ_2M,
+       },
+       {
+               .name   = "Flash partition 2",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct gpio_nand_platdata p720t_nand_pdata __initdata = {
+       .gpio_rdy       = -1,
+       .gpio_nce       = P720T_NAND_NCE,
+       .gpio_ale       = P720T_NAND_ALE,
+       .gpio_cle       = P720T_NAND_CLE,
+       .gpio_nwp       = -1,
+       .chip_delay     = 15,
+       .parts          = p720t_nand_parts,
+       .num_parts      = ARRAY_SIZE(p720t_nand_parts),
+};
+
+static struct platform_device p720t_nand_pdev __initdata = {
+       .name           = "gpio-nand",
+       .id             = -1,
+       .resource       = p720t_nand_resource,
+       .num_resources  = ARRAY_SIZE(p720t_nand_resource),
+       .dev            = {
+               .platform_data = &p720t_nand_pdata,
+       },
+};
+
+static void p720t_lcd_power_set(struct plat_lcd_data *pd, unsigned int power)
+{
+       if (power) {
+               PLD_LCDEN = PLD_LCDEN_EN;
+               PLD_PWR |= PLD_S4_ON | PLD_S2_ON | PLD_S1_ON;
+       } else {
+               PLD_PWR &= ~(PLD_S4_ON | PLD_S2_ON | PLD_S1_ON);
+               PLD_LCDEN = 0;
+       }
+}
+
+static struct plat_lcd_data p720t_lcd_power_pdata = {
+       .set_power      = p720t_lcd_power_set,
+};
+
+static void p720t_lcd_backlight_set_intensity(int intensity)
+{
+       if (intensity)
+               PLD_PWR |= PLD_S3_ON;
+       else
+               PLD_PWR = 0;
+}
+
+static struct generic_bl_info p720t_lcd_backlight_pdata = {
+       .name                   = "lcd-backlight.0",
+       .default_intensity      = 0x01,
+       .max_intensity          = 0x01,
+       .set_bl_intensity       = p720t_lcd_backlight_set_intensity,
+};
+
+/*
+ * Map the P720T system PLD. It occupies two address spaces:
+ * 0x10000000 and 0x10400000. We map both regions as one.
+ */
+static struct map_desc p720t_io_desc[] __initdata = {
+       {
+               .virtual        = SYSPLD_VIRT_BASE,
+               .pfn            = __phys_to_pfn(SYSPLD_PHYS_BASE),
+               .length         = SZ_8M,
+               .type           = MT_DEVICE,
+       },
+};
+
+static void __init
+fixup_p720t(struct tag *tag, char **cmdline, struct meminfo *mi)
+{
+       /*
+        * Our bootloader doesn't setup any tags (yet).
+        */
+       if (tag->hdr.tag != ATAG_CORE) {
+               tag->hdr.tag = ATAG_CORE;
+               tag->hdr.size = tag_size(tag_core);
+               tag->u.core.flags = 0;
+               tag->u.core.pagesize = PAGE_SIZE;
+               tag->u.core.rootdev = 0x0100;
+
+               tag = tag_next(tag);
+               tag->hdr.tag = ATAG_MEM;
+               tag->hdr.size = tag_size(tag_mem32);
+               tag->u.mem.size = 4096;
+               tag->u.mem.start = PHYS_OFFSET;
+
+               tag = tag_next(tag);
+               tag->hdr.tag = ATAG_NONE;
+               tag->hdr.size = 0;
+       }
+}
+
+static void __init p720t_map_io(void)
+{
+       clps711x_map_io();
+       iotable_init(p720t_io_desc, ARRAY_SIZE(p720t_io_desc));
+}
+
+static void __init p720t_init_early(void)
+{
+       /*
+        * Power down as much as possible in case we don't
+        * have the drivers loaded.
+        */
+       PLD_LCDEN = 0;
+       PLD_PWR  &= ~(PLD_S4_ON|PLD_S3_ON|PLD_S2_ON|PLD_S1_ON);
+
+       PLD_KBD   = 0;
+       PLD_IO    = 0;
+       PLD_IRDA  = 0;
+       PLD_CODEC = 0;
+       PLD_TCH   = 0;
+       PLD_SPI   = 0;
+       if (!IS_ENABLED(CONFIG_DEBUG_LL)) {
+               PLD_COM2 = 0;
+               PLD_COM1 = 0;
+       }
+}
+
+static struct gpio_led p720t_gpio_leds[] = {
+       {
+               .name                   = "User LED",
+               .default_trigger        = "heartbeat",
+               .gpio                   = P720T_USERLED,
+       },
+};
+
+static struct gpio_led_platform_data p720t_gpio_led_pdata __initdata = {
+       .leds           = p720t_gpio_leds,
+       .num_leds       = ARRAY_SIZE(p720t_gpio_leds),
+};
+
+static void __init p720t_init(void)
+{
+       platform_device_register(&p720t_nand_pdev);
+       platform_device_register_data(&platform_bus, "platform-lcd", 0,
+                                     &p720t_lcd_power_pdata,
+                                     sizeof(p720t_lcd_power_pdata));
+       platform_device_register_data(&platform_bus, "generic-bl", 0,
+                                     &p720t_lcd_backlight_pdata,
+                                     sizeof(p720t_lcd_backlight_pdata));
+       platform_device_register_simple("video-clps711x", 0, NULL, 0);
+}
+
+static void __init p720t_init_late(void)
+{
+       platform_device_register_data(&platform_bus, "leds-gpio", 0,
+                                     &p720t_gpio_led_pdata,
+                                     sizeof(p720t_gpio_led_pdata));
+}
+
+MACHINE_START(P720T, "ARM-Prospector720T")
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .atag_offset    = 0x100,
+       .nr_irqs        = CLPS711X_NR_IRQS,
+       .fixup          = fixup_p720t,
+       .map_io         = p720t_map_io,
+       .init_early     = p720t_init_early,
+       .init_irq       = clps711x_init_irq,
+       .timer          = &clps711x_timer,
+       .init_machine   = p720t_init,
+       .init_late      = p720t_init_late,
+       .handle_irq     = clps711x_handle_irq,
+       .restart        = clps711x_restart,
+MACHINE_END
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
deleted file mode 100644 (file)
index 60900dd..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/cdb89712.c
- *
- *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/plat-ram.h>
-#include <linux/mtd/partitions.h>
-
-#include <mach/hardware.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-
-#include "common.h"
-
-#define CDB89712_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
-#define CDB89712_CS8900_IRQ    (IRQ_EINT3)
-
-static struct resource cdb89712_cs8900_resource[] __initdata = {
-       DEFINE_RES_MEM(CDB89712_CS8900_BASE, SZ_1K),
-       DEFINE_RES_IRQ(CDB89712_CS8900_IRQ),
-};
-
-static struct mtd_partition cdb89712_flash_partitions[] __initdata = {
-       {
-               .name   = "Flash",
-               .offset = 0,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data cdb89712_flash_pdata __initdata = {
-       .width          = 4,
-       .probe_type     = "map_rom",
-       .parts          = cdb89712_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(cdb89712_flash_partitions),
-};
-
-static struct resource cdb89712_flash_resources[] __initdata = {
-       DEFINE_RES_MEM(CS0_PHYS_BASE, SZ_8M),
-};
-
-static struct platform_device cdb89712_flash_pdev __initdata = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = cdb89712_flash_resources,
-       .num_resources  = ARRAY_SIZE(cdb89712_flash_resources),
-       .dev    = {
-               .platform_data  = &cdb89712_flash_pdata,
-       },
-};
-
-static struct mtd_partition cdb89712_bootrom_partitions[] __initdata = {
-       {
-               .name   = "BootROM",
-               .offset = 0,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data cdb89712_bootrom_pdata __initdata = {
-       .width          = 4,
-       .probe_type     = "map_rom",
-       .parts          = cdb89712_bootrom_partitions,
-       .nr_parts       = ARRAY_SIZE(cdb89712_bootrom_partitions),
-};
-
-static struct resource cdb89712_bootrom_resources[] __initdata = {
-       DEFINE_RES_NAMED(CS7_PHYS_BASE, SZ_128, "BOOTROM", IORESOURCE_MEM |
-                        IORESOURCE_CACHEABLE | IORESOURCE_READONLY),
-};
-
-static struct platform_device cdb89712_bootrom_pdev __initdata = {
-       .name           = "physmap-flash",
-       .id             = 1,
-       .resource       = cdb89712_bootrom_resources,
-       .num_resources  = ARRAY_SIZE(cdb89712_bootrom_resources),
-       .dev    = {
-               .platform_data  = &cdb89712_bootrom_pdata,
-       },
-};
-
-static struct platdata_mtd_ram cdb89712_sram_pdata __initdata = {
-       .bankwidth      = 4,
-};
-
-static struct resource cdb89712_sram_resources[] __initdata = {
-       DEFINE_RES_MEM(CLPS711X_SRAM_BASE, CLPS711X_SRAM_SIZE),
-};
-
-static struct platform_device cdb89712_sram_pdev __initdata = {
-       .name           = "mtd-ram",
-       .id             = 0,
-       .resource       = cdb89712_sram_resources,
-       .num_resources  = ARRAY_SIZE(cdb89712_sram_resources),
-       .dev    = {
-               .platform_data  = &cdb89712_sram_pdata,
-       },
-};
-
-static void __init cdb89712_init(void)
-{
-       platform_device_register(&cdb89712_flash_pdev);
-       platform_device_register(&cdb89712_bootrom_pdev);
-       platform_device_register(&cdb89712_sram_pdev);
-       platform_device_register_simple("cs89x0", 0, cdb89712_cs8900_resource,
-                                       ARRAY_SIZE(cdb89712_cs8900_resource));
-}
-
-MACHINE_START(CDB89712, "Cirrus-CDB89712")
-       /* Maintainer: Ray Lehtiniemi */
-       .atag_offset    = 0x100,
-       .nr_irqs        = CLPS711X_NR_IRQS,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .timer          = &clps711x_timer,
-       .init_machine   = cdb89712_init,
-       .handle_irq     = clps711x_handle_irq,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c
deleted file mode 100644 (file)
index 0b32a48..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/clep7312.c
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/string.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include "common.h"
-
-static void __init
-fixup_clep7312(struct tag *tags, char **cmdline, struct meminfo *mi)
-{
-       mi->nr_banks=1;
-       mi->bank[0].start = 0xc0000000;
-       mi->bank[0].size = 0x01000000;
-}
-
-MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-       /* Maintainer: Nobody */
-       .atag_offset    = 0x0100,
-       .nr_irqs        = CLPS711X_NR_IRQS,
-       .fixup          = fixup_clep7312,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .timer          = &clps711x_timer,
-       .handle_irq     = clps711x_handle_irq,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/edb7211.c b/arch/arm/mach-clps711x/edb7211.c
deleted file mode 100644 (file)
index 71aa5cf..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *  Copyright (C) 2000, 2001 Blue Mug, Inc.  All Rights Reserved.
- *
- * 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/init.h>
-#include <linux/gpio.h>
-#include <linux/delay.h>
-#include <linux/memblock.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/backlight.h>
-#include <linux/platform_device.h>
-
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/setup.h>
-#include <asm/mach/map.h>
-#include <asm/mach/arch.h>
-#include <asm/mach-types.h>
-
-#include <video/platform_lcd.h>
-
-#include <mach/hardware.h>
-
-#include "common.h"
-
-#define VIDEORAM_SIZE          SZ_128K
-
-#define EDB7211_LCD_DC_DC_EN   CLPS711X_GPIO(3, 1)
-#define EDB7211_LCDEN          CLPS711X_GPIO(3, 2)
-#define EDB7211_LCDBL          CLPS711X_GPIO(3, 3)
-
-#define EDB7211_FLASH0_BASE    (CS0_PHYS_BASE)
-#define EDB7211_FLASH1_BASE    (CS1_PHYS_BASE)
-#define EDB7211_CS8900_BASE    (CS2_PHYS_BASE + 0x300)
-#define EDB7211_CS8900_IRQ     (IRQ_EINT3)
-
-static struct resource edb7211_cs8900_resource[] __initdata = {
-       DEFINE_RES_MEM(EDB7211_CS8900_BASE, SZ_1K),
-       DEFINE_RES_IRQ(EDB7211_CS8900_IRQ),
-};
-
-static struct mtd_partition edb7211_flash_partitions[] __initdata = {
-       {
-               .name   = "Flash",
-               .offset = 0,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data edb7211_flash_pdata __initdata = {
-       .width          = 4,
-       .parts          = edb7211_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(edb7211_flash_partitions),
-};
-
-static struct resource edb7211_flash_resources[] __initdata = {
-       DEFINE_RES_MEM(EDB7211_FLASH0_BASE, SZ_8M),
-       DEFINE_RES_MEM(EDB7211_FLASH1_BASE, SZ_8M),
-};
-
-static struct platform_device edb7211_flash_pdev __initdata = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = edb7211_flash_resources,
-       .num_resources  = ARRAY_SIZE(edb7211_flash_resources),
-       .dev    = {
-               .platform_data  = &edb7211_flash_pdata,
-       },
-};
-
-static void edb7211_lcd_power_set(struct plat_lcd_data *pd, unsigned int power)
-{
-       if (power) {
-               gpio_set_value(EDB7211_LCDEN, 1);
-               udelay(100);
-               gpio_set_value(EDB7211_LCD_DC_DC_EN, 1);
-       } else {
-               gpio_set_value(EDB7211_LCD_DC_DC_EN, 0);
-               udelay(100);
-               gpio_set_value(EDB7211_LCDEN, 0);
-       }
-}
-
-static struct plat_lcd_data edb7211_lcd_power_pdata = {
-       .set_power      = edb7211_lcd_power_set,
-};
-
-static void edb7211_lcd_backlight_set_intensity(int intensity)
-{
-       gpio_set_value(EDB7211_LCDBL, intensity);
-}
-
-static struct generic_bl_info edb7211_lcd_backlight_pdata = {
-       .name                   = "lcd-backlight.0",
-       .default_intensity      = 0x01,
-       .max_intensity          = 0x01,
-       .set_bl_intensity       = edb7211_lcd_backlight_set_intensity,
-};
-
-static struct gpio edb7211_gpios[] __initconst = {
-       { EDB7211_LCD_DC_DC_EN, GPIOF_OUT_INIT_LOW,     "LCD DC-DC" },
-       { EDB7211_LCDEN,        GPIOF_OUT_INIT_LOW,     "LCD POWER" },
-       { EDB7211_LCDBL,        GPIOF_OUT_INIT_LOW,     "LCD BACKLIGHT" },
-};
-
-static struct map_desc edb7211_io_desc[] __initdata = {
-       {       /* Memory-mapped extra keyboard row */
-               .virtual        = IO_ADDRESS(EP7211_PHYS_EXTKBD),
-               .pfn            = __phys_to_pfn(EP7211_PHYS_EXTKBD),
-               .length         = SZ_1M,
-               .type           = MT_DEVICE,
-       },
-};
-
-void __init edb7211_map_io(void)
-{
-       clps711x_map_io();
-       iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc));
-}
-
-/* Reserve screen memory region at the start of main system memory. */
-static void __init edb7211_reserve(void)
-{
-       memblock_reserve(PHYS_OFFSET, VIDEORAM_SIZE);
-}
-
-static void __init
-fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
-{
-       /*
-        * Bank start addresses are not present in the information
-        * passed in from the boot loader.  We could potentially
-        * detect them, but instead we hard-code them.
-        *
-        * Banks sizes _are_ present in the param block, but we're
-        * not using that information yet.
-        */
-       mi->bank[0].start = 0xc0000000;
-       mi->bank[0].size = SZ_8M;
-       mi->bank[1].start = 0xc1000000;
-       mi->bank[1].size = SZ_8M;
-       mi->nr_banks = 2;
-}
-
-static void __init edb7211_init(void)
-{
-       gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
-
-       platform_device_register(&edb7211_flash_pdev);
-       platform_device_register_data(&platform_bus, "platform-lcd", 0,
-                                     &edb7211_lcd_power_pdata,
-                                     sizeof(edb7211_lcd_power_pdata));
-       platform_device_register_data(&platform_bus, "generic-bl", 0,
-                                     &edb7211_lcd_backlight_pdata,
-                                     sizeof(edb7211_lcd_backlight_pdata));
-       platform_device_register_simple("video-clps711x", 0, NULL, 0);
-       platform_device_register_simple("cs89x0", 0, edb7211_cs8900_resource,
-                                       ARRAY_SIZE(edb7211_cs8900_resource));
-}
-
-MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
-       /* Maintainer: Jon McClintock */
-       .atag_offset    = VIDEORAM_SIZE + 0x100,
-       .nr_irqs        = CLPS711X_NR_IRQS,
-       .fixup          = fixup_edb7211,
-       .reserve        = edb7211_reserve,
-       .map_io         = edb7211_map_io,
-       .init_irq       = clps711x_init_irq,
-       .timer          = &clps711x_timer,
-       .init_machine   = edb7211_init,
-       .handle_irq     = clps711x_handle_irq,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
deleted file mode 100644 (file)
index 7d01255..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/fortunet.c
- *
- *  Derived from linux/arch/arm/mach-integrator/arch.c
- *
- *  Copyright (C) 2000 Deep Blue Solutions Ltd
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/initrd.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <asm/mach/arch.h>
-
-#include <asm/memory.h>
-
-#include "common.h"
-
-struct meminfo memmap = {
-       .nr_banks       = 1,
-       .bank           = {
-               {
-                       .start  = 0xC0000000,
-                       .size   = 0x01000000,
-               },
-       },
-};
-
-typedef struct tag_IMAGE_PARAMS
-{
-       int     ramdisk_ok;
-       int     ramdisk_address;
-       int     ramdisk_size;
-       int     ram_size;
-       int     extra_param_type;
-       int     extra_param_ptr;
-       int     command_line;
-} IMAGE_PARAMS;
-
-#define IMAGE_PARAMS_PHYS      0xC01F0000
-
-static void __init
-fortunet_fixup(struct tag *tags, char **cmdline, struct meminfo *mi)
-{
-       IMAGE_PARAMS *ip = phys_to_virt(IMAGE_PARAMS_PHYS);
-       *cmdline = phys_to_virt(ip->command_line);
-#ifdef CONFIG_BLK_DEV_INITRD
-       if(ip->ramdisk_ok)
-       {
-               initrd_start = __phys_to_virt(ip->ramdisk_address);
-               initrd_end = initrd_start + ip->ramdisk_size;
-       }
-#endif
-       memmap.bank[0].size = ip->ram_size;
-       *mi = memmap;
-}
-
-MACHINE_START(FORTUNET, "ARM-FortuNet")
-       /* Maintainer: FortuNet Inc. */
-       .nr_irqs        = CLPS711X_NR_IRQS,
-       .fixup          = fortunet_fixup,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .timer          = &clps711x_timer,
-       .handle_irq     = clps711x_handle_irq,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c
deleted file mode 100644 (file)
index 1518fc8..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/p720t.c
- *
- *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <linux/leds.h>
-#include <linux/sizes.h>
-#include <linux/backlight.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand-gpio.h>
-
-#include <mach/hardware.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <mach/syspld.h>
-
-#include <video/platform_lcd.h>
-
-#include "common.h"
-
-#define P720T_USERLED          CLPS711X_GPIO(3, 0)
-#define P720T_NAND_CLE         CLPS711X_GPIO(4, 0)
-#define P720T_NAND_ALE         CLPS711X_GPIO(4, 1)
-#define P720T_NAND_NCE         CLPS711X_GPIO(4, 2)
-
-#define P720T_NAND_BASE                (CLPS711X_SDRAM1_BASE)
-
-static struct resource p720t_nand_resource[] __initdata = {
-       DEFINE_RES_MEM(P720T_NAND_BASE, SZ_4),
-};
-
-static struct mtd_partition p720t_nand_parts[] __initdata = {
-       {
-               .name   = "Flash partition 1",
-               .offset = 0,
-               .size   = SZ_2M,
-       },
-       {
-               .name   = "Flash partition 2",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct gpio_nand_platdata p720t_nand_pdata __initdata = {
-       .gpio_rdy       = -1,
-       .gpio_nce       = P720T_NAND_NCE,
-       .gpio_ale       = P720T_NAND_ALE,
-       .gpio_cle       = P720T_NAND_CLE,
-       .gpio_nwp       = -1,
-       .chip_delay     = 15,
-       .parts          = p720t_nand_parts,
-       .num_parts      = ARRAY_SIZE(p720t_nand_parts),
-};
-
-static struct platform_device p720t_nand_pdev __initdata = {
-       .name           = "gpio-nand",
-       .id             = -1,
-       .resource       = p720t_nand_resource,
-       .num_resources  = ARRAY_SIZE(p720t_nand_resource),
-       .dev            = {
-               .platform_data = &p720t_nand_pdata,
-       },
-};
-
-static void p720t_lcd_power_set(struct plat_lcd_data *pd, unsigned int power)
-{
-       if (power) {
-               PLD_LCDEN = PLD_LCDEN_EN;
-               PLD_PWR |= PLD_S4_ON | PLD_S2_ON | PLD_S1_ON;
-       } else {
-               PLD_PWR &= ~(PLD_S4_ON | PLD_S2_ON | PLD_S1_ON);
-               PLD_LCDEN = 0;
-       }
-}
-
-static struct plat_lcd_data p720t_lcd_power_pdata = {
-       .set_power      = p720t_lcd_power_set,
-};
-
-static void p720t_lcd_backlight_set_intensity(int intensity)
-{
-       if (intensity)
-               PLD_PWR |= PLD_S3_ON;
-       else
-               PLD_PWR = 0;
-}
-
-static struct generic_bl_info p720t_lcd_backlight_pdata = {
-       .name                   = "lcd-backlight.0",
-       .default_intensity      = 0x01,
-       .max_intensity          = 0x01,
-       .set_bl_intensity       = p720t_lcd_backlight_set_intensity,
-};
-
-/*
- * Map the P720T system PLD. It occupies two address spaces:
- * 0x10000000 and 0x10400000. We map both regions as one.
- */
-static struct map_desc p720t_io_desc[] __initdata = {
-       {
-               .virtual        = SYSPLD_VIRT_BASE,
-               .pfn            = __phys_to_pfn(SYSPLD_PHYS_BASE),
-               .length         = SZ_8M,
-               .type           = MT_DEVICE,
-       },
-};
-
-static void __init
-fixup_p720t(struct tag *tag, char **cmdline, struct meminfo *mi)
-{
-       /*
-        * Our bootloader doesn't setup any tags (yet).
-        */
-       if (tag->hdr.tag != ATAG_CORE) {
-               tag->hdr.tag = ATAG_CORE;
-               tag->hdr.size = tag_size(tag_core);
-               tag->u.core.flags = 0;
-               tag->u.core.pagesize = PAGE_SIZE;
-               tag->u.core.rootdev = 0x0100;
-
-               tag = tag_next(tag);
-               tag->hdr.tag = ATAG_MEM;
-               tag->hdr.size = tag_size(tag_mem32);
-               tag->u.mem.size = 4096;
-               tag->u.mem.start = PHYS_OFFSET;
-
-               tag = tag_next(tag);
-               tag->hdr.tag = ATAG_NONE;
-               tag->hdr.size = 0;
-       }
-}
-
-static void __init p720t_map_io(void)
-{
-       clps711x_map_io();
-       iotable_init(p720t_io_desc, ARRAY_SIZE(p720t_io_desc));
-}
-
-static void __init p720t_init_early(void)
-{
-       /*
-        * Power down as much as possible in case we don't
-        * have the drivers loaded.
-        */
-       PLD_LCDEN = 0;
-       PLD_PWR  &= ~(PLD_S4_ON|PLD_S3_ON|PLD_S2_ON|PLD_S1_ON);
-
-       PLD_KBD   = 0;
-       PLD_IO    = 0;
-       PLD_IRDA  = 0;
-       PLD_CODEC = 0;
-       PLD_TCH   = 0;
-       PLD_SPI   = 0;
-       if (!IS_ENABLED(CONFIG_DEBUG_LL)) {
-               PLD_COM2 = 0;
-               PLD_COM1 = 0;
-       }
-}
-
-static struct gpio_led p720t_gpio_leds[] = {
-       {
-               .name                   = "User LED",
-               .default_trigger        = "heartbeat",
-               .gpio                   = P720T_USERLED,
-       },
-};
-
-static struct gpio_led_platform_data p720t_gpio_led_pdata __initdata = {
-       .leds           = p720t_gpio_leds,
-       .num_leds       = ARRAY_SIZE(p720t_gpio_leds),
-};
-
-static void __init p720t_init(void)
-{
-       platform_device_register(&p720t_nand_pdev);
-       platform_device_register_data(&platform_bus, "platform-lcd", 0,
-                                     &p720t_lcd_power_pdata,
-                                     sizeof(p720t_lcd_power_pdata));
-       platform_device_register_data(&platform_bus, "generic-bl", 0,
-                                     &p720t_lcd_backlight_pdata,
-                                     sizeof(p720t_lcd_backlight_pdata));
-       platform_device_register_simple("video-clps711x", 0, NULL, 0);
-}
-
-static void __init p720t_init_late(void)
-{
-       platform_device_register_data(&platform_bus, "leds-gpio", 0,
-                                     &p720t_gpio_led_pdata,
-                                     sizeof(p720t_gpio_led_pdata));
-}
-
-MACHINE_START(P720T, "ARM-Prospector720T")
-       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-       .atag_offset    = 0x100,
-       .nr_irqs        = CLPS711X_NR_IRQS,
-       .fixup          = fixup_p720t,
-       .map_io         = p720t_map_io,
-       .init_early     = p720t_init_early,
-       .init_irq       = clps711x_init_irq,
-       .timer          = &clps711x_timer,
-       .init_machine   = p720t_init,
-       .init_late      = p720t_init_late,
-       .handle_irq     = clps711x_handle_irq,
-       .restart        = clps711x_restart,
-MACHINE_END