diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/arm/mach-imx/Kconfig | |
parent | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (diff) | |
parent | 48d224d1efec98b0b78e511150b4f5752beceb7c (diff) |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 108 |
1 files changed, 105 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 8d276584650e..b09924112f99 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -1,3 +1,70 @@ | |||
1 | config ARCH_MXC | ||
2 | bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 | ||
3 | select ARCH_REQUIRE_GPIOLIB | ||
4 | select ARM_PATCH_PHYS_VIRT | ||
5 | select AUTO_ZRELADDR if !ZBOOT_ROM | ||
6 | select CLKDEV_LOOKUP | ||
7 | select CLKSRC_MMIO | ||
8 | select GENERIC_CLOCKEVENTS | ||
9 | select GENERIC_IRQ_CHIP | ||
10 | select MULTI_IRQ_HANDLER | ||
11 | select SPARSE_IRQ | ||
12 | select USE_OF | ||
13 | help | ||
14 | Support for Freescale MXC/iMX-based family of processors | ||
15 | |||
16 | menu "Freescale i.MX support" | ||
17 | depends on ARCH_MXC | ||
18 | |||
19 | config MXC_IRQ_PRIOR | ||
20 | bool "Use IRQ priority" | ||
21 | help | ||
22 | Select this if you want to use prioritized IRQ handling. | ||
23 | This feature prevents higher priority ISR to be interrupted | ||
24 | by lower priority IRQ even IRQF_DISABLED flag is not set. | ||
25 | This may be useful in embedded applications, where are strong | ||
26 | requirements for timing. | ||
27 | Say N here, unless you have a specialized requirement. | ||
28 | |||
29 | config MXC_TZIC | ||
30 | bool | ||
31 | |||
32 | config MXC_AVIC | ||
33 | bool | ||
34 | |||
35 | config MXC_DEBUG_BOARD | ||
36 | bool "Enable MXC debug board(for 3-stack)" | ||
37 | help | ||
38 | The debug board is an integral part of the MXC 3-stack(PDK) | ||
39 | platforms, it can be attached or removed from the peripheral | ||
40 | board. On debug board, several debug devices(ethernet, UART, | ||
41 | buttons, LEDs and JTAG) are implemented. Between the MCU and | ||
42 | these devices, a CPLD is added as a bridge which performs | ||
43 | data/address de-multiplexing and decode, signal level shift, | ||
44 | interrupt control and various board functions. | ||
45 | |||
46 | config HAVE_EPIT | ||
47 | bool | ||
48 | |||
49 | config MXC_USE_EPIT | ||
50 | bool "Use EPIT instead of GPT" | ||
51 | depends on HAVE_EPIT | ||
52 | help | ||
53 | Use EPIT as the system timer on systems that have it. Normally you | ||
54 | don't have a reason to do so as the EPIT has the same features and | ||
55 | uses the same clocks as the GPT. Anyway, on some systems the GPT | ||
56 | may be in use for other purposes. | ||
57 | |||
58 | config MXC_ULPI | ||
59 | bool | ||
60 | |||
61 | config ARCH_HAS_RNGA | ||
62 | bool | ||
63 | |||
64 | config IRAM_ALLOC | ||
65 | bool | ||
66 | select GENERIC_ALLOCATOR | ||
67 | |||
1 | config HAVE_IMX_GPC | 68 | config HAVE_IMX_GPC |
2 | bool | 69 | bool |
3 | 70 | ||
@@ -5,6 +72,12 @@ config HAVE_IMX_MMDC | |||
5 | bool | 72 | bool |
6 | 73 | ||
7 | config HAVE_IMX_SRC | 74 | config HAVE_IMX_SRC |
75 | def_bool y if SMP | ||
76 | |||
77 | config IMX_HAVE_IOMUX_V1 | ||
78 | bool | ||
79 | |||
80 | config ARCH_MXC_IOMUX_V3 | ||
8 | bool | 81 | bool |
9 | 82 | ||
10 | config ARCH_MX1 | 83 | config ARCH_MX1 |
@@ -104,7 +177,7 @@ config SOC_IMX51 | |||
104 | select PINCTRL_IMX51 | 177 | select PINCTRL_IMX51 |
105 | select SOC_IMX5 | 178 | select SOC_IMX5 |
106 | 179 | ||
107 | if ARCH_IMX_V4_V5 | 180 | if ARCH_MULTI_V4T |
108 | 181 | ||
109 | comment "MX1 platforms:" | 182 | comment "MX1 platforms:" |
110 | config MACH_MXLADS | 183 | config MACH_MXLADS |
@@ -133,6 +206,10 @@ config MACH_APF9328 | |||
133 | help | 206 | help |
134 | Say Yes here if you are using the Armadeus APF9328 development board | 207 | Say Yes here if you are using the Armadeus APF9328 development board |
135 | 208 | ||
209 | endif | ||
210 | |||
211 | if ARCH_MULTI_V5 | ||
212 | |||
136 | comment "MX21 platforms:" | 213 | comment "MX21 platforms:" |
137 | 214 | ||
138 | config MACH_MX21ADS | 215 | config MACH_MX21ADS |
@@ -195,6 +272,13 @@ config MACH_EUKREA_MBIMXSD25_BASEBOARD | |||
195 | 272 | ||
196 | endchoice | 273 | endchoice |
197 | 274 | ||
275 | config MACH_IMX25_DT | ||
276 | bool "Support i.MX25 platforms from device tree" | ||
277 | select SOC_IMX25 | ||
278 | help | ||
279 | Include support for Freescale i.MX25 based platforms | ||
280 | using the device tree for discovery | ||
281 | |||
198 | comment "MX27 platforms:" | 282 | comment "MX27 platforms:" |
199 | 283 | ||
200 | config MACH_MX27ADS | 284 | config MACH_MX27ADS |
@@ -384,7 +468,7 @@ config MACH_IMX27_DT | |||
384 | 468 | ||
385 | endif | 469 | endif |
386 | 470 | ||
387 | if ARCH_IMX_V6_V7 | 471 | if ARCH_MULTI_V6 |
388 | 472 | ||
389 | comment "MX31 platforms:" | 473 | comment "MX31 platforms:" |
390 | 474 | ||
@@ -649,6 +733,10 @@ config MACH_VPR200 | |||
649 | Include support for VPR200 platform. This includes specific | 733 | Include support for VPR200 platform. This includes specific |
650 | configurations for the board and its peripherals. | 734 | configurations for the board and its peripherals. |
651 | 735 | ||
736 | endif | ||
737 | |||
738 | if ARCH_MULTI_V7 | ||
739 | |||
652 | comment "i.MX5 platforms:" | 740 | comment "i.MX5 platforms:" |
653 | 741 | ||
654 | config MACH_MX50_RDP | 742 | config MACH_MX50_RDP |
@@ -748,7 +836,14 @@ config SOC_IMX53 | |||
748 | 836 | ||
749 | config SOC_IMX6Q | 837 | config SOC_IMX6Q |
750 | bool "i.MX6 Quad support" | 838 | bool "i.MX6 Quad support" |
839 | select ARCH_HAS_CPUFREQ | ||
840 | select ARCH_HAS_OPP | ||
751 | select ARM_CPU_SUSPEND if PM | 841 | select ARM_CPU_SUSPEND if PM |
842 | select ARM_ERRATA_743622 | ||
843 | select ARM_ERRATA_751472 | ||
844 | select ARM_ERRATA_754322 | ||
845 | select ARM_ERRATA_764369 if SMP | ||
846 | select ARM_ERRATA_775420 | ||
752 | select ARM_GIC | 847 | select ARM_GIC |
753 | select COMMON_CLK | 848 | select COMMON_CLK |
754 | select CPU_V7 | 849 | select CPU_V7 |
@@ -756,13 +851,20 @@ config SOC_IMX6Q | |||
756 | select HAVE_CAN_FLEXCAN if CAN | 851 | select HAVE_CAN_FLEXCAN if CAN |
757 | select HAVE_IMX_GPC | 852 | select HAVE_IMX_GPC |
758 | select HAVE_IMX_MMDC | 853 | select HAVE_IMX_MMDC |
759 | select HAVE_IMX_SRC | ||
760 | select HAVE_SMP | 854 | select HAVE_SMP |
761 | select MFD_SYSCON | 855 | select MFD_SYSCON |
762 | select PINCTRL | 856 | select PINCTRL |
763 | select PINCTRL_IMX6Q | 857 | select PINCTRL_IMX6Q |
858 | select PL310_ERRATA_588369 if CACHE_PL310 | ||
859 | select PL310_ERRATA_727915 if CACHE_PL310 | ||
860 | select PL310_ERRATA_769419 if CACHE_PL310 | ||
861 | select PM_OPP if PM | ||
764 | 862 | ||
765 | help | 863 | help |
766 | This enables support for Freescale i.MX6 Quad processor. | 864 | This enables support for Freescale i.MX6 Quad processor. |
767 | 865 | ||
768 | endif | 866 | endif |
867 | |||
868 | source "arch/arm/mach-imx/devices/Kconfig" | ||
869 | |||
870 | endmenu | ||