diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2012-12-26 00:21:06 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-01 13:11:19 -0500 |
| commit | 21cc2bda8bdca8c1f5f6871d3eb0e9632612cf25 (patch) | |
| tree | 6473fa9c50afad414b0ee0e50b4a8f3de2b6ef6a | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
ARM: OMAP2+: Remove apollon board support
As apollon board doesn't used anymore, remove it.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
[tony@atomide.com: dropped uncompress.h changes, it's gone]
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 342 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-generic-dpi.c | 24 |
5 files changed, 0 insertions, 376 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 41b581fd0213..d4e4f9590a95 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -165,12 +165,6 @@ config MACH_OMAP_H4 | |||
| 165 | select OMAP_DEBUG_DEVICES | 165 | select OMAP_DEBUG_DEVICES |
| 166 | select OMAP_PACKAGE_ZAF | 166 | select OMAP_PACKAGE_ZAF |
| 167 | 167 | ||
| 168 | config MACH_OMAP_APOLLON | ||
| 169 | bool "OMAP 2420 Apollon board" | ||
| 170 | depends on SOC_OMAP2420 | ||
| 171 | default y | ||
| 172 | select OMAP_PACKAGE_ZAC | ||
| 173 | |||
| 174 | config MACH_OMAP_2430SDP | 168 | config MACH_OMAP_2430SDP |
| 175 | bool "OMAP 2430 SDP board" | 169 | bool "OMAP 2430 SDP board" |
| 176 | depends on SOC_OMAP2430 | 170 | depends on SOC_OMAP2430 |
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 947cafe65aef..0c66759a1174 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -220,7 +220,6 @@ endif | |||
| 220 | obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o | 220 | obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o |
| 221 | obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o | 221 | obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o |
| 222 | obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o | 222 | obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o |
| 223 | obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o | ||
| 224 | obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o | 223 | obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o |
| 225 | obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o | 224 | obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o |
| 226 | obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o | 225 | obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o |
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c deleted file mode 100644 index 5d0a61f54165..000000000000 --- a/arch/arm/mach-omap2/board-apollon.c +++ /dev/null | |||
| @@ -1,342 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/board-apollon.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005,2006 Samsung Electronics | ||
| 5 | * Author: Kyungmin Park <kyungmin.park@samsung.com> | ||
| 6 | * | ||
| 7 | * Modified from mach-omap/omap2/board-h4.c | ||
| 8 | * | ||
| 9 | * Code for apollon OMAP2 board. Should work on many OMAP2 systems where | ||
| 10 | * the bootloader passes the board-specific data to the kernel. | ||
| 11 | * Do not put any board specific code to this file; create a new machine | ||
| 12 | * type if you need custom low-level initializations. | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or modify | ||
| 15 | * it under the terms of the GNU General Public License version 2 as | ||
| 16 | * published by the Free Software Foundation. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #include <linux/kernel.h> | ||
| 20 | #include <linux/init.h> | ||
| 21 | #include <linux/platform_device.h> | ||
| 22 | #include <linux/mtd/mtd.h> | ||
| 23 | #include <linux/mtd/partitions.h> | ||
| 24 | #include <linux/mtd/onenand.h> | ||
| 25 | #include <linux/delay.h> | ||
| 26 | #include <linux/leds.h> | ||
| 27 | #include <linux/err.h> | ||
| 28 | #include <linux/clk.h> | ||
| 29 | #include <linux/smc91x.h> | ||
| 30 | #include <linux/gpio.h> | ||
| 31 | #include <linux/platform_data/leds-omap.h> | ||
| 32 | |||
| 33 | #include <asm/mach-types.h> | ||
| 34 | #include <asm/mach/arch.h> | ||
| 35 | #include <asm/mach/flash.h> | ||
| 36 | |||
| 37 | #include "common.h" | ||
| 38 | #include "gpmc.h" | ||
| 39 | |||
| 40 | #include <video/omapdss.h> | ||
| 41 | #include <video/omap-panel-generic-dpi.h> | ||
| 42 | |||
| 43 | #include "mux.h" | ||
| 44 | #include "control.h" | ||
| 45 | |||
| 46 | /* LED & Switch macros */ | ||
| 47 | #define LED0_GPIO13 13 | ||
| 48 | #define LED1_GPIO14 14 | ||
| 49 | #define LED2_GPIO15 15 | ||
| 50 | #define SW_ENTER_GPIO16 16 | ||
| 51 | #define SW_UP_GPIO17 17 | ||
| 52 | #define SW_DOWN_GPIO58 58 | ||
| 53 | |||
| 54 | #define APOLLON_FLASH_CS 0 | ||
| 55 | #define APOLLON_ETH_CS 1 | ||
| 56 | #define APOLLON_ETHR_GPIO_IRQ 74 | ||
| 57 | |||
| 58 | static struct mtd_partition apollon_partitions[] = { | ||
| 59 | { | ||
| 60 | .name = "X-Loader + U-Boot", | ||
| 61 | .offset = 0, | ||
| 62 | .size = SZ_128K, | ||
| 63 | .mask_flags = MTD_WRITEABLE, | ||
| 64 | }, | ||
| 65 | { | ||
| 66 | .name = "params", | ||
| 67 | .offset = MTDPART_OFS_APPEND, | ||
| 68 | .size = SZ_128K, | ||
| 69 | }, | ||
| 70 | { | ||
| 71 | .name = "kernel", | ||
| 72 | .offset = MTDPART_OFS_APPEND, | ||
| 73 | .size = SZ_2M, | ||
| 74 | }, | ||
| 75 | { | ||
| 76 | .name = "rootfs", | ||
| 77 | .offset = MTDPART_OFS_APPEND, | ||
| 78 | .size = SZ_16M, | ||
| 79 | }, | ||
| 80 | { | ||
| 81 | .name = "filesystem00", | ||
| 82 | .offset = MTDPART_OFS_APPEND, | ||
| 83 | .size = SZ_32M, | ||
| 84 | }, | ||
| 85 | { | ||
| 86 | .name = "filesystem01", | ||
| 87 | .offset = MTDPART_OFS_APPEND, | ||
| 88 | .size = MTDPART_SIZ_FULL, | ||
| 89 | }, | ||
| 90 | }; | ||
| 91 | |||
| 92 | static struct onenand_platform_data apollon_flash_data = { | ||
| 93 | .parts = apollon_partitions, | ||
| 94 | .nr_parts = ARRAY_SIZE(apollon_partitions), | ||
| 95 | }; | ||
| 96 | |||
| 97 | static struct resource apollon_flash_resource[] = { | ||
| 98 | [0] = { | ||
| 99 | .flags = IORESOURCE_MEM, | ||
| 100 | }, | ||
| 101 | }; | ||
| 102 | |||
| 103 | static struct platform_device apollon_onenand_device = { | ||
| 104 | .name = "onenand-flash", | ||
| 105 | .id = -1, | ||
| 106 | .dev = { | ||
| 107 | .platform_data = &apollon_flash_data, | ||
| 108 | }, | ||
| 109 | .num_resources = ARRAY_SIZE(apollon_flash_resource), | ||
| 110 | .resource = apollon_flash_resource, | ||
| 111 | }; | ||
| 112 | |||
| 113 | static void __init apollon_flash_init(void) | ||
| 114 | { | ||
| 115 | unsigned long base; | ||
| 116 | |||
| 117 | if (gpmc_cs_request(APOLLON_FLASH_CS, SZ_128K, &base) < 0) { | ||
| 118 | printk(KERN_ERR "Cannot request OneNAND GPMC CS\n"); | ||
| 119 | return; | ||
| 120 | } | ||
| 121 | apollon_flash_resource[0].start = base; | ||
| 122 | apollon_flash_resource[0].end = base + SZ_128K - 1; | ||
| 123 | } | ||
| 124 | |||
| 125 | static struct smc91x_platdata appolon_smc91x_info = { | ||
| 126 | .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, | ||
| 127 | .leda = RPC_LED_100_10, | ||
| 128 | .ledb = RPC_LED_TX_RX, | ||
| 129 | }; | ||
| 130 | |||
| 131 | static struct resource apollon_smc91x_resources[] = { | ||
| 132 | [0] = { | ||
| 133 | .flags = IORESOURCE_MEM, | ||
| 134 | }, | ||
| 135 | [1] = { | ||
| 136 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | ||
| 137 | }, | ||
| 138 | }; | ||
| 139 | |||
| 140 | static struct platform_device apollon_smc91x_device = { | ||
| 141 | .name = "smc91x", | ||
| 142 | .id = -1, | ||
| 143 | .dev = { | ||
| 144 | .platform_data = &appolon_smc91x_info, | ||
| 145 | }, | ||
| 146 | .num_resources = ARRAY_SIZE(apollon_smc91x_resources), | ||
| 147 | .resource = apollon_smc91x_resources, | ||
| 148 | }; | ||
| 149 | |||
| 150 | static struct omap_led_config apollon_led_config[] = { | ||
| 151 | { | ||
| 152 | .cdev = { | ||
| 153 | .name = "apollon:led0", | ||
| 154 | }, | ||
| 155 | .gpio = LED0_GPIO13, | ||
| 156 | }, | ||
