ARM: clps711x: remove extraneous files
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Sep 2016 16:15:00 +0000 (18:15 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 2 Sep 2016 16:15:00 +0000 (18:15 +0200)
We removed support for board files in clps711x in Linux-4.8, but
I accidentally left the unused files behind. Let's kill them
off for real this time.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-clps711x/Makefile.boot [deleted file]
arch/arm/mach-clps711x/board-autcpu12.c [deleted file]
arch/arm/mach-clps711x/board-cdb89712.c [deleted file]
arch/arm/mach-clps711x/board-clep7312.c [deleted file]
arch/arm/mach-clps711x/board-edb7211.c [deleted file]
arch/arm/mach-clps711x/board-p720t.c [deleted file]
arch/arm/mach-clps711x/common.c [deleted file]
arch/arm/mach-clps711x/common.h [deleted file]
arch/arm/mach-clps711x/devices.c [deleted file]
arch/arm/mach-clps711x/devices.h [deleted file]

diff --git a/arch/arm/mach-clps711x/Makefile.boot b/arch/arm/mach-clps711x/Makefile.boot
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
deleted file mode 100644 (file)
index ba3d7d1..0000000
+++ /dev/null
@@ -1,275 +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/physmap.h>
-#include <linux/mtd/plat-ram.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand-gpio.h>
-#include <linux/platform_device.h>
-#include <linux/gpio/driver.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 "common.h"
-#include "devices.h"
-
-/* NOR flash */
-#define AUTCPU12_FLASH_BASE    (CS0_PHYS_BASE)
-
-/* Board specific hardware definitions */
-#define AUTCPU12_CHAR_LCD_BASE (CS1_PHYS_BASE + 0x00000000)
-#define AUTCPU12_CSAUX1_BASE   (CS1_PHYS_BASE + 0x04000000)
-#define AUTCPU12_CAN_BASE      (CS1_PHYS_BASE + 0x08000000)
-#define AUTCPU12_TOUCH_BASE    (CS1_PHYS_BASE + 0x0a000000)
-#define AUTCPU12_IO_BASE       (CS1_PHYS_BASE + 0x0c000000)
-#define AUTCPU12_LPT_BASE      (CS1_PHYS_BASE + 0x0e000000)
-
-/* NVRAM */
-#define AUTCPU12_NVRAM_BASE    (CS1_PHYS_BASE + 0x02000000)
-
-/* SmartMedia flash */
-#define AUTCPU12_SMC_BASE      (CS1_PHYS_BASE + 0x06000000)
-#define AUTCPU12_SMC_SEL_BASE  (AUTCPU12_SMC_BASE + 0x10)
-
-/* Ethernet */
-#define AUTCPU12_CS8900_BASE   (CS2_PHYS_BASE + 0x300)
-#define AUTCPU12_CS8900_IRQ    (IRQ_EINT3)
-
-/* NAND flash */
-#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, 4)
-
-/* LCD contrast digital potentiometer */
-#define AUTCPU12_DPOT_CS       CLPS711X_GPIO(4, 0)
-#define AUTCPU12_DPOT_CLK      CLPS711X_GPIO(4, 1)
-#define AUTCPU12_DPOT_UD       CLPS711X_GPIO(4, 2)
-
-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_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 const struct gpio const autcpu12_gpios[] __initconst = {
-       { AUTCPU12_DPOT_CS,     GPIOF_OUT_INIT_HIGH,    "DPOT CS" },
-       { AUTCPU12_DPOT_CLK,    GPIOF_OUT_INIT_LOW,     "DPOT CLK" },
-       { AUTCPU12_DPOT_UD,     GPIOF_OUT_INIT_LOW,     "DPOT UD" },
-};
-
-static struct mtd_partition autcpu12_flash_partitions[] = {
-       {
-               .name   = "NOR.0",
-               .offset = 0,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data autcpu12_flash_pdata = {
-       .width          = 4,
-       .parts          = autcpu12_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(autcpu12_flash_partitions),
-};
-
-static struct resource autcpu12_flash_resources[] __initdata = {
-       DEFINE_RES_MEM(AUTCPU12_FLASH_BASE, SZ_8M),
-};
-
-static struct platform_device autcpu12_flash_pdev __initdata = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = autcpu12_flash_resources,
-       .num_resources  = ARRAY_SIZE(autcpu12_flash_resources),
-       .dev            = {
-               .platform_data  = &autcpu12_flash_pdata,
-       },
-};
-
-static struct resource autcpu12_nvram_resource[] __initdata = {
-       DEFINE_RES_MEM(AUTCPU12_NVRAM_BASE, 0),
-};
-
-static struct platdata_mtd_ram autcpu12_nvram_pdata = {
-       .bankwidth      = 4,
-};
-
-static struct platform_device autcpu12_nvram_pdev __initdata = {
-       .name           = "mtd-ram",
-       .id             = 0,
-       .resource       = autcpu12_nvram_resource,
-       .num_resources  = ARRAY_SIZE(autcpu12_nvram_resource),
-       .dev            = {
-               .platform_data  = &autcpu12_nvram_pdata,
-       },
-};
-
-static void __init autcpu12_nvram_init(void)
-{
-       void __iomem *nvram;
-       unsigned int save[2];
-       resource_size_t nvram_size = SZ_128K;
-
-       /*
-        * Check for 32K/128K
-        * Read ofs 0K
-        * Read ofs 64K
-        * Write complement to ofs 64K
-        * Read and check result on ofs 0K
-        * Restore contents
-        */
-       nvram = ioremap(autcpu12_nvram_resource[0].start, SZ_128K);
-       if (nvram) {
-               save[0] = readl(nvram + 0);
-               save[1] = readl(nvram + SZ_64K);
-               writel(~save[0], nvram + SZ_64K);
-               if (readl(nvram + 0) != save[0]) {
-                       writel(save[0], nvram + 0);
-                       nvram_size = SZ_32K;
-               } else
-                       writel(save[1], nvram + SZ_64K);
-               iounmap(nvram);
-
-               autcpu12_nvram_resource[0].end =
-                       autcpu12_nvram_resource[0].start + nvram_size - 1;
-               platform_device_register(&autcpu12_nvram_pdev);
-       } else
-               pr_err("Failed to remap NVRAM resource\n");
-}
-
-static void __init autcpu12_init(void)
-{
-       clps711x_devices_init();
-       platform_device_register(&autcpu12_flash_pdev);
-       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);
-       autcpu12_nvram_init();
-}
-
-static void __init autcpu12_init_late(void)
-{
-       gpio_request_array(autcpu12_gpios, ARRAY_SIZE(autcpu12_gpios));
-       platform_device_register(&autcpu12_nand_pdev);
-}
-
-MACHINE_START(AUTCPU12, "autronix autcpu12")
-       /* Maintainer: Thomas Gleixner */
-       .atag_offset    = 0x20000,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .init_time      = clps711x_timer_init,
-       .init_machine   = autcpu12_init,
-       .init_late      = autcpu12_init_late,
-       .restart        = clps711x_restart,
-MACHINE_END
-
diff --git a/arch/arm/mach-clps711x/board-cdb89712.c b/arch/arm/mach-clps711x/board-cdb89712.c
deleted file mode 100644 (file)
index 972abdb..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"
-#include "devices.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_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)
-{
-       clps711x_devices_init();
-       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,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .init_time      = clps711x_timer_init,
-       .init_machine   = cdb89712_init,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-clep7312.c b/arch/arm/mach-clps711x/board-clep7312.c
deleted file mode 100644 (file)
index f9ca22b..0000000
+++ /dev/null
@@ -1,45 +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 <linux/memblock.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include "common.h"
-#include "devices.h"
-
-static void __init
-fixup_clep7312(struct tag *tags, char **cmdline)
-{
-       memblock_add(0xc0000000, 0x01000000);
-}
-
-MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-       /* Maintainer: Nobody */
-       .atag_offset    = 0x0100,
-       .fixup          = fixup_clep7312,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .init_time      = clps711x_timer_init,
-       .init_machine   = clps711x_devices_init,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
deleted file mode 100644 (file)
index f339797..0000000
+++ /dev/null
@@ -1,188 +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/i2c-gpio.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/pwm.h>
-#include <linux/pwm_backlight.h>
-#include <linux/memblock.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"
-#include "devices.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_I2C_SDA                CLPS711X_GPIO(3, 4)
-#define EDB7211_I2C_SCL                CLPS711X_GPIO(3, 5)
-
-#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)
-
-/* The extra 8 lines of the keyboard matrix */
-#define EDB7211_EXTKBD_BASE    (CS3_PHYS_BASE)
-
-static struct i2c_gpio_platform_data edb7211_i2c_pdata __initdata = {
-       .sda_pin        = EDB7211_I2C_SDA,
-       .scl_pin        = EDB7211_I2C_SCL,
-       .scl_is_output_only = 1,
-};
-
-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 struct pwm_lookup edb7211_pwm_lookup[] = {
-       PWM_LOOKUP("clps711x-pwm", 0, "pwm-backlight.0", NULL,
-                  0, PWM_POLARITY_NORMAL),
-};
-
-static struct platform_pwm_backlight_data pwm_bl_pdata = {
-       .dft_brightness = 0x01,
-       .max_brightness = 0x0f,
-       .enable_gpio    = EDB7211_LCDBL,
-};
-
-static struct resource clps711x_pwm_res =
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + PMPCON, SZ_4);
-
-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" },
-};
-
-/* 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)
-{
-       /*
-        * 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.
-        */
-       memblock_add(0xc0000000, SZ_8M);
-       memblock_add(0xc1000000, SZ_8M);
-}
-
-static void __init edb7211_init_late(void)
-{
-       gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
-
-       platform_device_register(&edb7211_flash_pdev);
-
-       platform_device_register_data(NULL, "platform-lcd", 0,
-                                     &edb7211_lcd_power_pdata,
-                                     sizeof(edb7211_lcd_power_pdata));
-
-       platform_device_register_simple("clps711x-pwm", PLATFORM_DEVID_NONE,
-                                       &clps711x_pwm_res, 1);
-       pwm_add_table(edb7211_pwm_lookup, ARRAY_SIZE(edb7211_pwm_lookup));
-
-       platform_device_register_data(&platform_bus, "pwm-backlight", 0,
-                                     &pwm_bl_pdata, sizeof(pwm_bl_pdata));
-
-       platform_device_register_simple("video-clps711x", 0, NULL, 0);
-       platform_device_register_simple("cs89x0", 0, edb7211_cs8900_resource,
-                                       ARRAY_SIZE(edb7211_cs8900_resource));
-       platform_device_register_data(NULL, "i2c-gpio", 0,
-                                     &edb7211_i2c_pdata,
-                                     sizeof(edb7211_i2c_pdata));
-}
-
-MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
-       /* Maintainer: Jon McClintock */
-       .atag_offset    = VIDEORAM_SIZE + 0x100,
-       .fixup          = fixup_edb7211,
-       .reserve        = edb7211_reserve,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .init_time      = clps711x_timer_init,
-       .init_machine   = clps711x_devices_init,
-       .init_late      = edb7211_init_late,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c
deleted file mode 100644 (file)
index 80a16a8..0000000
+++ /dev/null
@@ -1,373 +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/gpio.h>
-#include <linux/slab.h>
-#include <linux/leds.h>
-#include <linux/sizes.h>
-#include <linux/backlight.h>
-#include <linux/gpio/driver.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 <video/platform_lcd.h>
-
-#include "common.h"
-#include "devices.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)
-
-#define P720T_MMGPIO_BASE      (CLPS711X_NR_GPIO)
-
-#define SYSPLD_PHYS_BASE       IOMEM(CS1_PHYS_BASE)
-
-#define PLD_INT                        (SYSPLD_PHYS_BASE + 0x000000)
-#define PLD_INT_MMGPIO_BASE    (P720T_MMGPIO_BASE + 0)
-#define PLD_INT_PENIRQ         (PLD_INT_MMGPIO_BASE + 5)
-#define PLD_INT_UCB_IRQ                (PLD_INT_MMGPIO_BASE + 1)
-#define PLD_INT_KBD_ATN                (PLD_INT_MMGPIO_BASE + 0) /* EINT1 */
-
-#define PLD_PWR                        (SYSPLD_PHYS_BASE + 0x000004)
-#define PLD_PWR_MMGPIO_BASE    (P720T_MMGPIO_BASE + 8)
-#define PLD_PWR_EXT            (PLD_PWR_MMGPIO_BASE + 5)
-#define PLD_PWR_MODE           (PLD_PWR_MMGPIO_BASE + 4) /* 1 = PWM, 0 = PFM */
-#define PLD_S4_ON              (PLD_PWR_MMGPIO_BASE + 3) /* LCD bias voltage enable */
-#define PLD_S3_ON              (PLD_PWR_MMGPIO_BASE + 2) /* LCD backlight enable */
-#define PLD_S2_ON              (PLD_PWR_MMGPIO_BASE + 1) /* LCD 3V3 supply enable */
-#define PLD_S1_ON              (PLD_PWR_MMGPIO_BASE + 0) /* LCD 3V supply enable */
-
-#define PLD_KBD                        (SYSPLD_PHYS_BASE + 0x000008)
-#define PLD_KBD_MMGPIO_BASE    (P720T_MMGPIO_BASE + 16)
-#define PLD_KBD_WAKE           (PLD_KBD_MMGPIO_BASE + 1)
-#define PLD_KBD_EN             (PLD_KBD_MMGPIO_BASE + 0)
-
-#define PLD_SPI                        (SYSPLD_PHYS_BASE + 0x00000c)
-#define PLD_SPI_MMGPIO_BASE    (P720T_MMGPIO_BASE + 24)
-#define PLD_SPI_EN             (PLD_SPI_MMGPIO_BASE + 0)
-
-#define PLD_IO                 (SYSPLD_PHYS_BASE + 0x000010)
-#define PLD_IO_MMGPIO_BASE     (P720T_MMGPIO_BASE + 32)
-#define PLD_IO_BOOTSEL         (PLD_IO_MMGPIO_BASE + 6) /* Boot sel switch */
-#define PLD_IO_USER            (PLD_IO_MMGPIO_BASE + 5) /* User defined switch */
-#define PLD_IO_LED3            (PLD_IO_MMGPIO_BASE + 4)
-#define PLD_IO_LED2            (PLD_IO_MMGPIO_BASE + 3)
-#define PLD_IO_LED1            (PLD_IO_MMGPIO_BASE + 2)
-#define PLD_IO_LED0            (PLD_IO_MMGPIO_BASE + 1)
-#define PLD_IO_LEDEN           (PLD_IO_MMGPIO_BASE + 0)
-
-#define PLD_IRDA               (SYSPLD_PHYS_BASE + 0x000014)
-#define PLD_IRDA_MMGPIO_BASE   (P720T_MMGPIO_BASE + 40)
-#define PLD_IRDA_EN            (PLD_IRDA_MMGPIO_BASE + 0)
-
-#define PLD_COM2               (SYSPLD_PHYS_BASE + 0x000018)
-#define PLD_COM2_MMGPIO_BASE   (P720T_MMGPIO_BASE + 48)
-#define PLD_COM2_EN            (PLD_COM2_MMGPIO_BASE + 0)
-
-#define PLD_COM1               (SYSPLD_PHYS_BASE + 0x00001c)
-#define PLD_COM1_MMGPIO_BASE   (P720T_MMGPIO_BASE + 56)
-#define PLD_COM1_EN            (PLD_COM1_MMGPIO_BASE + 0)
-
-#define PLD_AUD                        (SYSPLD_PHYS_BASE + 0x000020)
-#define PLD_AUD_MMGPIO_BASE    (P720T_MMGPIO_BASE + 64)
-#define PLD_AUD_DIV1           (PLD_AUD_MMGPIO_BASE + 6)
-#define PLD_AUD_DIV0           (PLD_AUD_MMGPIO_BASE + 5)
-#define PLD_AUD_CLK_SEL1       (PLD_AUD_MMGPIO_BASE + 4)
-#define PLD_AUD_CLK_SEL0       (PLD_AUD_MMGPIO_BASE + 3)
-#define PLD_AUD_MIC_PWR                (PLD_AUD_MMGPIO_BASE + 2)
-#define PLD_AUD_MIC_GAIN       (PLD_AUD_MMGPIO_BASE + 1)
-#define PLD_AUD_CODEC_EN       (PLD_AUD_MMGPIO_BASE + 0)
-
-#define PLD_CF                 (SYSPLD_PHYS_BASE + 0x000024)
-#define PLD_CF_MMGPIO_BASE     (P720T_MMGPIO_BASE + 72)
-#define PLD_CF2_SLEEP          (PLD_CF_MMGPIO_BASE + 5)
-#define PLD_CF1_SLEEP          (PLD_CF_MMGPIO_BASE + 4)
-#define PLD_CF2_nPDREQ         (PLD_CF_MMGPIO_BASE + 3)
-#define PLD_CF1_nPDREQ         (PLD_CF_MMGPIO_BASE + 2)
-#define PLD_CF2_nIRQ           (PLD_CF_MMGPIO_BASE + 1)
-#define PLD_CF1_nIRQ           (PLD_CF_MMGPIO_BASE + 0)
-
-#define PLD_SDC                        (SYSPLD_PHYS_BASE + 0x000028)
-#define PLD_SDC_MMGPIO_BASE    (P720T_MMGPIO_BASE + 80)
-#define PLD_SDC_INT_EN         (PLD_SDC_MMGPIO_BASE + 2)
-#define PLD_SDC_WP             (PLD_SDC_MMGPIO_BASE + 1)
-#define PLD_SDC_CD             (PLD_SDC_MMGPIO_BASE + 0)
-
-#define PLD_CODEC              (SYSPLD_PHYS_BASE + 0x400000)
-#define PLD_CODEC_MMGPIO_BASE  (P720T_MMGPIO_BASE + 88)
-#define PLD_CODEC_IRQ3         (PLD_CODEC_MMGPIO_BASE + 4)
-#define PLD_CODEC_IRQ2         (PLD_CODEC_MMGPIO_BASE + 3)
-#define PLD_CODEC_IRQ1         (PLD_CODEC_MMGPIO_BASE + 2)
-#define PLD_CODEC_EN           (PLD_CODEC_MMGPIO_BASE + 0)
-
-#define PLD_BRITE              (SYSPLD_PHYS_BASE + 0x400004)
-#define PLD_BRITE_MMGPIO_BASE  (P720T_MMGPIO_BASE + 96)
-#define PLD_BRITE_UP           (PLD_BRITE_MMGPIO_BASE + 1)
-#define PLD_BRITE_DN           (PLD_BRITE_MMGPIO_BASE + 0)
-
-#define PLD_LCDEN              (SYSPLD_PHYS_BASE + 0x400008)
-#define PLD_LCDEN_MMGPIO_BASE  (P720T_MMGPIO_BASE + 104)
-#define PLD_LCDEN_EN           (PLD_LCDEN_MMGPIO_BASE + 0)
-
-#define PLD_TCH                        (SYSPLD_PHYS_BASE + 0x400010)
-#define PLD_TCH_MMGPIO_BASE    (P720T_MMGPIO_BASE + 112)
-#define PLD_TCH_PENIRQ         (PLD_TCH_MMGPIO_BASE + 1)
-#define PLD_TCH_EN             (PLD_TCH_MMGPIO_BASE + 0)
-
-#define PLD_GPIO               (SYSPLD_PHYS_BASE + 0x400014)
-#define PLD_GPIO_MMGPIO_BASE   (P720T_MMGPIO_BASE + 120)
-#define PLD_GPIO2              (PLD_GPIO_MMGPIO_BASE + 2)
-#define PLD_GPIO1              (PLD_GPIO_MMGPIO_BASE + 1)
-#define PLD_GPIO0              (PLD_GPIO_MMGPIO_BASE + 0)
-
-static struct gpio p720t_gpios[] __initconst = {
-       { PLD_S1_ON,    GPIOF_OUT_INIT_LOW,     "PLD_S1_ON" },
-       { PLD_S2_ON,    GPIOF_OUT_INIT_LOW,     "PLD_S2_ON" },
-       { PLD_S3_ON,    GPIOF_OUT_INIT_LOW,     "PLD_S3_ON" },
-       { PLD_S4_ON,    GPIOF_OUT_INIT_LOW,     "PLD_S4_ON" },
-       { PLD_KBD_EN,   GPIOF_OUT_INIT_LOW,     "PLD_KBD_EN" },
-       { PLD_SPI_EN,   GPIOF_OUT_INIT_LOW,     "PLD_SPI_EN" },
-       { PLD_IO_USER,  GPIOF_OUT_INIT_LOW,     "PLD_IO_USER" },
-       { PLD_IO_LED0,  GPIOF_OUT_INIT_LOW,     "PLD_IO_LED0" },
-       { PLD_IO_LED1,  GPIOF_OUT_INIT_LOW,     "PLD_IO_LED1" },
-       { PLD_IO_LED2,  GPIOF_OUT_INIT_LOW,     "PLD_IO_LED2" },
-       { PLD_IO_LED3,  GPIOF_OUT_INIT_LOW,     "PLD_IO_LED3" },
-       { PLD_IO_LEDEN, GPIOF_OUT_INIT_LOW,     "PLD_IO_LEDEN" },
-       { PLD_IRDA_EN,  GPIOF_OUT_INIT_LOW,     "PLD_IRDA_EN" },
-       { PLD_COM1_EN,  GPIOF_OUT_INIT_HIGH,    "PLD_COM1_EN" },
-       { PLD_COM2_EN,  GPIOF_OUT_INIT_HIGH,    "PLD_COM2_EN" },
-       { PLD_CODEC_EN, GPIOF_OUT_INIT_LOW,     "PLD_CODEC_EN" },
-       { PLD_LCDEN_EN, GPIOF_OUT_INIT_LOW,     "PLD_LCDEN_EN" },
-       { PLD_TCH_EN,   GPIOF_OUT_INIT_LOW,     "PLD_TCH_EN" },
-       { P720T_USERLED,GPIOF_OUT_INIT_LOW,     "USER_LED" },
-};
-
-static struct resource p720t_mmgpio_resource[] __initdata = {
-       DEFINE_RES_MEM_NAMED(0, 4, "dat"),
-};
-
-static struct bgpio_pdata p720t_mmgpio_pdata = {
-       .ngpio  = 8,
-};
-
-static struct platform_device p720t_mmgpio __initdata = {
-       .name           = "basic-mmio-gpio",
-       .id             = -1,
-       .resource       = p720t_mmgpio_resource,
-       .num_resources  = ARRAY_SIZE(p720t_mmgpio_resource),
-       .dev            = {
-               .platform_data  = &p720t_mmgpio_pdata,
-       },
-};
-
-static void __init p720t_mmgpio_init(void __iomem *addrbase, int gpiobase)
-{
-       p720t_mmgpio_resource[0].start = (unsigned long)addrbase;
-       p720t_mmgpio_pdata.base = gpiobase;
-
-       platform_device_register(&p720t_mmgpio);
-}
-
-static struct {
-       void __iomem    *addrbase;
-       int             gpiobase;
-} mmgpios[] __initconst = {
-       { PLD_INT,      PLD_INT_MMGPIO_BASE },
-       { PLD_PWR,      PLD_PWR_MMGPIO_BASE },
-       { PLD_KBD,      PLD_KBD_MMGPIO_BASE },
-       { PLD_SPI,      PLD_SPI_MMGPIO_BASE },
-       { PLD_IO,       PLD_IO_MMGPIO_BASE },
-       { PLD_IRDA,     PLD_IRDA_MMGPIO_BASE },
-       { PLD_COM2,     PLD_COM2_MMGPIO_BASE },
-       { PLD_COM1,     PLD_COM1_MMGPIO_BASE },
-       { PLD_AUD,      PLD_AUD_MMGPIO_BASE },
-       { PLD_CF,       PLD_CF_MMGPIO_BASE },
-       { PLD_SDC,      PLD_SDC_MMGPIO_BASE },
-       { PLD_CODEC,    PLD_CODEC_MMGPIO_BASE },
-       { PLD_BRITE,    PLD_BRITE_MMGPIO_BASE },
-       { PLD_LCDEN,    PLD_LCDEN_MMGPIO_BASE },
-       { PLD_TCH,      PLD_TCH_MMGPIO_BASE },
-       { PLD_GPIO,     PLD_GPIO_MMGPIO_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) {
-               gpio_set_value(PLD_LCDEN_EN, 1);
-               gpio_set_value(PLD_S1_ON, 1);
-               gpio_set_value(PLD_S2_ON, 1);
-               gpio_set_value(PLD_S4_ON, 1);
-       } else {
-               gpio_set_value(PLD_S1_ON, 0);
-               gpio_set_value(PLD_S2_ON, 0);
-               gpio_set_value(PLD_S4_ON, 0);
-               gpio_set_value(PLD_LCDEN_EN, 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)
-{
-       gpio_set_value(PLD_S3_ON, intensity);
-}
-
-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,
-};
-
-static void __init
-fixup_p720t(struct tag *tag, char **cmdline)
-{
-       /*
-        * 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 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)
-{
-       int i;
-
-       clps711x_devices_init();
-
-       for (i = 0; i < ARRAY_SIZE(mmgpios); i++)
-               p720t_mmgpio_init(mmgpios[i].addrbase, mmgpios[i].gpiobase);
-
-       platform_device_register(&p720t_nand_pdev);
-}
-
-static void __init p720t_init_late(void)
-{
-       WARN_ON(gpio_request_array(p720t_gpios, ARRAY_SIZE(p720t_gpios)));
-
-       platform_device_register_data(NULL, "platform-lcd", 0,
-                                     &p720t_lcd_power_pdata,
-                                     sizeof(p720t_lcd_power_pdata));
-       platform_device_register_data(NULL, "generic-bl", 0,
-                                     &p720t_lcd_backlight_pdata,
-                                     sizeof(p720t_lcd_backlight_pdata));
-       platform_device_register_simple("video-clps711x", 0, NULL, 0);
-       platform_device_register_data(NULL, "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,
-       .fixup          = fixup_p720t,
-       .map_io         = clps711x_map_io,
-       .init_irq       = clps711x_init_irq,
-       .init_time      = clps711x_timer_init,
-       .init_machine   = p720t_init,
-       .init_late      = p720t_init_late,
-       .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
deleted file mode 100644 (file)
index 6466da8..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/core.c
- *
- *  Core support for the CLPS711x-based machines.
- *
- *  Copyright (C) 2001,2011 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/init.h>
-#include <linux/sizes.h>
-
-#include <asm/mach/map.h>
-#include <asm/system_misc.h>
-
-#include <mach/hardware.h>
-
-#include "common.h"
-
-/*
- * This maps the generic CLPS711x registers
- */
-static struct map_desc clps711x_io_desc[] __initdata = {
-       {
-               .virtual        = (unsigned long)CLPS711X_VIRT_BASE,
-               .pfn            = __phys_to_pfn(CLPS711X_PHYS_BASE),
-               .length         = 48 * SZ_1K,
-               .type           = MT_DEVICE,
-       }
-};
-
-void __init clps711x_map_io(void)
-{
-       iotable_init(clps711x_io_desc, ARRAY_SIZE(clps711x_io_desc));
-}
-
-void __init clps711x_init_irq(void)
-{
-       clps711x_intc_init(CLPS711X_PHYS_BASE, SZ_16K);
-}
-
-void __init clps711x_timer_init(void)
-{
-       clps711x_clk_init(CLPS711X_VIRT_BASE);
-       clps711x_clksrc_init(CLPS711X_VIRT_BASE + TC1D,
-                            CLPS711X_VIRT_BASE + TC2D, IRQ_TC2OI);
-}
-
-void clps711x_restart(enum reboot_mode mode, const char *cmd)
-{
-       soft_restart(0);
-}
diff --git a/arch/arm/mach-clps711x/common.h b/arch/arm/mach-clps711x/common.h
deleted file mode 100644 (file)
index 370200b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * linux/arch/arm/mach-clps711x/common.h
- *
- * Common bits.
- */
-
-#include <linux/reboot.h>
-
-#define CLPS711X_NR_GPIO       (4 * 8 + 3)
-#define CLPS711X_GPIO(prt, bit)        ((prt) * 8 + (bit))
-
-extern void clps711x_map_io(void);
-extern void clps711x_init_irq(void);
-extern void clps711x_timer_init(void);
-extern void clps711x_restart(enum reboot_mode mode, const char *cmd);
-
-/* drivers/irqchip/irq-clps711x.c */
-void clps711x_intc_init(phys_addr_t, resource_size_t);
-/* drivers/clk/clk-clps711x.c */
-void clps711x_clk_init(void __iomem *base);
-/* drivers/clocksource/clps711x-timer.c */
-void clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base,
-                         unsigned int irq);
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
deleted file mode 100644 (file)
index 77a9617..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  CLPS711X common devices definitions
- *
- *  Author: Alexander Shiyan <shc_work@mail.ru>, 2013-2014
- *
- * 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/io.h>
-#include <linux/of_fdt.h>
-#include <linux/platform_device.h>
-#include <linux/random.h>
-#include <linux/sizes.h>
-#include <linux/slab.h>
-#include <linux/sys_soc.h>
-
-#include <asm/system_info.h>
-
-#include <mach/hardware.h>
-
-static const struct resource clps711x_cpuidle_res __initconst =
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + HALT, SZ_128);
-
-static void __init clps711x_add_cpuidle(void)
-{
-       platform_device_register_simple("clps711x-cpuidle", PLATFORM_DEVID_NONE,
-                                       &clps711x_cpuidle_res, 1);
-}
-
-static const phys_addr_t clps711x_gpios[][2] __initconst = {
-       { PADR, PADDR },
-       { PBDR, PBDDR },
-       { PCDR, PCDDR },
-       { PDDR, PDDDR },
-       { PEDR, PEDDR },
-};
-
-static void __init clps711x_add_gpio(void)
-{
-       unsigned i;
-       struct resource gpio_res[2];
-
-       memset(gpio_res, 0, sizeof(gpio_res));
-
-       gpio_res[0].flags = IORESOURCE_MEM;
-       gpio_res[1].flags = IORESOURCE_MEM;
-
-       for (i = 0; i < ARRAY_SIZE(clps711x_gpios); i++) {
-               gpio_res[0].start = CLPS711X_PHYS_BASE + clps711x_gpios[i][0];
-               gpio_res[0].end = gpio_res[0].start;
-               gpio_res[1].start = CLPS711X_PHYS_BASE + clps711x_gpios[i][1];
-               gpio_res[1].end = gpio_res[1].start;
-
-               platform_device_register_simple("clps711x-gpio", i,
-                                               gpio_res, ARRAY_SIZE(gpio_res));
-       }
-}
-
-const struct resource clps711x_syscon_res[] __initconst = {
-       /* SYSCON1, SYSFLG1 */
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + SYSCON1, SZ_128),
-       /* SYSCON2, SYSFLG2 */
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + SYSCON2, SZ_128),
-       /* SYSCON3 */
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + SYSCON3, SZ_64),
-};
-
-static void __init clps711x_add_syscon(void)
-{
-       unsigned i;
-
-       for (i = 0; i < ARRAY_SIZE(clps711x_syscon_res); i++)
-               platform_device_register_simple("syscon", i + 1,
-                                               &clps711x_syscon_res[i], 1);
-}
-
-static const struct resource clps711x_uart1_res[] __initconst = {
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + UARTDR1, SZ_128),
-       DEFINE_RES_IRQ(IRQ_UTXINT1),
-       DEFINE_RES_IRQ(IRQ_URXINT1),
-};
-
-static const struct resource clps711x_uart2_res[] __initconst = {
-       DEFINE_RES_MEM(CLPS711X_PHYS_BASE + UARTDR2, SZ_128),
-       DEFINE_RES_IRQ(IRQ_UTXINT2),
-       DEFINE_RES_IRQ(IRQ_URXINT2),
-};
-
-static void __init clps711x_add_uart(void)
-{
-       platform_device_register_simple("clps711x-uart", 0, clps711x_uart1_res,
-                                       ARRAY_SIZE(clps711x_uart1_res));
-       platform_device_register_simple("clps711x-uart", 1, clps711x_uart2_res,
-                                       ARRAY_SIZE(clps711x_uart2_res));
-};
-
-static void __init clps711x_soc_init(void)
-{
-       struct soc_device_attribute *soc_dev_attr;
-       struct soc_device *soc_dev;
-       void __iomem *base;
-       u32 id[5];
-
-       base = ioremap(CLPS711X_PHYS_BASE, SZ_32K);
-       if (!base)
-               return;
-
-       id[0] = readl(base + UNIQID);
-       id[1] = readl(base + RANDID0);
-       id[2] = readl(base + RANDID1);
-       id[3] = readl(base + RANDID2);
-       id[4] = readl(base + RANDID3);
-       system_rev = SYSFLG1_VERID(readl(base + SYSFLG1));
-
-       add_device_randomness(id, sizeof(id));
-
-       system_serial_low = id[0];
-
-       soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
-       if (!soc_dev_attr)
-               goto out_unmap;
-
-       soc_dev_attr->machine = of_flat_dt_get_machine_name();
-       soc_dev_attr->family = "Cirrus Logic CLPS711X";
-       soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%u", system_rev);
-       soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%08x", id[0]);
-
-       soc_dev = soc_device_register(soc_dev_attr);
-       if (IS_ERR(soc_dev)) {
-               kfree(soc_dev_attr->revision);
-               kfree(soc_dev_attr->soc_id);
-               kfree(soc_dev_attr);
-       }
-
-out_unmap:
-       iounmap(base);
-}
-
-void __init clps711x_devices_init(void)
-{
-       clps711x_add_cpuidle();
-       clps711x_add_gpio();
-       clps711x_add_syscon();
-       clps711x_add_uart();
-       clps711x_soc_init();
-}
diff --git a/arch/arm/mach-clps711x/devices.h b/arch/arm/mach-clps711x/devices.h
deleted file mode 100644 (file)
index a5efc17..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- *  CLPS711X common devices definitions
- *
- *  Copyright (C) 2013 Alexander Shiyan <shc_work@mail.ru>
- *
- * 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.
- */
-
-void clps711x_devices_init(void);