diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 15:48:07 +0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 06:02:19 +0400 |
commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
tree | b1c04b25317c9dade08d911e8077c8745df8a954 | |
parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) | |
download | linux-3995eb82050a81e11217a0b88b2a5eddd53eb4d6.tar.xz |
ARM: imx: merge plat-mxc into mach-imx
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx. It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.
To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/Makefile | 1 | ||||
-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/Kconfig | 80 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile | 17 | ||||
-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/Kconfig | 81 | ||||
-rw-r--r-- | arch/arm/plat-mxc/Makefile | 20 |
46 files changed, 98 insertions, 104 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e73060fe0788..9f78c28a848b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -789,7 +789,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.pengutronix.de/git/imx/linux-2.6.git F: arch/arm/mach-imx/ -F: arch/arm/plat-mxc/ F: arch/arm/configs/imx*_defconfig ARM/FREESCALE IMX6 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" source "arch/arm/mach-mv78xx0/Kconfig" -source "arch/arm/plat-mxc/Kconfig" +source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-mxs/Kconfig" 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 # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_MXC) += mxc plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(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 @@ +if ARCH_MXC + +config MXC_IRQ_PRIOR + bool "Use IRQ priority" + help + Select this if you want to use prioritized IRQ handling. + This feature prevents higher priority ISR to be interrupted + by lower priority IRQ even IRQF_DISABLED flag is not set. + This may be useful in embedded applications, where are strong + requirements for timing. + Say N here, unless you have a specialized requirement. + +config MXC_TZIC + bool + +config MXC_AVIC + bool + +config MXC_DEBUG_BOARD + bool "Enable MXC debug board(for 3-stack)" + help + The debug board is an integral part of the MXC 3-stack(PDK) + platforms, it can be attached or removed from the peripheral + board. On debug board, several debug devices(ethernet, UART, + buttons, LEDs and JTAG) are implemented. Between the MCU and + these devices, a CPLD is added as a bridge which performs + data/address de-multiplexing and decode, signal level shift, + interrupt control and various board functions. + +config HAVE_EPIT + bool + +config MXC_USE_EPIT + bool "Use EPIT instead of GPT" + depends on HAVE_EPIT + help + Use EPIT as the system timer on systems that have it. Normally you + don't have a reason to do so as the EPIT has the same features and + uses the same clocks as the GPT. Anyway, on some systems the GPT + may be in use for other purposes. + +config MXC_ULPI + bool + +config ARCH_HAS_RNGA + bool + +config IRAM_ALLOC + bool + select GENERIC_ALLOCATOR + config HAVE_IMX_GPC bool @@ -110,6 +161,20 @@ config SOC_IMX51 select PINCTRL_IMX51 select SOC_IMX5 +menu "Freescale MXC Implementations" + +choice + prompt "Freescale CPU family:" + default ARCH_IMX_V6_V7 + +config ARCH_IMX_V4_V5 + bool "i.MX1, i.MX21, i.MX25, i.MX27" + select ARM_PATCH_PHYS_VIRT + select AUTO_ZRELADDR if !ZBOOT_ROM + help + This enables support for systems based on the Freescale i.MX ARMv4 + and ARMv5 SoCs + if ARCH_IMX_V4_V5 comment "MX1 platforms:" @@ -390,6 +455,15 @@ config MACH_IMX27_DT endif +config ARCH_IMX_V6_V7 + bool "i.MX3, i.MX5, i.MX6" + select ARM_PATCH_PHYS_VIRT + select AUTO_ZRELADDR if !ZBOOT_ROM + select MIGHT_HAVE_CACHE_L2X0 + help + This enables support for systems based on the Freescale i.MX3, i.MX5 + and i.MX6 family. + if ARCH_IMX_V6_V7 comment "MX31 platforms:" @@ -773,4 +847,10 @@ config SOC_IMX6Q endif +endchoice + +endmenu + source "arch/arm/mach-imx/devices/Kconfig" + +endif 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 @@ +obj-y := time.o cpu.o system.o irq-common.o + obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o @@ -18,6 +20,21 @@ obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o +obj-$(CONFIG_MXC_TZIC) += tzic.o +obj-$(CONFIG_MXC_AVIC) += avic.o + +obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o +obj-$(CONFIG_MXC_ULPI) += ulpi.o +obj-$(CONFIG_MXC_USE_EPIT) += epit.o +obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o +obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o + +ifdef CONFIG_SND_IMX_SOC +obj-y += ssi-fiq.o +obj-y += ssi-fiq-ksym.o +endif + # Support for CMOS sensor interface obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o 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 @@ -if ARCH_MXC - -menu "Freescale MXC Implementations" - -choice - prompt "Freescale CPU family:" - default ARCH_IMX_V6_V7 - -config ARCH_IMX_V4_V5 - bool "i.MX1, i.MX21, i.MX25, i.MX27" - select ARM_PATCH_PHYS_VIRT - select AUTO_ZRELADDR if !ZBOOT_ROM - help - This enables support for systems based on the Freescale i.MX ARMv4 - and ARMv5 SoCs - -config ARCH_IMX_V6_V7 - bool "i.MX3, i.MX5, i.MX6" - select ARM_PATCH_PHYS_VIRT - select AUTO_ZRELADDR if !ZBOOT_ROM - select MIGHT_HAVE_CACHE_L2X0 - help - This enables support for systems based on the Freescale i.MX3, i.MX5 - and i.MX6 family. - -endchoice - -source "arch/arm/mach-imx/Kconfig" - -endmenu - -config MXC_IRQ_PRIOR - bool "Use IRQ priority" - help - Select this if you want to use prioritized IRQ handling. - This feature prevents higher priority ISR to be interrupted - by lower priority IRQ even IRQF_DISABLED flag is not set. - This may be useful in embedded applications, where are strong - requirements for timing. - Say N here, unless you have a specialized requirement. - -config MXC_TZIC - bool - -config MXC_AVIC - bool - -config MXC_DEBUG_BOARD - bool "Enable MXC debug board(for 3-stack)" - help - The debug board is an integral part of the MXC 3-stack(PDK) - platforms, it can be attached or removed from the peripheral - board. On debug board, several debug devices(ethernet, UART, - buttons, LEDs and JTAG) are implemented. Between the MCU and - these devices, a CPLD is added as a bridge which performs - data/address de-multiplexing and decode, signal level shift, - interrupt control and various board functions. - -config HAVE_EPIT - bool - -config MXC_USE_EPIT - bool "Use EPIT instead of GPT" - depends on HAVE_EPIT - help - Use EPIT as the system timer on systems that have it. Normally you - don't have a reason to do so as the EPIT has the same features and - uses the same clocks as the GPT. Anyway, on some systems the GPT - may be in use for other purposes. - -config MXC_ULPI - bool - -config ARCH_HAS_RNGA - bool - -config IRAM_ALLOC - bool - select GENERIC_ALLOCATOR - -endif 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 @@ -# -# Makefile for the linux kernel. -# - -# Common support -obj-y := time.o cpu.o system.o irq-common.o - -obj-$(CONFIG_MXC_TZIC) += tzic.o -obj-$(CONFIG_MXC_AVIC) += avic.o - -obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o -obj-$(CONFIG_MXC_ULPI) += ulpi.o -obj-$(CONFIG_MXC_USE_EPIT) += epit.o -obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o -obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o -obj-$(CONFIG_CPU_IDLE) += cpuidle.o -ifdef CONFIG_SND_IMX_SOC -obj-y += ssi-fiq.o -obj-y += ssi-fiq-ksym.o -endif |