aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2016-08-06 00:56:24 -0400
committerShawn Guo <shawnguo@kernel.org>2016-08-09 10:47:22 -0400
commitde2d6662ece073b1b02e94678f77c47646920f17 (patch)
tree91e86306113a6102624a0a6211a14612710295f2
parent5081c3262f0466e52e6ce49453a5603fd85e048a (diff)
ARM: i.MX: Remove i.MX1 Synertronixx SCB9328 board support
Synertronixx SCB9328 board is very similar to Armadeus APF9328, so it can be easily reimplemented in DT way. This patch removes support for non-DT support for this board. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig1
-rw-r--r--arch/arm/configs/multi_v4t_defconfig1
-rw-r--r--arch/arm/mach-imx/Kconfig7
-rw-r--r--arch/arm/mach-imx/Makefile1
-rw-r--r--arch/arm/mach-imx/mach-scb9328.c143
5 files changed, 0 insertions, 153 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 2b2d589017b9..e70032cc4669 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -22,7 +22,6 @@ CONFIG_ARCH_MULTI_V4T=y
22CONFIG_ARCH_MULTI_V5=y 22CONFIG_ARCH_MULTI_V5=y
23# CONFIG_ARCH_MULTI_V7 is not set 23# CONFIG_ARCH_MULTI_V7 is not set
24CONFIG_ARCH_MXC=y 24CONFIG_ARCH_MXC=y
25CONFIG_MACH_SCB9328=y
26CONFIG_MACH_MX21ADS=y 25CONFIG_MACH_MX21ADS=y
27CONFIG_MACH_MX27ADS=y 26CONFIG_MACH_MX27ADS=y
28CONFIG_MACH_MX27_3DS=y 27CONFIG_MACH_MX27_3DS=y
diff --git a/arch/arm/configs/multi_v4t_defconfig b/arch/arm/configs/multi_v4t_defconfig
index d744692f308d..141492a7ebc0 100644
--- a/arch/arm/configs/multi_v4t_defconfig
+++ b/arch/arm/configs/multi_v4t_defconfig
@@ -20,7 +20,6 @@ CONFIG_INTEGRATOR_CM720T=y
20CONFIG_INTEGRATOR_CM920T=y 20CONFIG_INTEGRATOR_CM920T=y
21CONFIG_INTEGRATOR_CM922T_XA10=y 21CONFIG_INTEGRATOR_CM922T_XA10=y
22CONFIG_ARCH_MXC=y 22CONFIG_ARCH_MXC=y
23CONFIG_MACH_SCB9328=y
24CONFIG_MACH_IMX1_DT=y 23CONFIG_MACH_IMX1_DT=y
25CONFIG_ARCH_NSPIRE=y 24CONFIG_ARCH_NSPIRE=y
26CONFIG_AEABI=y 25CONFIG_AEABI=y
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 52dd9440f04f..7aa8f814d226 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -102,13 +102,6 @@ if ARCH_MULTI_V4T
102 102
103comment "MX1 platforms:" 103comment "MX1 platforms:"
104 104
105config MACH_SCB9328
106 bool "Synertronixx scb9328"
107 select IMX_HAVE_PLATFORM_IMX_UART
108 select SOC_IMX1
109 help
110 Say Y here if you are using a Synertronixx scb9328 board
111
112config MACH_IMX1_DT 105config MACH_IMX1_DT
113 bool "Support i.MX1 platforms from device tree" 106 bool "Support i.MX1 platforms from device tree"
114 select SOC_IMX1 107 select SOC_IMX1
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 3bbd06d76cba..5e33873d0160 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -36,7 +36,6 @@ obj-y += ssi-fiq-ksym.o
36endif 36endif
37 37
38# i.MX1 based machines 38# i.MX1 based machines
39obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
40obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o 39obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o
41 40
42# i.MX21 based machines 41# i.MX21 based machines
diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c
deleted file mode 100644
index 1f6bc3f7ae14..000000000000
--- a/arch/arm/mach-imx/mach-scb9328.c
+++ /dev/null
@@ -1,143 +0,0 @@
1/*
2 * linux/arch/arm/mach-mx1/mach-scb9328.c
3 *
4 * Copyright (c) 2004 Sascha Hauer <saschahauer@web.de>
5 * Copyright (c) 2006-2008 Juergen Beisert <jbeisert@netscape.net>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation.
10 *
11 */
12
13#include <linux/platform_device.h>
14#include <linux/mtd/physmap.h>
15#include <linux/interrupt.h>
16#include <linux/dm9000.h>
17#include <linux/gpio.h>
18
19#include <asm/mach-types.h>
20#include <asm/mach/arch.h>
21#include <asm/mach/time.h>
22
23#include "common.h"
24#include "devices-imx1.h"
25#include "hardware.h"
26#include "iomux-mx1.h"
27
28/*
29 * This scb9328 has a 32MiB flash
30 */
31static struct resource flash_resource = {
32 .start = MX1_CS0_PHYS,
33 .end = MX1_CS0_PHYS + (32 * 1024 * 1024) - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct physmap_flash_data scb_flash_data = {
38 .width = 2,
39};
40
41static struct platform_device scb_flash_device = {
42 .name = "physmap-flash",
43 .id = 0,
44 .dev = {
45 .platform_data = &scb_flash_data,
46 },
47 .resource = &flash_resource,
48 .num_resources = 1,
49};
50
51/*
52 * scb9328 has a DM9000 network controller
53 * connected to CS5, with 16 bit data path
54 * and interrupt connected to GPIO 3
55 */
56
57/*
58 * internal datapath is fixed 16 bit
59 */
60static struct dm9000_plat_data dm9000_platdata = {
61 .flags = DM9000_PLATF_16BITONLY,
62};
63
64/*
65 * the DM9000 drivers wants two defined address spaces
66 * to gain access to address latch registers and the data path.
67 */
68static struct resource dm9000x_resources[] = {
69 {
70 .name = "address area",
71 .start = MX1_CS5_PHYS,
72 .end = MX1_CS5_PHYS + 1,
73 .flags = IORESOURCE_MEM, /* address access */
74 }, {
75 .name = "data area",
76 .start = MX1_CS5_PHYS + 4,
77 .end = MX1_CS5_PHYS + 5,
78 .flags = IORESOURCE_MEM, /* data access */
79 }, {
80 /* irq number is run-time assigned */
81 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
82 },
83};
84
85static struct platform_device dm9000x_device = {
86 .name = "dm9000",
87 .id = 0,
88 .num_resources = ARRAY_SIZE(dm9000x_resources),
89 .resource = dm9000x_resources,
90 .dev = {
91 .platform_data = &dm9000_platdata,
92 }
93};
94
95static const int mxc_uart1_pins[] = {
96 PC9_PF_UART1_CTS,
97 PC10_PF_UART1_RTS,
98 PC11_PF_UART1_TXD,
99 PC12_PF_UART1_RXD,
100};
101
102static const struct imxuart_platform_data uart_pdata __initconst = {
103 .flags = IMXUART_HAVE_RTSCTS,
104};
105
106static struct platform_device *devices[] __initdata = {
107 &scb_flash_device,
108 &dm9000x_device,
109};
110
111/*
112 * scb9328_init - Init the CPU card itself
113 */
114static void __init scb9328_init(void)
115{
116 imx1_soc_init();
117
118 mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
119 ARRAY_SIZE(mxc_uart1_pins), "UART1");
120
121 imx1_add_imx_uart0(&uart_pdata);
122
123 printk(KERN_INFO"Scb9328: Adding devices\n");
124 dm9000x_resources[2].start = gpio_to_irq(IMX_GPIO_NR(3, 3));
125 dm9000x_resources[2].end = gpio_to_irq(IMX_GPIO_NR(3, 3));
126 platform_add_devices(devices, ARRAY_SIZE(devices));
127}
128
129static void __init scb9328_timer_init(void)
130{
131 mx1_clocks_init(32000);
132}
133
134MACHINE_START(SCB9328, "Synertronixx scb9328")
135 /* Sascha Hauer */
136 .atag_offset = 100,
137 .map_io = mx1_map_io,
138 .init_early = imx1_init_early,
139 .init_irq = mx1_init_irq,
140 .init_time = scb9328_timer_init,
141 .init_machine = scb9328_init,
142 .restart = mxc_restart,
143MACHINE_END