diff options
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 9 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx27ipcam.c | 77 |
4 files changed, 0 insertions, 88 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 397f43c0b9a4..68abce917e49 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -39,7 +39,6 @@ CONFIG_MACH_IMX27_VISSTRIM_M10=y | |||
39 | CONFIG_MACH_IMX27LITE=y | 39 | CONFIG_MACH_IMX27LITE=y |
40 | CONFIG_MACH_PCA100=y | 40 | CONFIG_MACH_PCA100=y |
41 | CONFIG_MACH_MXT_TD60=y | 41 | CONFIG_MACH_MXT_TD60=y |
42 | CONFIG_MACH_IMX27IPCAM=y | ||
43 | CONFIG_MACH_IMX27_DT=y | 42 | CONFIG_MACH_IMX27_DT=y |
44 | CONFIG_PREEMPT=y | 43 | CONFIG_PREEMPT=y |
45 | CONFIG_AEABI=y | 44 | CONFIG_AEABI=y |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 83d877824173..bdfe2764a045 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -394,15 +394,6 @@ config MACH_MXT_TD60 | |||
394 | Include support for i-MXT (aka td60) platform. This | 394 | Include support for i-MXT (aka td60) platform. This |
395 | includes specific configurations for the module and its peripherals. | 395 | includes specific configurations for the module and its peripherals. |
396 | 396 | ||
397 | config MACH_IMX27IPCAM | ||
398 | bool "IMX27 IPCAM platform" | ||
399 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
400 | select IMX_HAVE_PLATFORM_IMX_UART | ||
401 | select SOC_IMX27 | ||
402 | help | ||
403 | Include support for IMX27 IPCAM platform. This includes specific | ||
404 | configurations for the board and its peripherals. | ||
405 | |||
406 | config MACH_IMX27_DT | 397 | config MACH_IMX27_DT |
407 | bool "Support i.MX27 platforms from device tree" | 398 | bool "Support i.MX27 platforms from device tree" |
408 | select SOC_IMX27 | 399 | select SOC_IMX27 |
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 2c8ca00b7398..a364e2043191 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
@@ -66,7 +66,6 @@ obj-$(CONFIG_MACH_CPUIMX27) += mach-cpuimx27.o | |||
66 | obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o | 66 | obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o |
67 | obj-$(CONFIG_MACH_PCA100) += mach-pca100.o | 67 | obj-$(CONFIG_MACH_PCA100) += mach-pca100.o |
68 | obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o | 68 | obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o |
69 | obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o | ||
70 | obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o | 69 | obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o |
71 | 70 | ||
72 | # i.MX31 based machines | 71 | # i.MX31 based machines |
diff --git a/arch/arm/mach-imx/mach-imx27ipcam.c b/arch/arm/mach-imx/mach-imx27ipcam.c deleted file mode 100644 index bb3ca0429680..000000000000 --- a/arch/arm/mach-imx/mach-imx27ipcam.c +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | * | ||
4 | * Author: Fabio Estevam <fabio.estevam@freescale.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | */ | ||
16 | |||
17 | #include <asm/mach-types.h> | ||
18 | #include <asm/mach/arch.h> | ||
19 | #include <asm/mach/time.h> | ||
20 | |||
21 | #include "hardware.h" | ||
22 | #include "common.h" | ||
23 | #include "devices-imx27.h" | ||
24 | #include "iomux-mx27.h" | ||
25 | |||
26 | static const int mx27ipcam_pins[] __initconst = { | ||
27 | /* UART1 */ | ||
28 | PE12_PF_UART1_TXD, | ||
29 | PE13_PF_UART1_RXD, | ||
30 | /* FEC */ | ||
31 | PD0_AIN_FEC_TXD0, | ||
32 | PD1_AIN_FEC_TXD1, | ||
33 | PD2_AIN_FEC_TXD2, | ||
34 | PD3_AIN_FEC_TXD3, | ||
35 | PD4_AOUT_FEC_RX_ER, | ||
36 | PD5_AOUT_FEC_RXD1, | ||
37 | PD6_AOUT_FEC_RXD2, | ||
38 | PD7_AOUT_FEC_RXD3, | ||
39 | PD8_AF_FEC_MDIO, | ||
40 | PD9_AIN_FEC_MDC, | ||
41 | PD10_AOUT_FEC_CRS, | ||
42 | PD11_AOUT_FEC_TX_CLK, | ||
43 | PD12_AOUT_FEC_RXD0, | ||
44 | PD13_AOUT_FEC_RX_DV, | ||
45 | PD14_AOUT_FEC_RX_CLK, | ||
46 | PD15_AOUT_FEC_COL, | ||
47 | PD16_AIN_FEC_TX_ER, | ||
48 | PF23_AIN_FEC_TX_EN, | ||
49 | }; | ||
50 | |||
51 | static void __init mx27ipcam_init(void) | ||
52 | { | ||
53 | imx27_soc_init(); | ||
54 | |||
55 | mxc_gpio_setup_multiple_pins(mx27ipcam_pins, ARRAY_SIZE(mx27ipcam_pins), | ||
56 | "mx27ipcam"); | ||
57 | |||
58 | imx27_add_imx_uart0(NULL); | ||
59 | imx27_add_fec(NULL); | ||
60 | imx27_add_imx2_wdt(); | ||
61 | } | ||
62 | |||
63 | static void __init mx27ipcam_timer_init(void) | ||
64 | { | ||
65 | mx27_clocks_init(25000000); | ||
66 | } | ||
67 | |||
68 | MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM") | ||
69 | /* maintainer: Freescale Semiconductor, Inc. */ | ||
70 | .atag_offset = 0x100, | ||
71 | .map_io = mx27_map_io, | ||
72 | .init_early = imx27_init_early, | ||
73 | .init_irq = mx27_init_irq, | ||
74 | .init_time = mx27ipcam_timer_init, | ||
75 | .init_machine = mx27ipcam_init, | ||
76 | .restart = mxc_restart, | ||
77 | MACHINE_END | ||