diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-01-20 23:02:08 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-01-29 01:05:42 -0500 |
commit | d0ab36c94d397fd203d07e2c46b41543d65276b8 (patch) | |
tree | 6a0ddb5014213373a138aa959c1f094628c3cc2e | |
parent | 3e549a69469775ae26dd3bc34365e6da5bdbf18c (diff) |
ARM: imx: Remove mach-mx51_3ds board
mach-mx51_3ds only supports old silicon version of MX51 and was replaced
with mx51 babbage, which is the official MX51 development board.
No need to maintain it anymore.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 13 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx51_3ds.c | 178 |
4 files changed, 0 insertions, 193 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 69667133321f..6dddbf877b0c 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -32,7 +32,6 @@ CONFIG_MACH_PCM043=y | |||
32 | CONFIG_MACH_MX35_3DS=y | 32 | CONFIG_MACH_MX35_3DS=y |
33 | CONFIG_MACH_VPR200=y | 33 | CONFIG_MACH_VPR200=y |
34 | CONFIG_MACH_IMX51_DT=y | 34 | CONFIG_MACH_IMX51_DT=y |
35 | CONFIG_MACH_MX51_3DS=y | ||
36 | CONFIG_MACH_EUKREA_CPUIMX51SD=y | 35 | CONFIG_MACH_EUKREA_CPUIMX51SD=y |
37 | CONFIG_SOC_IMX53=y | 36 | CONFIG_SOC_IMX53=y |
38 | CONFIG_SOC_IMX6Q=y | 37 | CONFIG_SOC_IMX6Q=y |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ae3bd5469226..97d15d5e3698 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -776,19 +776,6 @@ config MACH_MX51_BABBAGE | |||
776 | u-boot. This includes specific configurations for the board and its | 776 | u-boot. This includes specific configurations for the board and its |
777 | peripherals. | 777 | peripherals. |
778 | 778 | ||
779 | config MACH_MX51_3DS | ||
780 | bool "Support MX51PDK (3DS)" | ||
781 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
782 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | ||
783 | select IMX_HAVE_PLATFORM_IMX_UART | ||
784 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
785 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
786 | select MXC_DEBUG_BOARD | ||
787 | select SOC_IMX51 | ||
788 | help | ||
789 | Include support for MX51PDK (3DS) platform. This includes specific | ||
790 | configurations for the board and its peripherals. | ||
791 | |||
792 | config MACH_EUKREA_CPUIMX51SD | 779 | config MACH_EUKREA_CPUIMX51SD |
793 | bool "Support Eukrea CPUIMX51SD module" | 780 | bool "Support Eukrea CPUIMX51SD module" |
794 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 781 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index f35eb397bd50..5a2d88ec3b76 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
@@ -102,7 +102,6 @@ endif | |||
102 | 102 | ||
103 | # i.MX5 based machines | 103 | # i.MX5 based machines |
104 | obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o | 104 | obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o |
105 | obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o | ||
106 | obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o | 105 | obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o |
107 | obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o | 106 | obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o |
108 | obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o | 107 | obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o |
diff --git a/arch/arm/mach-imx/mach-mx51_3ds.c b/arch/arm/mach-imx/mach-mx51_3ds.c deleted file mode 100644 index abc25bd1107b..000000000000 --- a/arch/arm/mach-imx/mach-mx51_3ds.c +++ /dev/null | |||
@@ -1,178 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | * Copyright (C) 2010 Jason Wang <jason77.wang@gmail.com> | ||
4 | * | ||
5 | * The code contained herein is licensed under the GNU General Public | ||
6 | * License. You may obtain a copy of the GNU General Public License | ||
7 | * Version 2 or later at the following locations: | ||
8 | * | ||
9 | * http://www.opensource.org/licenses/gpl-license.html | ||
10 | * http://www.gnu.org/copyleft/gpl.html | ||
11 | */ | ||
12 | |||
13 | #include <linux/irq.h> | ||
14 | #include <linux/platform_device.h> | ||
15 | #include <linux/spi/spi.h> | ||
16 | #include <linux/gpio.h> | ||
17 | |||
18 | #include <asm/mach-types.h> | ||
19 | #include <asm/mach/arch.h> | ||
20 | #include <asm/mach/time.h> | ||
21 | |||
22 | #include "3ds_debugboard.h" | ||
23 | #include "common.h" | ||
24 | #include "devices-imx51.h" | ||
25 | #include "hardware.h" | ||
26 | #include "iomux-mx51.h" | ||
27 | |||
28 | #define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28) | ||
29 | |||
30 | static iomux_v3_cfg_t mx51_3ds_pads[] = { | ||
31 | /* UART1 */ | ||
32 | MX51_PAD_UART1_RXD__UART1_RXD, | ||
33 | MX51_PAD_UART1_TXD__UART1_TXD, | ||
34 | MX51_PAD_UART1_RTS__UART1_RTS, | ||
35 | MX51_PAD_UART1_CTS__UART1_CTS, | ||
36 | |||
37 | /* UART2 */ | ||
38 | MX51_PAD_UART2_RXD__UART2_RXD, | ||
39 | MX51_PAD_UART2_TXD__UART2_TXD, | ||
40 | MX51_PAD_EIM_D25__UART2_CTS, | ||
41 | MX51_PAD_EIM_D26__UART2_RTS, | ||
42 | |||
43 | /* UART3 */ | ||
44 | MX51_PAD_UART3_RXD__UART3_RXD, | ||
45 | MX51_PAD_UART3_TXD__UART3_TXD, | ||
46 | MX51_PAD_EIM_D24__UART3_CTS, | ||
47 | MX51_PAD_EIM_D27__UART3_RTS, | ||
48 | |||
49 | /* CPLD PARENT IRQ PIN */ | ||
50 | MX51_PAD_GPIO1_6__GPIO1_6, | ||
51 | |||
52 | /* KPP */ | ||
53 | MX51_PAD_KEY_ROW0__KEY_ROW0, | ||
54 | MX51_PAD_KEY_ROW1__KEY_ROW1, | ||
55 | MX51_PAD_KEY_ROW2__KEY_ROW2, | ||
56 | MX51_PAD_KEY_ROW3__KEY_ROW3, | ||
57 | MX51_PAD_KEY_COL0__KEY_COL0, | ||
58 | MX51_PAD_KEY_COL1__KEY_COL1, | ||
59 | MX51_PAD_KEY_COL2__KEY_COL2, | ||
60 | MX51_PAD_KEY_COL3__KEY_COL3, | ||
61 | MX51_PAD_KEY_COL4__KEY_COL4, | ||
62 | MX51_PAD_KEY_COL5__KEY_COL5, | ||
63 | |||
64 | /* eCSPI2 */ | ||
65 | MX51_PAD_NANDF_RB2__ECSPI2_SCLK, | ||
66 | MX51_PAD_NANDF_RB3__ECSPI2_MISO, | ||
67 | MX51_PAD_NANDF_D15__ECSPI2_MOSI, | ||
68 | MX51_PAD_NANDF_D12__GPIO3_28, | ||
69 | }; | ||
70 | |||
71 | /* Serial ports */ | ||
72 | static const struct imxuart_platform_data uart_pdata __initconst = { | ||
73 | .flags = IMXUART_HAVE_RTSCTS, | ||
74 | }; | ||
75 | |||
76 | static int mx51_3ds_board_keymap[] = { | ||
77 | KEY(0, 0, KEY_1), | ||
78 | KEY(0, 1, KEY_2), | ||
79 | KEY(0, 2, KEY_3), | ||
80 | KEY(0, 3, KEY_F1), | ||
81 | KEY(0, 4, KEY_UP), | ||
82 | KEY(0, 5, KEY_F2), | ||
83 | |||
84 | KEY(1, 0, KEY_4), | ||
85 | KEY(1, 1, KEY_5), | ||
86 | KEY(1, 2, KEY_6), | ||
87 | KEY(1, 3, KEY_LEFT), | ||
88 | KEY(1, 4, KEY_SELECT), | ||
89 | KEY(1, 5, KEY_RIGHT), | ||
90 | |||
91 | KEY(2, 0, KEY_7), | ||
92 | KEY(2, 1, KEY_8), | ||
93 | KEY(2, 2, KEY_9), | ||
94 | KEY(2, 3, KEY_F3), | ||
95 | KEY(2, 4, KEY_DOWN), | ||
96 | KEY(2, 5, KEY_F4), | ||
97 | |||
98 | KEY(3, 0, KEY_0), | ||
99 | KEY(3, 1, KEY_OK), | ||
100 | KEY(3, 2, KEY_ESC), | ||
101 | KEY(3, 3, KEY_ENTER), | ||
102 | KEY(3, 4, KEY_MENU), | ||
103 | KEY(3, 5, KEY_BACK) | ||
104 | }; | ||
105 | |||
106 | static const struct matrix_keymap_data mx51_3ds_map_data __initconst = { | ||
107 | .keymap = mx51_3ds_board_keymap, | ||
108 | .keymap_size = ARRAY_SIZE(mx51_3ds_board_keymap), | ||
109 | }; | ||
110 | |||
111 | static int mx51_3ds_spi2_cs[] = { | ||
112 | MXC_SPI_CS(0), | ||
113 | MX51_3DS_ECSPI2_CS, | ||
114 | }; | ||
115 | |||
116 | static const struct spi_imx_master mx51_3ds_ecspi2_pdata __initconst = { | ||
117 | .chipselect = mx51_3ds_spi2_cs, | ||
118 | .num_chipselect = ARRAY_SIZE(mx51_3ds_spi2_cs), | ||
119 | }; | ||
120 | |||
121 | static struct spi_board_info mx51_3ds_spi_nor_device[] = { | ||
122 | { | ||
123 | .modalias = "m25p80", | ||
124 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
125 | .bus_num = 1, | ||
126 | .chip_select = 1, | ||
127 | .mode = SPI_MODE_0, | ||
128 | .platform_data = NULL,}, | ||
129 | }; | ||
130 | |||
131 | /* | ||
132 | * Board specific initialization. | ||
133 | */ | ||
134 | static void __init mx51_3ds_init(void) | ||
135 | { | ||
136 | imx51_soc_init(); | ||
137 | |||
138 | mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads, | ||
139 | ARRAY_SIZE(mx51_3ds_pads)); | ||
140 | |||
141 | imx51_add_imx_uart(0, &uart_pdata); | ||
142 | imx51_add_imx_uart(1, &uart_pdata); | ||
143 | imx51_add_imx_uart(2, &uart_pdata); | ||
144 | |||
145 | imx51_add_ecspi(1, &mx51_3ds_ecspi2_pdata); | ||
146 | spi_register_board_info(mx51_3ds_spi_nor_device, | ||
147 | ARRAY_SIZE(mx51_3ds_spi_nor_device)); | ||
148 | |||
149 | if (mxc_expio_init(MX51_CS5_BASE_ADDR, IMX_GPIO_NR(1, 6))) | ||
150 | printk(KERN_WARNING "Init of the debugboard failed, all " | ||
151 | "devices on the board are unusable.\n"); | ||
152 | |||
153 | imx51_add_sdhci_esdhc_imx(0, NULL); | ||
154 | imx51_add_imx_keypad(&mx51_3ds_map_data); | ||
155 | imx51_add_imx2_wdt(0); | ||
156 | } | ||
157 | |||
158 | static void __init mx51_3ds_timer_init(void) | ||
159 | { | ||
160 | mx51_clocks_init(32768, 24000000, 22579200, 0); | ||
161 | } | ||
162 | |||
163 | static struct sys_timer mx51_3ds_timer = { | ||
164 | .init = mx51_3ds_timer_init, | ||
165 | }; | ||
166 | |||
167 | MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board") | ||
168 | /* Maintainer: Freescale Semiconductor, Inc. */ | ||
169 | .atag_offset = 0x100, | ||
170 | .map_io = mx51_map_io, | ||
171 | .init_early = imx51_init_early, | ||
172 | .init_irq = mx51_init_irq, | ||
173 | .handle_irq = imx51_handle_irq, | ||
174 | .timer = &mx51_3ds_timer, | ||
175 | .init_machine = mx51_3ds_init, | ||
176 | .init_late = imx51_init_late, | ||
177 | .restart = mxc_restart, | ||
178 | MACHINE_END | ||