aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2013-10-01 05:08:56 -0400
committerOlof Johansson <olof@lixom.net>2013-10-07 13:41:32 -0400
commit07d8a49c263c89c21d1e10b5550706ed8a58eb5e (patch)
tree4327c646b2f1ebc4f27c7786913040d698842100 /arch
parentc884357ec6e27c7967c78fb111cc8a830881f43b (diff)
ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
CLKDEV_LOOKUP selects HAVE_CLK and COMMON_CLK selects CLKDEV_LOOKUP. So all symbols that select at least two of these symbols can be simplified. For imx, omap2 and ux500 some rearrangements were necessary before the simplification. Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Dinh Nguyen <dinguyen@altera.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Pawel Moll <pawel.moll@arm.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig12
-rw-r--r--arch/arm/mach-highbank/Kconfig1
-rw-r--r--arch/arm/mach-imx/Kconfig10
-rw-r--r--arch/arm/mach-omap2/Kconfig9
-rw-r--r--arch/arm/mach-socfpga/Kconfig1
-rw-r--r--arch/arm/mach-spear/Kconfig2
-rw-r--r--arch/arm/mach-tegra/Kconfig2
-rw-r--r--arch/arm/mach-u300/Kconfig1
-rw-r--r--arch/arm/mach-ux500/Kconfig29
-rw-r--r--arch/arm/mach-vexpress/Kconfig2
-rw-r--r--arch/arm/mach-vt8500/Kconfig1
11 files changed, 14 insertions, 56 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b8faa337e8b..f55f7ac4b135 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -358,7 +358,6 @@ config ARCH_AT91
358 bool "Atmel AT91" 358 bool "Atmel AT91"
359 select ARCH_REQUIRE_GPIOLIB 359 select ARCH_REQUIRE_GPIOLIB
360 select CLKDEV_LOOKUP 360 select CLKDEV_LOOKUP
361 select HAVE_CLK
362 select IRQ_DOMAIN 361 select IRQ_DOMAIN
363 select NEED_MACH_GPIO_H 362 select NEED_MACH_GPIO_H
364 select NEED_MACH_IO_H if PCCARD 363 select NEED_MACH_IO_H if PCCARD
@@ -372,7 +371,6 @@ config ARCH_CLPS711X
372 bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" 371 bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
373 select ARCH_REQUIRE_GPIOLIB 372 select ARCH_REQUIRE_GPIOLIB
374 select AUTO_ZRELADDR 373 select AUTO_ZRELADDR
375 select CLKDEV_LOOKUP
376 select CLKSRC_MMIO 374 select CLKSRC_MMIO
377 select COMMON_CLK 375 select COMMON_CLK
378 select CPU_ARM720T 376 select CPU_ARM720T
@@ -631,7 +629,6 @@ config ARCH_PXA
631config ARCH_MSM 629config ARCH_MSM
632 bool "Qualcomm MSM" 630 bool "Qualcomm MSM"
633 select ARCH_REQUIRE_GPIOLIB 631 select ARCH_REQUIRE_GPIOLIB
634 select CLKDEV_LOOKUP
635 select CLKSRC_OF if OF 632 select CLKSRC_OF if OF
636 select COMMON_CLK 633 select COMMON_CLK
637 select GENERIC_CLOCKEVENTS 634 select GENERIC_CLOCKEVENTS
@@ -649,7 +646,6 @@ config ARCH_SHMOBILE
649 select GENERIC_CLOCKEVENTS 646 select GENERIC_CLOCKEVENTS
650 select HAVE_ARM_SCU if SMP 647 select HAVE_ARM_SCU if SMP
651 select HAVE_ARM_TWD if SMP 648 select HAVE_ARM_TWD if SMP
652 select HAVE_CLK
653 select HAVE_MACH_CLKDEV 649 select HAVE_MACH_CLKDEV
654 select HAVE_SMP 650 select HAVE_SMP
655 select MIGHT_HAVE_CACHE_L2X0 651 select MIGHT_HAVE_CACHE_L2X0
@@ -706,7 +702,6 @@ config ARCH_S3C24XX
706 select CLKSRC_SAMSUNG_PWM 702 select CLKSRC_SAMSUNG_PWM
707 select GENERIC_CLOCKEVENTS 703 select GENERIC_CLOCKEVENTS
708 select GPIO_SAMSUNG 704 select GPIO_SAMSUNG
709 select HAVE_CLK
710 select HAVE_S3C2410_I2C if I2C 705 select HAVE_S3C2410_I2C if I2C
711 select HAVE_S3C2410_WATCHDOG if WATCHDOG 706 select HAVE_S3C2410_WATCHDOG if WATCHDOG
712 select HAVE_S3C_RTC if RTC_CLASS 707 select HAVE_S3C_RTC if RTC_CLASS
@@ -730,7 +725,6 @@ config ARCH_S3C64XX
730 select CPU_V6 725 select CPU_V6
731 select GENERIC_CLOCKEVENTS 726 select GENERIC_CLOCKEVENTS
732 select GPIO_SAMSUNG 727 select GPIO_SAMSUNG
733 select HAVE_CLK
734 select HAVE_S3C2410_I2C if I2C 728 select HAVE_S3C2410_I2C if I2C
735 select HAVE_S3C2410_WATCHDOG if WATCHDOG 729 select HAVE_S3C2410_WATCHDOG if WATCHDOG
736 select HAVE_TCM 730 select HAVE_TCM
@@ -754,7 +748,6 @@ config ARCH_S5P64X0
754 select CPU_V6 748 select CPU_V6
755 select GENERIC_CLOCKEVENTS 749 select GENERIC_CLOCKEVENTS
756 select GPIO_SAMSUNG 750 select GPIO_SAMSUNG
757 select HAVE_CLK
758 select HAVE_S3C2410_I2C if I2C 751 select HAVE_S3C2410_I2C if I2C
759 select HAVE_S3C2410_WATCHDOG if WATCHDOG 752 select HAVE_S3C2410_WATCHDOG if WATCHDOG
760 select HAVE_S3C_RTC if RTC_CLASS 753 select HAVE_S3C_RTC if RTC_CLASS
@@ -773,7 +766,6 @@ config ARCH_S5PC100
773 select CPU_V7 766 select CPU_V7
774 select GENERIC_CLOCKEVENTS 767 select GENERIC_CLOCKEVENTS
775 select GPIO_SAMSUNG 768 select GPIO_SAMSUNG
776 select HAVE_CLK
777 select HAVE_S3C2410_I2C if I2C 769 select HAVE_S3C2410_I2C if I2C
778 select HAVE_S3C2410_WATCHDOG if WATCHDOG 770 select HAVE_S3C2410_WATCHDOG if WATCHDOG
779 select HAVE_S3C_RTC if RTC_CLASS 771 select HAVE_S3C_RTC if RTC_CLASS
@@ -793,7 +785,6 @@ config ARCH_S5PV210
793 select CPU_V7 785 select CPU_V7
794 select GENERIC_CLOCKEVENTS 786 select GENERIC_CLOCKEVENTS
795 select GPIO_SAMSUNG 787 select GPIO_SAMSUNG
796 select HAVE_CLK
797 select HAVE_S3C2410_I2C if I2C 788 select HAVE_S3C2410_I2C if I2C
798 select HAVE_S3C2410_WATCHDOG if WATCHDOG 789 select HAVE_S3C2410_WATCHDOG if WATCHDOG
799 select HAVE_S3C_RTC if RTC_CLASS 790 select HAVE_S3C_RTC if RTC_CLASS
@@ -810,11 +801,9 @@ config ARCH_EXYNOS
810 select ARCH_REQUIRE_GPIOLIB 801 select ARCH_REQUIRE_GPIOLIB
811 select ARCH_SPARSEMEM_ENABLE 802 select ARCH_SPARSEMEM_ENABLE
812 select ARM_GIC 803 select ARM_GIC
813 select CLKDEV_LOOKUP
814 select COMMON_CLK 804 select COMMON_CLK
815 select CPU_V7 805 select CPU_V7
816 select GENERIC_CLOCKEVENTS 806 select GENERIC_CLOCKEVENTS
817 select HAVE_CLK
818 select HAVE_S3C2410_I2C if I2C 807 select HAVE_S3C2410_I2C if I2C
819 select HAVE_S3C2410_WATCHDOG if WATCHDOG 808 select HAVE_S3C2410_WATCHDOG if WATCHDOG
820 select HAVE_S3C_RTC if RTC_CLASS 809 select HAVE_S3C_RTC if RTC_CLASS
@@ -851,7 +840,6 @@ config ARCH_OMAP1
851 select CLKSRC_MMIO 840 select CLKSRC_MMIO
852 select GENERIC_CLOCKEVENTS 841 select GENERIC_CLOCKEVENTS
853 select GENERIC_IRQ_CHIP 842 select GENERIC_IRQ_CHIP
854 select HAVE_CLK
855 select HAVE_IDE 843 select HAVE_IDE
856 select IRQ_DOMAIN 844 select IRQ_DOMAIN
857 select NEED_MACH_IO_H if PCCARD 845 select NEED_MACH_IO_H if PCCARD
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 8e8437dea3ce..616408d76be5 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -12,7 +12,6 @@ config ARCH_HIGHBANK
12 select ARM_GIC 12 select ARM_GIC
13 select ARM_TIMER_SP804 13 select ARM_TIMER_SP804
14 select CACHE_L2X0 14 select CACHE_L2X0
15 select CLKDEV_LOOKUP
16 select COMMON_CLK 15 select COMMON_CLK
17 select CPU_V7 16 select CPU_V7
18 select GENERIC_CLOCKEVENTS 17 select GENERIC_CLOCKEVENTS
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 29a8af6922a8..a91909b95601 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -4,8 +4,8 @@ config ARCH_MXC
4 select ARM_CPU_SUSPEND if PM 4 select ARM_CPU_SUSPEND if PM
5 select ARM_PATCH_PHYS_VIRT 5 select ARM_PATCH_PHYS_VIRT
6 select AUTO_ZRELADDR if !ZBOOT_ROM 6 select AUTO_ZRELADDR if !ZBOOT_ROM
7 select CLKDEV_LOOKUP
8 select CLKSRC_MMIO 7 select CLKSRC_MMIO
8 select COMMON_CLK
9 select GENERIC_ALLOCATOR 9 select GENERIC_ALLOCATOR
10 select GENERIC_CLOCKEVENTS 10 select GENERIC_CLOCKEVENTS
11 select GENERIC_IRQ_CHIP 11 select GENERIC_IRQ_CHIP
@@ -92,14 +92,12 @@ config MACH_MX27
92config SOC_IMX1 92config SOC_IMX1
93 bool 93 bool
94 select ARCH_MX1 94 select ARCH_MX1
95 select COMMON_CLK
96 select CPU_ARM920T 95 select CPU_ARM920T
97 select IMX_HAVE_IOMUX_V1 96 select IMX_HAVE_IOMUX_V1
98 select MXC_AVIC 97 select MXC_AVIC
99 98
100config SOC_IMX21 99config SOC_IMX21
101 bool 100 bool
102 select COMMON_CLK
103 select CPU_ARM926T 101 select CPU_ARM926T
104 select IMX_HAVE_IOMUX_V1 102 select IMX_HAVE_IOMUX_V1
105 select MXC_AVIC 103 select MXC_AVIC
@@ -108,7 +106,6 @@ config SOC_IMX25
108 bool 106 bool
109 select ARCH_MX25 107 select ARCH_MX25
110 select ARCH_MXC_IOMUX_V3 108 select ARCH_MXC_IOMUX_V3
111 select COMMON_CLK
112 select CPU_ARM926T 109 select CPU_ARM926T
113 select MXC_AVIC 110 select MXC_AVIC
114 111
@@ -116,7 +113,6 @@ config SOC_IMX27
116 bool 113 bool
117 select ARCH_HAS_CPUFREQ 114 select ARCH_HAS_CPUFREQ
118 select ARCH_HAS_OPP 115 select ARCH_HAS_OPP
119 select COMMON_CLK
120 select CPU_ARM926T 116 select CPU_ARM926T
121 select IMX_HAVE_IOMUX_V1 117 select IMX_HAVE_IOMUX_V1
122 select MACH_MX27 118 select MACH_MX27
@@ -124,7 +120,6 @@ config SOC_IMX27
124 120
125config SOC_IMX31 121config SOC_IMX31
126 bool 122 bool
127 select COMMON_CLK
128 select CPU_V6 123 select CPU_V6
129 select IMX_HAVE_PLATFORM_MXC_RNGA 124 select IMX_HAVE_PLATFORM_MXC_RNGA
130 select MXC_AVIC 125 select MXC_AVIC
@@ -133,7 +128,6 @@ config SOC_IMX31
133config SOC_IMX35 128config SOC_IMX35
134 bool 129 bool
135 select ARCH_MXC_IOMUX_V3 130 select ARCH_MXC_IOMUX_V3
136 select COMMON_CLK
137 select CPU_V6K 131 select CPU_V6K
138 select HAVE_EPIT 132 select HAVE_EPIT
139 select MXC_AVIC 133 select MXC_AVIC
@@ -144,7 +138,6 @@ config SOC_IMX5
144 select ARCH_HAS_CPUFREQ 138 select ARCH_HAS_CPUFREQ
145 select ARCH_HAS_OPP 139 select ARCH_HAS_OPP
146 select ARCH_MXC_IOMUX_V3 140 select ARCH_MXC_IOMUX_V3
147 select COMMON_CLK
148 select CPU_V7 141 select CPU_V7
149 select MXC_TZIC 142 select MXC_TZIC
150 143
@@ -791,7 +784,6 @@ config SOC_IMX6Q
791 select ARM_ERRATA_764369 if SMP 784 select ARM_ERRATA_764369 if SMP
792 select ARM_ERRATA_775420 785 select ARM_ERRATA_775420
793 select ARM_GIC 786 select ARM_GIC
794 select COMMON_CLK
795 select CPU_V7 787 select CPU_V7
796 select HAVE_ARM_SCU if SMP 788 select HAVE_ARM_SCU if SMP
797 select HAVE_ARM_TWD if SMP 789 select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b5fb5f7992df..c94624429680 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -8,7 +8,6 @@ config ARCH_OMAP2
8 select CPU_V6 8 select CPU_V6
9 select MULTI_IRQ_HANDLER 9 select MULTI_IRQ_HANDLER
10 select SOC_HAS_OMAP2_SDRC 10 select SOC_HAS_OMAP2_SDRC
11 select COMMON_CLK
12 11
13config ARCH_OMAP3 12config ARCH_OMAP3
14 bool "TI OMAP3" 13 bool "TI OMAP3"
@@ -22,7 +21,6 @@ config ARCH_OMAP3
22 select PM_OPP if PM 21 select PM_OPP if PM
23 select PM_RUNTIME if CPU_IDLE 22 select PM_RUNTIME if CPU_IDLE
24 select SOC_HAS_OMAP2_SDRC 23 select SOC_HAS_OMAP2_SDRC
25 select COMMON_CLK
26 select USB_ARCH_HAS_EHCI if USB_SUPPORT 24 select USB_ARCH_HAS_EHCI if USB_SUPPORT
27 25
28config ARCH_OMAP4 26config ARCH_OMAP4
@@ -45,7 +43,6 @@ config ARCH_OMAP4
45 select PM_OPP if PM 43 select PM_OPP if PM
46 select PM_RUNTIME if CPU_IDLE 44 select PM_RUNTIME if CPU_IDLE
47 select USB_ARCH_HAS_EHCI if USB_SUPPORT 45 select USB_ARCH_HAS_EHCI if USB_SUPPORT
48 select COMMON_CLK
49 select ARM_ERRATA_754322 46 select ARM_ERRATA_754322
50 select ARM_ERRATA_775420 47 select ARM_ERRATA_775420
51 48
@@ -59,7 +56,6 @@ config SOC_OMAP5
59 select HAVE_ARM_SCU if SMP 56 select HAVE_ARM_SCU if SMP
60 select HAVE_ARM_TWD if LOCAL_TIMERS 57 select HAVE_ARM_TWD if LOCAL_TIMERS
61 select HAVE_SMP 58 select HAVE_SMP
62 select COMMON_CLK
63 select HAVE_ARM_ARCH_TIMER 59 select HAVE_ARM_ARCH_TIMER
64 select ARM_ERRATA_798181 if SMP 60 select ARM_ERRATA_798181 if SMP
65 61
@@ -70,7 +66,6 @@ config SOC_AM33XX
70 select ARM_CPU_SUSPEND if PM 66 select ARM_CPU_SUSPEND if PM
71 select CPU_V7 67 select CPU_V7
72 select MULTI_IRQ_HANDLER 68 select MULTI_IRQ_HANDLER
73 select COMMON_CLK
74 69
75config SOC_AM43XX 70config SOC_AM43XX
76 bool "TI AM43x" 71 bool "TI AM43x"
@@ -79,7 +74,6 @@ config SOC_AM43XX
79 select ARCH_OMAP2PLUS 74 select ARCH_OMAP2PLUS
80 select MULTI_IRQ_HANDLER 75 select MULTI_IRQ_HANDLER
81 select ARM_GIC 76 select ARM_GIC
82 select COMMON_CLK
83 select MACH_OMAP_GENERIC 77 select MACH_OMAP_GENERIC
84 78
85config ARCH_OMAP2PLUS 79config ARCH_OMAP2PLUS
@@ -89,11 +83,10 @@ config ARCH_OMAP2PLUS
89 select ARCH_HAS_HOLES_MEMORYMODEL 83 select ARCH_HAS_HOLES_MEMORYMODEL
90 select ARCH_OMAP 84 select ARCH_OMAP
91 select ARCH_REQUIRE_GPIOLIB 85 select ARCH_REQUIRE_GPIOLIB
92 select CLKDEV_LOOKUP
93 select CLKSRC_MMIO 86 select CLKSRC_MMIO
87 select COMMON_CLK
94 select GENERIC_CLOCKEVENTS 88 select GENERIC_CLOCKEVENTS
95 select GENERIC_IRQ_CHIP 89 select GENERIC_IRQ_CHIP
96 select HAVE_CLK
97 select OMAP_DM_TIMER 90 select OMAP_DM_TIMER
98 select PINCTRL 91 select PINCTRL
99 select PROC_DEVICETREE if PROC_FS 92 select PROC_DEVICETREE if PROC_FS
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index dd86db467521..037100a1563a 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -4,7 +4,6 @@ config ARCH_SOCFPGA
4 select ARM_AMBA 4 select ARM_AMBA
5 select ARM_GIC 5 select ARM_GIC
6 select CACHE_L2X0 6 select CACHE_L2X0
7 select CLKDEV_LOOKUP
8 select COMMON_CLK 7 select COMMON_CLK
9 select CPU_V7 8 select CPU_V7
10 select DW_APB_TIMER_OF 9 select DW_APB_TIMER_OF
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index df0d59afeb40..ac1710e64d9a 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -7,11 +7,9 @@ menuconfig PLAT_SPEAR
7 default PLAT_SPEAR_SINGLE 7 default PLAT_SPEAR_SINGLE
8 select ARCH_REQUIRE_GPIOLIB 8 select ARCH_REQUIRE_GPIOLIB
9 select ARM_AMBA 9 select ARM_AMBA
10 select CLKDEV_LOOKUP
11 select CLKSRC_MMIO 10 select CLKSRC_MMIO
12 select COMMON_CLK 11 select COMMON_CLK
13 select GENERIC_CLOCKEVENTS 12 select GENERIC_CLOCKEVENTS
14 select HAVE_CLK
15 13
16if PLAT_SPEAR 14if PLAT_SPEAR
17 15
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 67a76f2dfb9f..0c2f44aed404 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -3,7 +3,6 @@ config ARCH_TEGRA
3 select ARCH_HAS_CPUFREQ 3 select ARCH_HAS_CPUFREQ
4 select ARCH_REQUIRE_GPIOLIB 4 select ARCH_REQUIRE_GPIOLIB
5 select ARM_GIC 5 select ARM_GIC
6 select CLKDEV_LOOKUP
7 select CLKSRC_MMIO 6 select CLKSRC_MMIO
8 select CLKSRC_OF 7 select CLKSRC_OF
9 select COMMON_CLK 8 select COMMON_CLK
@@ -11,7 +10,6 @@ config ARCH_TEGRA
11 select GENERIC_CLOCKEVENTS 10 select GENERIC_CLOCKEVENTS
12 select HAVE_ARM_SCU if SMP 11 select HAVE_ARM_SCU if SMP
13 select HAVE_ARM_TWD if SMP 12 select HAVE_ARM_TWD if SMP
14 select HAVE_CLK
15 select HAVE_SMP 13 select HAVE_SMP
16 select MIGHT_HAVE_CACHE_L2X0 14 select MIGHT_HAVE_CACHE_L2X0
17 select MIGHT_HAVE_PCI 15 select MIGHT_HAVE_PCI
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index a1659863bfd5..8e23071bd1b3 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -5,7 +5,6 @@ config ARCH_U300
5 select ARM_AMBA 5 select ARM_AMBA
6 select ARM_PATCH_PHYS_VIRT 6 select ARM_PATCH_PHYS_VIRT
7 select ARM_VIC 7 select ARM_VIC
8 select CLKDEV_LOOKUP
9 select CLKSRC_MMIO 8 select CLKSRC_MMIO
10 select CLKSRC_OF 9 select CLKSRC_OF
11 select COMMON_CLK 10 select COMMON_CLK
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 99a28d628297..c67f8ad5ccd5 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -1,37 +1,32 @@
1config ARCH_U8500 1config ARCH_U8500
2 bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7 2 bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
3 depends on MMU 3 depends on MMU
4 select AB8500_CORE
5 select ABX500_CORE
4 select ARCH_HAS_CPUFREQ 6 select ARCH_HAS_CPUFREQ
5 select ARCH_REQUIRE_GPIOLIB 7 select ARCH_REQUIRE_GPIOLIB
6 select ARM_AMBA 8 select ARM_AMBA
7 select CLKDEV_LOOKUP 9 select ARM_ERRATA_754322
10 select ARM_ERRATA_764369 if SMP
11 select ARM_GIC
12 select CACHE_L2X0
13 select CLKSRC_NOMADIK_MTU
14 select COMMON_CLK
8 select CPU_V7 15 select CPU_V7
9 select GENERIC_CLOCKEVENTS 16 select GENERIC_CLOCKEVENTS
10 select HAVE_ARM_SCU if SMP 17 select HAVE_ARM_SCU if SMP
11 select HAVE_ARM_TWD if SMP 18 select HAVE_ARM_TWD if SMP
12 select HAVE_SMP 19 select HAVE_SMP
13 select MIGHT_HAVE_CACHE_L2X0 20 select MIGHT_HAVE_CACHE_L2X0
21 select PINCTRL
22 select PINCTRL_ABX500
23 select PINCTRL_NOMADIK
24 select PL310_ERRATA_753970 if CACHE_PL310
14 help 25 help
15 Support for ST-Ericsson's Ux500 architecture 26 Support for ST-Ericsson's Ux500 architecture
16 27
17if ARCH_U8500 28if ARCH_U8500
18 29
19config UX500_SOC_COMMON
20 bool
21 default y
22 select ABX500_CORE
23 select AB8500_CORE
24 select ARM_ERRATA_754322
25 select ARM_ERRATA_764369 if SMP
26 select ARM_GIC
27 select CACHE_L2X0
28 select CLKSRC_NOMADIK_MTU
29 select COMMON_CLK
30 select PINCTRL
31 select PINCTRL_NOMADIK
32 select PINCTRL_ABX500
33 select PL310_ERRATA_753970 if CACHE_PL310
34
35config UX500_SOC_DB8500 30config UX500_SOC_DB8500
36 bool 31 bool
37 select CPU_FREQ_TABLE if CPU_FREQ 32 select CPU_FREQ_TABLE if CPU_FREQ
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 365795447804..d7e7422527ca 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -4,14 +4,12 @@ config ARCH_VEXPRESS
4 select ARM_AMBA 4 select ARM_AMBA
5 select ARM_GIC 5 select ARM_GIC
6 select ARM_TIMER_SP804 6 select ARM_TIMER_SP804
7 select CLKDEV_LOOKUP
8 select COMMON_CLK 7 select COMMON_CLK
9 select COMMON_CLK_VERSATILE 8 select COMMON_CLK_VERSATILE
10 select CPU_V7 9 select CPU_V7
11 select GENERIC_CLOCKEVENTS 10 select GENERIC_CLOCKEVENTS
12 select HAVE_ARM_SCU if SMP 11 select HAVE_ARM_SCU if SMP
13 select HAVE_ARM_TWD if SMP 12 select HAVE_ARM_TWD if SMP
14 select HAVE_CLK
15 select HAVE_PATA_PLATFORM 13 select HAVE_PATA_PLATFORM
16 select HAVE_SMP 14 select HAVE_SMP
17 select ICST 15 select ICST
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 9b252934b206..927be93b692e 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -5,7 +5,6 @@ config ARCH_VT8500
5 select CLKDEV_LOOKUP 5 select CLKDEV_LOOKUP
6 select CLKSRC_OF 6 select CLKSRC_OF
7 select GENERIC_CLOCKEVENTS 7 select GENERIC_CLOCKEVENTS
8 select HAVE_CLK
9 select VT8500_TIMER 8 select VT8500_TIMER
10 select PINCTRL 9 select PINCTRL
11 help 10 help
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-17 02:15:20 -0500