1 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 44f3a805ae56..7f7ad6f289bd 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -9,21 +9,20 @@ choice
 config ARCH_MX1
        bool "MX1-based"
        select CPU_ARM920T
-        select COMMON_CLKDEV
+        select IMX_HAVE_IOMUX_V1
        help
          This enables support for systems based on the Freescale i.MX1 family
 config ARCH_MX2
        bool "MX2-based"
        select CPU_ARM926T
-        select COMMON_CLKDEV
+        select IMX_HAVE_IOMUX_V1
        help
          This enables support for systems based on the Freescale i.MX2 family
 config ARCH_MX25
        bool "MX25-based"
        select CPU_ARM926T
-        select COMMON_CLKDEV
        select ARCH_MXC_IOMUX_V3
        select HAVE_FB_IMX
        help
@@ -32,21 +31,18 @@ config ARCH_MX25
 config ARCH_MX3
        bool "MX3-based"
        select CPU_V6
-        select COMMON_CLKDEV
        help
          This enables support for systems based on the Freescale i.MX3 family
 config ARCH_MXC91231
        bool "MXC91231-based"
        select CPU_V6
-        select COMMON_CLKDEV
        help
          This enables support for systems based on the Freescale MXC91231 family
 config ARCH_MX5
        bool "MX5-based"
        select CPU_V7
-        select COMMON_CLKDEV
        help
          This enables support for systems based on the Freescale i.MX51 family
@@ -63,7 +59,6 @@ endmenu
 config MXC_IRQ_PRIOR
        bool "Use IRQ priority"
-        depends on ARCH_MXC
        help
          Select this if you want to use prioritized IRQ handling.
          This feature prevents higher priority ISR to be interrupted
@@ -82,7 +77,6 @@ config MXC_TZIC
 config MXC_PWM
        tristate "Enable PWM driver"
-        depends on ARCH_MXC
        select HAVE_PWM
        help
          Enable support for the i.MX PWM controller(s).
@@ -92,7 +86,9 @@ config MXC_ULPI
 config ARCH_HAS_RNGA
        bool
-        depends on ARCH_MXC
+config IMX_HAVE_IOMUX_V1
+        bool
 config ARCH_MXC_IOMUX_V3
        bool

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 44f3a805ae56..7f7ad6f289bd 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig
@@ -9,21 +9,20 @@ choice
9	config ARCH_MX1	9	config ARCH_MX1
10	bool "MX1-based"	10	bool "MX1-based"
11	select CPU_ARM920T	11	select CPU_ARM920T
12	select COMMON_CLKDEV	12	select IMX_HAVE_IOMUX_V1
13	help	13	help
14	This enables support for systems based on the Freescale i.MX1 family	14	This enables support for systems based on the Freescale i.MX1 family
15		15
16	config ARCH_MX2	16	config ARCH_MX2
17	bool "MX2-based"	17	bool "MX2-based"
18	select CPU_ARM926T	18	select CPU_ARM926T
19	select COMMON_CLKDEV	19	select IMX_HAVE_IOMUX_V1
20	help	20	help
21	This enables support for systems based on the Freescale i.MX2 family	21	This enables support for systems based on the Freescale i.MX2 family
22		22
23	config ARCH_MX25	23	config ARCH_MX25
24	bool "MX25-based"	24	bool "MX25-based"
25	select CPU_ARM926T	25	select CPU_ARM926T
26	select COMMON_CLKDEV
27	select ARCH_MXC_IOMUX_V3	26	select ARCH_MXC_IOMUX_V3
28	select HAVE_FB_IMX	27	select HAVE_FB_IMX
29	help	28	help
@@ -32,21 +31,18 @@ config ARCH_MX25
32	config ARCH_MX3	31	config ARCH_MX3
33	bool "MX3-based"	32	bool "MX3-based"
34	select CPU_V6	33	select CPU_V6
35	select COMMON_CLKDEV
36	help	34	help
37	This enables support for systems based on the Freescale i.MX3 family	35	This enables support for systems based on the Freescale i.MX3 family
38		36
39	config ARCH_MXC91231	37	config ARCH_MXC91231
40	bool "MXC91231-based"	38	bool "MXC91231-based"
41	select CPU_V6	39	select CPU_V6
42	select COMMON_CLKDEV
43	help	40	help
44	This enables support for systems based on the Freescale MXC91231 family	41	This enables support for systems based on the Freescale MXC91231 family
45		42
46	config ARCH_MX5	43	config ARCH_MX5
47	bool "MX5-based"	44	bool "MX5-based"
48	select CPU_V7	45	select CPU_V7
49	select COMMON_CLKDEV
50	help	46	help
51	This enables support for systems based on the Freescale i.MX51 family	47	This enables support for systems based on the Freescale i.MX51 family
52		48
@@ -63,7 +59,6 @@ endmenu
63		59
64	config MXC_IRQ_PRIOR	60	config MXC_IRQ_PRIOR
65	bool "Use IRQ priority"	61	bool "Use IRQ priority"
66	depends on ARCH_MXC
67	help	62	help
68	Select this if you want to use prioritized IRQ handling.	63	Select this if you want to use prioritized IRQ handling.
69	This feature prevents higher priority ISR to be interrupted	64	This feature prevents higher priority ISR to be interrupted
@@ -82,7 +77,6 @@ config MXC_TZIC
82		77
83	config MXC_PWM	78	config MXC_PWM
84	tristate "Enable PWM driver"	79	tristate "Enable PWM driver"
85	depends on ARCH_MXC
86	select HAVE_PWM	80	select HAVE_PWM
87	help	81	help
88	Enable support for the i.MX PWM controller(s).	82	Enable support for the i.MX PWM controller(s).
@@ -92,7 +86,9 @@ config MXC_ULPI
92		86
93	config ARCH_HAS_RNGA	87	config ARCH_HAS_RNGA
94	bool	88	bool
95	depends on ARCH_MXC	89
		90	config IMX_HAVE_IOMUX_V1
		91	bool
96		92
97	config ARCH_MXC_IOMUX_V3	93	config ARCH_MXC_IOMUX_V3
98	bool	94	bool