aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/Makefile1
-rw-r--r--arch/arm/mach-imx/3ds_debugboard.c (renamed from arch/arm/plat-mxc/3ds_debugboard.c)0
-rw-r--r--arch/arm/mach-imx/Kconfig80
-rw-r--r--arch/arm/mach-imx/Makefile17
-rw-r--r--arch/arm/mach-imx/avic.c (renamed from arch/arm/plat-mxc/avic.c)0
-rw-r--r--arch/arm/mach-imx/cpu.c (renamed from arch/arm/plat-mxc/cpu.c)0
-rw-r--r--arch/arm/mach-imx/cpufreq.c (renamed from arch/arm/plat-mxc/cpufreq.c)0
-rw-r--r--arch/arm/mach-imx/cpuidle.c (renamed from arch/arm/plat-mxc/cpuidle.c)0
-rw-r--r--arch/arm/mach-imx/epit.c (renamed from arch/arm/plat-mxc/epit.c)0
-rw-r--r--arch/arm/mach-imx/include/mach/common.h (renamed from arch/arm/plat-mxc/include/mach/common.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/cpuidle.h (renamed from arch/arm/plat-mxc/include/mach/cpuidle.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/debug-macro.S (renamed from arch/arm/plat-mxc/include/mach/debug-macro.S)0
-rw-r--r--arch/arm/mach-imx/include/mach/hardware.h (renamed from arch/arm/plat-mxc/include/mach/hardware.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/iim.h (renamed from arch/arm/plat-mxc/include/mach/iim.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/ipu.h (renamed from arch/arm/plat-mxc/include/mach/ipu.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/iram.h (renamed from arch/arm/plat-mxc/include/mach/iram.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/irqs.h (renamed from arch/arm/plat-mxc/include/mach/irqs.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx1.h (renamed from arch/arm/plat-mxc/include/mach/mx1.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx21.h (renamed from arch/arm/plat-mxc/include/mach/mx21.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx25.h (renamed from arch/arm/plat-mxc/include/mach/mx25.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx27.h (renamed from arch/arm/plat-mxc/include/mach/mx27.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx2x.h (renamed from arch/arm/plat-mxc/include/mach/mx2x.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx31.h (renamed from arch/arm/plat-mxc/include/mach/mx31.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx35.h (renamed from arch/arm/plat-mxc/include/mach/mx35.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx3x.h (renamed from arch/arm/plat-mxc/include/mach/mx3x.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx50.h (renamed from arch/arm/plat-mxc/include/mach/mx50.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx51.h (renamed from arch/arm/plat-mxc/include/mach/mx51.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx53.h (renamed from arch/arm/plat-mxc/include/mach/mx53.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mx6q.h (renamed from arch/arm/plat-mxc/include/mach/mx6q.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/mxc.h (renamed from arch/arm/plat-mxc/include/mach/mxc.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/timex.h (renamed from arch/arm/plat-mxc/include/mach/timex.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/ulpi.h (renamed from arch/arm/plat-mxc/include/mach/ulpi.h)0
-rw-r--r--arch/arm/mach-imx/include/mach/uncompress.h (renamed from arch/arm/plat-mxc/include/mach/uncompress.h)0
-rw-r--r--arch/arm/mach-imx/iram_alloc.c (renamed from arch/arm/plat-mxc/iram_alloc.c)0
-rw-r--r--arch/arm/mach-imx/irq-common.c (renamed from arch/arm/plat-mxc/irq-common.c)0
-rw-r--r--arch/arm/mach-imx/irq-common.h (renamed from arch/arm/plat-mxc/irq-common.h)0
-rw-r--r--arch/arm/mach-imx/ssi-fiq-ksym.c (renamed from arch/arm/plat-mxc/ssi-fiq-ksym.c)0
-rw-r--r--arch/arm/mach-imx/ssi-fiq.S (renamed from arch/arm/plat-mxc/ssi-fiq.S)0
-rw-r--r--arch/arm/mach-imx/system.c (renamed from arch/arm/plat-mxc/system.c)0
-rw-r--r--arch/arm/mach-imx/time.c (renamed from arch/arm/plat-mxc/time.c)0
-rw-r--r--arch/arm/mach-imx/tzic.c (renamed from arch/arm/plat-mxc/tzic.c)0
-rw-r--r--arch/arm/mach-imx/ulpi.c (renamed from arch/arm/plat-mxc/ulpi.c)0
-rw-r--r--arch/arm/plat-mxc/Kconfig81
-rw-r--r--arch/arm/plat-mxc/Makefile20
45 files changed, 98 insertions, 103 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 73067efd4845..bffd47a3855c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1058,7 +1058,7 @@ source "arch/arm/mach-msm/Kconfig"
1058 1058
1059source "arch/arm/mach-mv78xx0/Kconfig" 1059source "arch/arm/mach-mv78xx0/Kconfig"
1060 1060
1061source "arch/arm/plat-mxc/Kconfig" 1061source "arch/arm/mach-imx/Kconfig"
1062 1062
1063source "arch/arm/mach-mxs/Kconfig" 1063source "arch/arm/mach-mxs/Kconfig"
1064 1064
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index f023e3acdfbd..451757d85ee3 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -195,7 +195,6 @@ machine-$(CONFIG_ARCH_ZYNQ) += zynq
195 195
196# Platform directory name. This list is sorted alphanumerically 196# Platform directory name. This list is sorted alphanumerically
197# by CONFIG_* macro name. 197# by CONFIG_* macro name.
198plat-$(CONFIG_ARCH_MXC) += mxc
199plat-$(CONFIG_ARCH_OMAP) += omap 198plat-$(CONFIG_ARCH_OMAP) += omap
200plat-$(CONFIG_ARCH_S3C64XX) += samsung 199plat-$(CONFIG_ARCH_S3C64XX) += samsung
201plat-$(CONFIG_ARCH_ZYNQ) += versatile 200plat-$(CONFIG_ARCH_ZYNQ) += versatile
diff --git a/arch/arm/plat-mxc/3ds_debugboard.c b/arch/arm/mach-imx/3ds_debugboard.c
index 5c10ad05df74..5c10ad05df74 100644
--- a/arch/arm/plat-mxc/3ds_debugboard.c
+++ b/arch/arm/mach-imx/3ds_debugboard.c
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index dffa273b124e..05ded3748d78 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,3 +1,54 @@
1if ARCH_MXC
2
3config MXC_IRQ_PRIOR
4 bool "Use IRQ priority"
5 help
6 Select this if you want to use prioritized IRQ handling.
7 This feature prevents higher priority ISR to be interrupted
8 by lower priority IRQ even IRQF_DISABLED flag is not set.
9 This may be useful in embedded applications, where are strong
10 requirements for timing.
11 Say N here, unless you have a specialized requirement.
12
13config MXC_TZIC
14 bool
15
16config MXC_AVIC
17 bool
18
19config MXC_DEBUG_BOARD
20 bool "Enable MXC debug board(for 3-stack)"
21 help
22 The debug board is an integral part of the MXC 3-stack(PDK)
23 platforms, it can be attached or removed from the peripheral
24 board. On debug board, several debug devices(ethernet, UART,
25 buttons, LEDs and JTAG) are implemented. Between the MCU and
26 these devices, a CPLD is added as a bridge which performs
27 data/address de-multiplexing and decode, signal level shift,
28 interrupt control and various board functions.
29
30config HAVE_EPIT
31 bool
32
33config MXC_USE_EPIT
34 bool "Use EPIT instead of GPT"
35 depends on HAVE_EPIT
36 help
37 Use EPIT as the system timer on systems that have it. Normally you
38 don't have a reason to do so as the EPIT has the same features and
39 uses the same clocks as the GPT. Anyway, on some systems the GPT
40 may be in use for other purposes.
41
42config MXC_ULPI
43 bool
44
45config ARCH_HAS_RNGA
46 bool
47
48config IRAM_ALLOC
49 bool
50 select GENERIC_ALLOCATOR
51
1config HAVE_IMX_GPC 52config HAVE_IMX_GPC
2 bool 53 bool
3 54
@@ -110,6 +161,20 @@ config SOC_IMX51
110 select PINCTRL_IMX51 161 select PINCTRL_IMX51
111 select SOC_IMX5 162 select SOC_IMX5
112 163
164menu "Freescale MXC Implementations"
165
166choice
167 prompt "Freescale CPU family:"
168 default ARCH_IMX_V6_V7
169
170config ARCH_IMX_V4_V5
171 bool "i.MX1, i.MX21, i.MX25, i.MX27"
172 select ARM_PATCH_PHYS_VIRT
173 select AUTO_ZRELADDR if !ZBOOT_ROM
174 help
175 This enables support for systems based on the Freescale i.MX ARMv4
176 and ARMv5 SoCs
177
113if ARCH_IMX_V4_V5 178if ARCH_IMX_V4_V5
114 179
115comment "MX1 platforms:" 180comment "MX1 platforms:"
@@ -390,6 +455,15 @@ config MACH_IMX27_DT
390 455
391endif 456endif
392 457
458config ARCH_IMX_V6_V7
459 bool "i.MX3, i.MX5, i.MX6"
460 select ARM_PATCH_PHYS_VIRT
461 select AUTO_ZRELADDR if !ZBOOT_ROM
462 select MIGHT_HAVE_CACHE_L2X0
463 help
464 This enables support for systems based on the Freescale i.MX3, i.MX5
465 and i.MX6 family.
466
393if ARCH_IMX_V6_V7 467if ARCH_IMX_V6_V7
394 468
395comment "MX31 platforms:" 469comment "MX31 platforms:"
@@ -773,4 +847,10 @@ config SOC_IMX6Q
773 847
774endif 848endif
775 849
850endchoice
851
852endmenu
853
776source "arch/arm/mach-imx/devices/Kconfig" 854source "arch/arm/mach-imx/devices/Kconfig"
855
856endif
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 257893e6db93..fe47b71469c9 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -1,3 +1,5 @@
1obj-y := time.o cpu.o system.o irq-common.o
2
1obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o 3obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o
2obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o 4obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o
3 5
@@ -18,6 +20,21 @@ obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \
18obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o 20obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
19obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o 21obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
20 22
23obj-$(CONFIG_MXC_TZIC) += tzic.o
24obj-$(CONFIG_MXC_AVIC) += avic.o
25
26obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o
27obj-$(CONFIG_MXC_ULPI) += ulpi.o
28obj-$(CONFIG_MXC_USE_EPIT) += epit.o
29obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
30obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o
31obj-$(CONFIG_CPU_IDLE) += cpuidle.o
32
33ifdef CONFIG_SND_IMX_SOC
34obj-y += ssi-fiq.o
35obj-y += ssi-fiq-ksym.o
36endif
37
21# Support for CMOS sensor interface 38# Support for CMOS sensor interface
22obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o 39obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
23 40
diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/mach-imx/avic.c
index cbd55c36def3..cbd55c36def3 100644
--- a/arch/arm/plat-mxc/avic.c
+++ b/arch/arm/mach-imx/avic.c
diff --git a/arch/arm/plat-mxc/cpu.c b/arch/arm/mach-imx/cpu.c
index 220dd6f93126..220dd6f93126 100644
--- a/arch/arm/plat-mxc/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/mach-imx/cpufreq.c
index b5b6f8083130..b5b6f8083130 100644
--- a/arch/arm/plat-mxc/cpufreq.c
+++ b/arch/arm/mach-imx/cpufreq.c
diff --git a/arch/arm/plat-mxc/cpuidle.c b/arch/arm/mach-imx/cpuidle.c
index d4cb511a44a8..d4cb511a44a8 100644
--- a/arch/arm/plat-mxc/cpuidle.c
+++ b/arch/arm/mach-imx/cpuidle.c
diff --git a/arch/arm/plat-mxc/epit.c b/arch/arm/mach-imx/epit.c
index 88726f4dbbfa..88726f4dbbfa 100644
--- a/arch/arm/plat-mxc/epit.c
+++ b/arch/arm/mach-imx/epit.c
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/mach-imx/include/mach/common.h
index ead901814c0d..ead901814c0d 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/mach-imx/include/mach/common.h
diff --git a/arch/arm/plat-mxc/include/mach/cpuidle.h b/arch/arm/mach-imx/include/mach/cpuidle.h
index bc932d1af372..bc932d1af372 100644
--- a/arch/arm/plat-mxc/include/mach/cpuidle.h
+++ b/arch/arm/mach-imx/include/mach/cpuidle.h
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/mach-imx/include/mach/debug-macro.S
index 761e45f9456f..761e45f9456f 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/mach-imx/include/mach/debug-macro.S
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/mach-imx/include/mach/hardware.h
index ebf10654bb42..ebf10654bb42 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/mach-imx/include/mach/hardware.h
diff --git a/arch/arm/plat-mxc/include/mach/iim.h b/arch/arm/mach-imx/include/mach/iim.h
index 315bffadafda..315bffadafda 100644
--- a/arch/arm/plat-mxc/include/mach/iim.h
+++ b/arch/arm/mach-imx/include/mach/iim.h
diff --git a/arch/arm/plat-mxc/include/mach/ipu.h b/arch/arm/mach-imx/include/mach/ipu.h
index 539e559d18b2..539e559d18b2 100644
--- a/arch/arm/plat-mxc/include/mach/ipu.h
+++ b/arch/arm/mach-imx/include/mach/ipu.h
diff --git a/arch/arm/plat-mxc/include/mach/iram.h b/arch/arm/mach-imx/include/mach/iram.h
index 022690c33702..022690c33702 100644
--- a/arch/arm/plat-mxc/include/mach/iram.h
+++ b/arch/arm/mach-imx/include/mach/iram.h
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/mach-imx/include/mach/irqs.h
index d73f5e8ea9cb..d73f5e8ea9cb 100644
--- a/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/mach-imx/include/mach/irqs.h
diff --git a/arch/arm/plat-mxc/include/mach/mx1.h b/arch/arm/mach-imx/include/mach/mx1.h
index 45bd31cc34d6..45bd31cc34d6 100644
--- a/arch/arm/plat-mxc/include/mach/mx1.h
+++ b/arch/arm/mach-imx/include/mach/mx1.h
diff --git a/arch/arm/plat-mxc/include/mach/mx21.h b/arch/arm/mach-imx/include/mach/mx21.h
index 468738aa997f..468738aa997f 100644
--- a/arch/arm/plat-mxc/include/mach/mx21.h
+++ b/arch/arm/mach-imx/include/mach/mx21.h
diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/mach-imx/include/mach/mx25.h
index ec466400a200..ec466400a200 100644
--- a/arch/arm/plat-mxc/include/mach/mx25.h
+++ b/arch/arm/mach-imx/include/mach/mx25.h
diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/mach-imx/include/mach/mx27.h
index e074616d54ca..e074616d54ca 100644
--- a/arch/arm/plat-mxc/include/mach/mx27.h
+++ b/arch/arm/mach-imx/include/mach/mx27.h
diff --git a/arch/arm/plat-mxc/include/mach/mx2x.h b/arch/arm/mach-imx/include/mach/mx2x.h
index 11642f5b224c..11642f5b224c 100644
--- a/arch/arm/plat-mxc/include/mach/mx2x.h
+++ b/arch/arm/mach-imx/include/mach/mx2x.h
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/mach-imx/include/mach/mx31.h
index ee9b1f9215df..ee9b1f9215df 100644
--- a/arch/arm/plat-mxc/include/mach/mx31.h
+++ b/arch/arm/mach-imx/include/mach/mx31.h
diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/mach-imx/include/mach/mx35.h
index 2af5d3a699c7..2af5d3a699c7 100644
--- a/arch/arm/plat-mxc/include/mach/mx35.h
+++ b/arch/arm/mach-imx/include/mach/mx35.h
diff --git a/arch/arm/plat-mxc/include/mach/mx3x.h b/arch/arm/mach-imx/include/mach/mx3x.h
index 96fb4fbc8ad7..96fb4fbc8ad7 100644
--- a/arch/arm/plat-mxc/include/mach/mx3x.h
+++ b/arch/arm/mach-imx/include/mach/mx3x.h
diff --git a/arch/arm/plat-mxc/include/mach/mx50.h b/arch/arm/mach-imx/include/mach/mx50.h
index 09ac19c1570c..09ac19c1570c 100644
--- a/arch/arm/plat-mxc/include/mach/mx50.h
+++ b/arch/arm/mach-imx/include/mach/mx50.h
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/mach-imx/include/mach/mx51.h
index af844f76261a..af844f76261a 100644
--- a/arch/arm/plat-mxc/include/mach/mx51.h
+++ b/arch/arm/mach-imx/include/mach/mx51.h
diff --git a/arch/arm/plat-mxc/include/mach/mx53.h b/arch/arm/mach-imx/include/mach/mx53.h
index f829d1c22501..f829d1c22501 100644
--- a/arch/arm/plat-mxc/include/mach/mx53.h
+++ b/arch/arm/mach-imx/include/mach/mx53.h
diff --git a/arch/arm/plat-mxc/include/mach/mx6q.h b/arch/arm/mach-imx/include/mach/mx6q.h
index f7e7dbac8f4b..f7e7dbac8f4b 100644
--- a/arch/arm/plat-mxc/include/mach/mx6q.h
+++ b/arch/arm/mach-imx/include/mach/mx6q.h
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/mach-imx/include/mach/mxc.h
index d78298366a91..d78298366a91 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/mach-imx/include/mach/mxc.h
diff --git a/arch/arm/plat-mxc/include/mach/timex.h b/arch/arm/mach-imx/include/mach/timex.h
index 10343d1f87e1..10343d1f87e1 100644
--- a/arch/arm/plat-mxc/include/mach/timex.h
+++ b/arch/arm/mach-imx/include/mach/timex.h
diff --git a/arch/arm/plat-mxc/include/mach/ulpi.h b/arch/arm/mach-imx/include/mach/ulpi.h
index 42bdaca6d7d9..42bdaca6d7d9 100644
--- a/arch/arm/plat-mxc/include/mach/ulpi.h
+++ b/arch/arm/mach-imx/include/mach/ulpi.h
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/mach-imx/include/mach/uncompress.h
index 477971b00930..477971b00930 100644
--- a/arch/arm/plat-mxc/include/mach/uncompress.h
+++ b/arch/arm/mach-imx/include/mach/uncompress.h
diff --git a/arch/arm/plat-mxc/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c
index 074c3869626a..074c3869626a 100644
--- a/arch/arm/plat-mxc/iram_alloc.c
+++ b/arch/arm/mach-imx/iram_alloc.c
diff --git a/arch/arm/plat-mxc/irq-common.c b/arch/arm/mach-imx/irq-common.c
index b6e11458e5ae..b6e11458e5ae 100644
--- a/arch/arm/plat-mxc/irq-common.c
+++ b/arch/arm/mach-imx/irq-common.c
diff --git a/arch/arm/plat-mxc/irq-common.h b/arch/arm/mach-imx/irq-common.h
index 6ccb3a14c693..6ccb3a14c693 100644
--- a/arch/arm/plat-mxc/irq-common.h
+++ b/arch/arm/mach-imx/irq-common.h
diff --git a/arch/arm/plat-mxc/ssi-fiq-ksym.c b/arch/arm/mach-imx/ssi-fiq-ksym.c
index 792090f9a032..792090f9a032 100644
--- a/arch/arm/plat-mxc/ssi-fiq-ksym.c
+++ b/arch/arm/mach-imx/ssi-fiq-ksym.c
diff --git a/arch/arm/plat-mxc/ssi-fiq.S b/arch/arm/mach-imx/ssi-fiq.S
index a8b93c5f29b5..a8b93c5f29b5 100644
--- a/arch/arm/plat-mxc/ssi-fiq.S
+++ b/arch/arm/mach-imx/ssi-fiq.S
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/mach-imx/system.c
index 3da78cfc5a94..3da78cfc5a94 100644
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/mach-imx/system.c
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/mach-imx/time.c
index a17abcf98325..a17abcf98325 100644
--- a/arch/arm/plat-mxc/time.c
+++ b/arch/arm/mach-imx/time.c
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/mach-imx/tzic.c
index 3ed1adbc09f8..3ed1adbc09f8 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/mach-imx/tzic.c
diff --git a/arch/arm/plat-mxc/ulpi.c b/arch/arm/mach-imx/ulpi.c
index d2963427184f..d2963427184f 100644
--- a/arch/arm/plat-mxc/ulpi.c
+++ b/arch/arm/mach-imx/ulpi.c
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
deleted file mode 100644
index 559c9d846275..000000000000
--- a/arch/arm/plat-mxc/Kconfig
+++ /dev/null
@@ -1,81 +0,0 @@
1if ARCH_MXC
2
3menu "Freescale MXC Implementations"
4
5choice
6 prompt "Freescale CPU family:"
7 default ARCH_IMX_V6_V7
8
9config ARCH_IMX_V4_V5
10 bool "i.MX1, i.MX21, i.MX25, i.MX27"
11 select ARM_PATCH_PHYS_VIRT
12 select AUTO_ZRELADDR if !ZBOOT_ROM
13 help
14 This enables support for systems based on the Freescale i.MX ARMv4
15 and ARMv5 SoCs
16
17config ARCH_IMX_V6_V7
18 bool "i.MX3, i.MX5, i.MX6"
19 select ARM_PATCH_PHYS_VIRT
20 select AUTO_ZRELADDR if !ZBOOT_ROM
21 select MIGHT_HAVE_CACHE_L2X0
22 help
23 This enables support for systems based on the Freescale i.MX3, i.MX5
24 and i.MX6 family.
25
26endchoice
27
28source "arch/arm/mach-imx/Kconfig"
29
30endmenu
31
32config MXC_IRQ_PRIOR
33 bool "Use IRQ priority"
34 help
35 Select this if you want to use prioritized IRQ handling.
36 This feature prevents higher priority ISR to be interrupted
37 by lower priority IRQ even IRQF_DISABLED flag is not set.
38 This may be useful in embedded applications, where are strong
39 requirements for timing.
40 Say N here, unless you have a specialized requirement.
41
42config MXC_TZIC
43 bool
44
45config MXC_AVIC
46 bool
47
48config MXC_DEBUG_BOARD
49 bool "Enable MXC debug board(for 3-stack)"
50 help
51 The debug board is an integral part of the MXC 3-stack(PDK)
52 platforms, it can be attached or removed from the peripheral
53 board. On debug board, several debug devices(ethernet, UART,
54 buttons, LEDs and JTAG) are implemented. Between the MCU and
55 these devices, a CPLD is added as a bridge which performs
56 data/address de-multiplexing and decode, signal level shift,
57 interrupt control and various board functions.
58
59config HAVE_EPIT
60 bool
61
62config MXC_USE_EPIT
63 bool "Use EPIT instead of GPT"
64 depends on HAVE_EPIT
65 help
66 Use EPIT as the system timer on systems that have it. Normally you
67 don't have a reason to do so as the EPIT has the same features and
68 uses the same clocks as the GPT. Anyway, on some systems the GPT
69 may be in use for other purposes.
70
71config MXC_ULPI
72 bool
73
74config ARCH_HAS_RNGA
75 bool
76
77config IRAM_ALLOC
78 bool
79 select GENERIC_ALLOCATOR
80
81endif
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
deleted file mode 100644
index e33d2d139ba1..000000000000
--- a/arch/arm/plat-mxc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
1#
2# Makefile for the linux kernel.
3#
4
5# Common support
6obj-y := time.o cpu.o system.o irq-common.o
7
8obj-$(CONFIG_MXC_TZIC) += tzic.o
9obj-$(CONFIG_MXC_AVIC) += avic.o
10
11obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o
12obj-$(CONFIG_MXC_ULPI) += ulpi.o
13obj-$(CONFIG_MXC_USE_EPIT) += epit.o
14obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
15obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o
16obj-$(CONFIG_CPU_IDLE) += cpuidle.o
17ifdef CONFIG_SND_IMX_SOC
18obj-y += ssi-fiq.o
19obj-y += ssi-fiq-ksym.o
20endif