diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2014-08-31 07:54:14 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-01 10:00:02 -0400 |
commit | 13758c528cd3c72e1dde34b0c73be4887773bc91 (patch) | |
tree | f2aa9524abc965dd546573fed29868f34c5767eb /arch | |
parent | 2b10368a5c7dcb8fb2ce43251b1facec01a31a72 (diff) |
ARM: i.MX: Remove i.MX1 ADS board support
mx1ads.c can be replaced with devicetree equivalent: imx1-ads.dts,
so remove the board file.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 11 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx1ads.c | 154 |
4 files changed, 0 insertions, 167 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 9d73e695a8db..a3fb8662ff6c 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -22,7 +22,6 @@ CONFIG_ARCH_MULTI_V5=y | |||
22 | # CONFIG_ARCH_MULTI_V7 is not set | 22 | # CONFIG_ARCH_MULTI_V7 is not set |
23 | CONFIG_ARCH_MXC=y | 23 | CONFIG_ARCH_MXC=y |
24 | CONFIG_MXC_IRQ_PRIOR=y | 24 | CONFIG_MXC_IRQ_PRIOR=y |
25 | CONFIG_ARCH_MX1ADS=y | ||
26 | CONFIG_MACH_SCB9328=y | 25 | CONFIG_MACH_SCB9328=y |
27 | CONFIG_MACH_APF9328=y | 26 | CONFIG_MACH_APF9328=y |
28 | CONFIG_MACH_MX21ADS=y | 27 | CONFIG_MACH_MX21ADS=y |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 62d645de8bf9..1c124b10bcdf 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -108,17 +108,6 @@ config SOC_IMX35 | |||
108 | if ARCH_MULTI_V4T | 108 | if ARCH_MULTI_V4T |
109 | 109 | ||
110 | comment "MX1 platforms:" | 110 | comment "MX1 platforms:" |
111 | config MACH_MXLADS | ||
112 | bool | ||
113 | |||
114 | config ARCH_MX1ADS | ||
115 | bool "MX1ADS platform" | ||
116 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
117 | select IMX_HAVE_PLATFORM_IMX_UART | ||
118 | select MACH_MXLADS | ||
119 | select SOC_IMX1 | ||
120 | help | ||
121 | Say Y here if you are using Motorola MX1ADS/MXLADS boards | ||
122 | 111 | ||
123 | config MACH_SCB9328 | 112 | config MACH_SCB9328 |
124 | bool "Synertronixx scb9328" | 113 | bool "Synertronixx scb9328" |
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index cd30279e3692..5fdb2aa369ab 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
@@ -41,7 +41,6 @@ obj-y += ssi-fiq-ksym.o | |||
41 | endif | 41 | endif |
42 | 42 | ||
43 | # i.MX1 based machines | 43 | # i.MX1 based machines |
44 | obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o | ||
45 | obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o | 44 | obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o |
46 | obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o | 45 | obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o |
47 | 46 | ||
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c deleted file mode 100644 index 77fda3de4290..000000000000 --- a/arch/arm/mach-imx/mach-mx1ads.c +++ /dev/null | |||
@@ -1,154 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-imx/mach-mx1ads.c | ||
3 | * | ||
4 | * Initially based on: | ||
5 | * linux-2.6.7-imx/arch/arm/mach-imx/scb9328.c | ||
6 | * Copyright (c) 2004 Sascha Hauer <sascha@saschahauer.de> | ||
7 | * | ||
8 | * 2004 (c) MontaVista Software, Inc. | ||
9 | * | ||
10 | * This file is licensed under the terms of the GNU General Public | ||
11 | * License version 2. This program is licensed "as is" without any | ||
12 | * warranty of any kind, whether express or implied. | ||
13 | */ | ||
14 | |||
15 | #include <linux/i2c.h> | ||
16 | #include <linux/i2c/pcf857x.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/kernel.h> | ||
19 | #include <linux/platform_device.h> | ||
20 | #include <linux/mtd/physmap.h> | ||
21 | |||
22 | #include <asm/mach-types.h> | ||
23 | #include <asm/mach/arch.h> | ||
24 | #include <asm/mach/time.h> | ||
25 | |||
26 | #include "common.h" | ||
27 | #include "devices-imx1.h" | ||
28 | #include "hardware.h" | ||
29 | #include "iomux-mx1.h" | ||
30 | |||
31 | static const int mx1ads_pins[] __initconst = { | ||
32 | /* UART1 */ | ||
33 | PC9_PF_UART1_CTS, | ||
34 | PC10_PF_UART1_RTS, | ||
35 | PC11_PF_UART1_TXD, | ||
36 | PC12_PF_UART1_RXD, | ||
37 | /* UART2 */ | ||
38 | PB28_PF_UART2_CTS, | ||
39 | PB29_PF_UART2_RTS, | ||
40 | PB30_PF_UART2_TXD, | ||
41 | PB31_PF_UART2_RXD, | ||
42 | /* I2C */ | ||
43 | PA15_PF_I2C_SDA, | ||
44 | PA16_PF_I2C_SCL, | ||
45 | /* SPI */ | ||
46 | PC13_PF_SPI1_SPI_RDY, | ||
47 | PC14_PF_SPI1_SCLK, | ||
48 | PC15_PF_SPI1_SS, | ||
49 | PC16_PF_SPI1_MISO, | ||
50 | PC17_PF_SPI1_MOSI, | ||
51 | }; | ||
52 | |||
53 | /* | ||
54 | * UARTs platform data | ||
55 | */ | ||
56 | |||
57 | static const struct imxuart_platform_data uart0_pdata __initconst = { | ||
58 | .flags = IMXUART_HAVE_RTSCTS, | ||
59 | }; | ||
60 | |||
61 | static const struct imxuart_platform_data uart1_pdata __initconst = { | ||
62 | .flags = IMXUART_HAVE_RTSCTS, | ||
63 | }; | ||
64 | |||
65 | /* | ||
66 | * Physmap flash | ||
67 | */ | ||
68 | |||
69 | static const struct physmap_flash_data mx1ads_flash_data __initconst = { | ||
70 | .width = 4, /* bankwidth in bytes */ | ||
71 | }; | ||
72 | |||
73 | static const struct resource flash_resource __initconst = { | ||
74 | .start = MX1_CS0_PHYS, | ||
75 | .end = MX1_CS0_PHYS + SZ_32M - 1, | ||
76 | .flags = IORESOURCE_MEM, | ||
77 | }; | ||
78 | |||
79 | /* | ||
80 | * I2C | ||
81 | */ | ||
82 | static struct pcf857x_platform_data pcf857x_data[] = { | ||
83 | { | ||
84 | .gpio_base = 4 * 32, | ||
85 | }, { | ||
86 | .gpio_base = 4 * 32 + 16, | ||
87 | } | ||
88 | }; | ||
89 | |||
90 | static const struct imxi2c_platform_data mx1ads_i2c_data __initconst = { | ||
91 | .bitrate = 100000, | ||
92 | }; | ||
93 | |||
94 | static struct i2c_board_info mx1ads_i2c_devices[] = { | ||
95 | { | ||
96 | I2C_BOARD_INFO("pcf8575", 0x22), | ||
97 | .platform_data = &pcf857x_data[0], | ||
98 | }, { | ||
99 | I2C_BOARD_INFO("pcf8575", 0x24), | ||
100 | .platform_data = &pcf857x_data[1], | ||
101 | }, | ||
102 | }; | ||
103 | |||
104 | /* | ||
105 | * Board init | ||
106 | */ | ||
107 | static void __init mx1ads_init(void) | ||
108 | { | ||
109 | imx1_soc_init(); | ||
110 | |||
111 | mxc_gpio_setup_multiple_pins(mx1ads_pins, | ||
112 | ARRAY_SIZE(mx1ads_pins), "mx1ads"); | ||
113 | |||
114 | /* UART */ | ||
115 | imx1_add_imx_uart0(&uart0_pdata); | ||
116 | imx1_add_imx_uart1(&uart1_pdata); | ||
117 | |||
118 | /* Physmap flash */ | ||
119 | platform_device_register_resndata(NULL, "physmap-flash", 0, | ||
120 | &flash_resource, 1, | ||
121 | &mx1ads_flash_data, sizeof(mx1ads_flash_data)); | ||
122 | |||
123 | /* I2C */ | ||
124 | i2c_register_board_info(0, mx1ads_i2c_devices, | ||
125 | ARRAY_SIZE(mx1ads_i2c_devices)); | ||
126 | |||
127 | imx1_add_imx_i2c(&mx1ads_i2c_data); | ||
128 | } | ||
129 | |||
130 | static void __init mx1ads_timer_init(void) | ||
131 | { | ||
132 | mx1_clocks_init(32000); | ||
133 | } | ||
134 | |||
135 | MACHINE_START(MX1ADS, "Freescale MX1ADS") | ||
136 | /* Maintainer: Sascha Hauer, Pengutronix */ | ||
137 | .atag_offset = 0x100, | ||
138 | .map_io = mx1_map_io, | ||
139 | .init_early = imx1_init_early, | ||
140 | .init_irq = mx1_init_irq, | ||
141 | .init_time = mx1ads_timer_init, | ||
142 | .init_machine = mx1ads_init, | ||
143 | .restart = mxc_restart, | ||
144 | MACHINE_END | ||
145 | |||
146 | MACHINE_START(MXLADS, "Freescale MXLADS") | ||
147 | .atag_offset = 0x100, | ||
148 | .map_io = mx1_map_io, | ||
149 | .init_early = imx1_init_early, | ||
150 | .init_irq = mx1_init_irq, | ||
151 | .init_time = mx1ads_timer_init, | ||
152 | .init_machine = mx1ads_init, | ||
153 | .restart = mxc_restart, | ||
154 | MACHINE_END | ||