Commit 07d8a49c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Olof Johansson
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarDinh Nguyen <dinguyen@altera.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent c884357e

arch/arm/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ config ARCH_AT91 
	bool "Atmel AT91"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select HAVE_CLK

	select IRQ_DOMAIN

	select NEED_MACH_GPIO_H

	select NEED_MACH_IO_H if PCCARD
@@ -372,7 +371,6 @@ config ARCH_CLPS711X 
	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

	select ARCH_REQUIRE_GPIOLIB

	select AUTO_ZRELADDR

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select COMMON_CLK

	select CPU_ARM720T
@@ -631,7 +629,6 @@ config ARCH_PXA 
config ARCH_MSM

	bool "Qualcomm MSM"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_OF if OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS
@@ -649,7 +646,6 @@ config ARCH_SHMOBILE 
	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_CLK

	select HAVE_MACH_CLKDEV

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0
@@ -706,7 +702,6 @@ config ARCH_S3C24XX 
	select CLKSRC_SAMSUNG_PWM

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS
@@ -730,7 +725,6 @@ config ARCH_S3C64XX 
	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_TCM
@@ -754,7 +748,6 @@ config ARCH_S5P64X0 
	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS
@@ -773,7 +766,6 @@ config ARCH_S5PC100 
	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS
@@ -793,7 +785,6 @@ config ARCH_S5PV210 
	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS
@@ -810,11 +801,9 @@ config ARCH_EXYNOS 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_SPARSEMEM_ENABLE

	select ARM_GIC

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS
@@ -851,7 +840,6 @@ config ARCH_OMAP1 
	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select HAVE_CLK

	select HAVE_IDE

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

arch/arm/mach-highbank/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ config ARCH_HIGHBANK 
	select ARM_GIC

	select ARM_TIMER_SP804

	select CACHE_L2X0

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_V7

	select GENERIC_CLOCKEVENTS

arch/arm/mach-imx/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ config ARCH_MXC 
	select ARM_CPU_SUSPEND if PM

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select COMMON_CLK

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP
@@ -92,14 +92,12 @@ config MACH_MX27 
config SOC_IMX1

	bool

	select ARCH_MX1

	select COMMON_CLK

	select CPU_ARM920T

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC



config SOC_IMX21

	bool

	select COMMON_CLK

	select CPU_ARM926T

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC
@@ -108,7 +106,6 @@ config SOC_IMX25 
	bool

	select ARCH_MX25

	select ARCH_MXC_IOMUX_V3

	select COMMON_CLK

	select CPU_ARM926T

	select MXC_AVIC
@@ -116,7 +113,6 @@ config SOC_IMX27 
	bool

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_OPP

	select COMMON_CLK

	select CPU_ARM926T

	select IMX_HAVE_IOMUX_V1

	select MACH_MX27
@@ -124,7 +120,6 @@ config SOC_IMX27 


config SOC_IMX31

	bool

	select COMMON_CLK

	select CPU_V6

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select MXC_AVIC
@@ -133,7 +128,6 @@ config SOC_IMX31 
config SOC_IMX35

	bool

	select ARCH_MXC_IOMUX_V3

	select COMMON_CLK

	select CPU_V6K

	select HAVE_EPIT

	select MXC_AVIC
@@ -144,7 +138,6 @@ config SOC_IMX5 
	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_OPP

	select ARCH_MXC_IOMUX_V3

	select COMMON_CLK

	select CPU_V7

	select MXC_TZIC
@@ -791,7 +784,6 @@ config SOC_IMX6Q 
	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_775420

	select ARM_GIC

	select COMMON_CLK

	select CPU_V7

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

arch/arm/mach-omap2/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ config ARCH_OMAP2 
	select CPU_V6

	select MULTI_IRQ_HANDLER

	select SOC_HAS_OMAP2_SDRC

	select COMMON_CLK



config ARCH_OMAP3

	bool "TI OMAP3"
@@ -22,7 +21,6 @@ config ARCH_OMAP3 
	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select SOC_HAS_OMAP2_SDRC

	select COMMON_CLK

	select USB_ARCH_HAS_EHCI if USB_SUPPORT



config ARCH_OMAP4
@@ -45,7 +43,6 @@ config ARCH_OMAP4 
	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select COMMON_CLK

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420
@@ -59,7 +56,6 @@ config SOC_OMAP5 
	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if LOCAL_TIMERS

	select HAVE_SMP

	select COMMON_CLK

	select HAVE_ARM_ARCH_TIMER

	select ARM_ERRATA_798181 if SMP
@@ -70,7 +66,6 @@ config SOC_AM33XX 
	select ARM_CPU_SUSPEND if PM

	select CPU_V7

	select MULTI_IRQ_HANDLER

	select COMMON_CLK



config SOC_AM43XX

	bool "TI AM43x"
@@ -79,7 +74,6 @@ config SOC_AM43XX 
	select ARCH_OMAP2PLUS

	select MULTI_IRQ_HANDLER

	select ARM_GIC

	select COMMON_CLK

	select MACH_OMAP_GENERIC



config ARCH_OMAP2PLUS
@@ -89,11 +83,10 @@ config ARCH_OMAP2PLUS 
	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select HAVE_CLK

	select OMAP_DM_TIMER

	select PINCTRL

	select PROC_DEVICETREE if PROC_FS

arch/arm/mach-socfpga/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ config ARCH_SOCFPGA 
	select ARM_AMBA

	select ARM_GIC

	select CACHE_L2X0

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_V7

	select DW_APB_TIMER_OF

CRA Git | Maintained and supported by SUSTech CRA and CCSE