Commit 04e8d9d1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap: split up arch/arm/plat-omap/Kconfig 



All the remaining features in here are either omap1
or omap2plus specific, so move them into the respective
Kconfig files.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 16630718

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -656,8 +656,6 @@ source "arch/arm/mach-npcm/Kconfig" 


source "arch/arm/mach-nspire/Kconfig"



source "arch/arm/plat-omap/Kconfig"



source "arch/arm/mach-omap1/Kconfig"



source "arch/arm/mach-omap2/Kconfig"

arch/arm/mach-omap1/Kconfig

+37 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ config ARCH_OMAP16XX 
	select CPU_ARM926T

	select OMAP_DM_TIMER



config ARCH_OMAP

	bool



comment "OMAP Feature Selections"



config OMAP_MUX

	bool "OMAP multiplexing support"

	default y
@@ -69,6 +74,38 @@ config OMAP_32K_TIMER 
	  The actual timer selection is done in the board file

	  through the (DT_)MACHINE_START structure.



config OMAP_MPU_TIMER

	bool "Use mpu timer"

	depends on ARCH_OMAP1

	help

	  Select this option if you want to use the OMAP mpu timer. This

	  timer provides more intra-tick resolution than the 32KHz timer,

	  but consumes more power.



config OMAP_SERIAL_WAKE

	bool "Enable wake-up events for serial ports"

	depends on ARCH_OMAP1 && OMAP_MUX

	default y

	help

	  Select this option if you want to have your system wake up

	  to data on the serial RX line. This allows you to wake the

	  system from serial console.



config OMAP_RESET_CLOCKS

	bool "Reset unused clocks during boot"

	depends on ARCH_OMAP

	help

	  Say Y if you want to reset unused clocks during boot.

	  This option saves power, but assumes all drivers are

	  using the clock framework. Broken drivers that do not

	  yet use clock framework may not work with this option.

	  If you are booting from another operating system, you

	  probably do not want this option enabled until your

	  device drivers work properly.



config ARCH_OMAP_OTG

	bool



comment "OMAP Board Type"



config MACH_OMAP_INNOVATOR

arch/arm/mach-omap2/Kconfig

+49 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ config OMAP_INTERCONNECT_BARRIER 
	bool

	select ARM_HEAVY_MB

	

config ARCH_OMAP

	bool



if ARCH_OMAP2PLUS
@@ -153,6 +155,53 @@ config SOC_HAS_REALTIME_COUNTER 
	depends on SOC_OMAP5 || SOC_DRA7XX

	default y



config POWER_AVS_OMAP

	bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"

	depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM

	select POWER_SUPPLY

	help

	  Say Y to enable AVS(Adaptive Voltage Scaling)

	  support on OMAP containing the version 1 or

	  version 2 of the SmartReflex IP.

	  V1 is the 65nm version used in OMAP3430.

	  V2 is the update for the 45nm version of the IP used in OMAP3630

	  and OMAP4430



	  Please note, that by default SmartReflex is only

	  initialized and not enabled. To enable the automatic voltage

	  compensation for vdd mpu and vdd core from user space,

	  user must write 1 to

		/debug/smartreflex/sr_<X>/autocomp,

	  where X is mpu_iva or core for OMAP3.

	  Optionally autocompensation can be enabled in the kernel

	  by default during system init via the enable_on_init flag

	  which an be passed as platform data to the smartreflex driver.



config POWER_AVS_OMAP_CLASS3

	bool "Class 3 mode of Smartreflex Implementation"

	depends on POWER_AVS_OMAP && TWL4030_CORE

	help

	  Say Y to enable Class 3 implementation of Smartreflex



	  Class 3 implementation of Smartreflex employs continuous hardware

	  voltage calibration.



config OMAP3_L2_AUX_SECURE_SAVE_RESTORE

	bool "OMAP3 HS/EMU save and restore for L2 AUX control register"

	depends on ARCH_OMAP3 && PM

	help

	  Without this option, L2 Auxiliary control register contents are

	  lost during off-mode entry on HS/EMU devices. This feature

	  requires support from PPA / boot-loader in HS/EMU devices, which

	  currently does not exist by default.



config OMAP3_L2_AUX_SECURE_SERVICE_SET_ID

	int "Service ID for the support routine to set L2 AUX control"

	depends on OMAP3_L2_AUX_SECURE_SAVE_RESTORE

	default 43

	help

	  PPA routine service ID for setting L2 auxiliary control register.



comment "OMAP Core Type"

	depends on ARCH_OMAP2

arch/arm/plat-omap/Kconfig

deleted100644 → 0
+0 −92
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config ARCH_OMAP

	bool



if ARCH_OMAP



menu "TI OMAP Common Features"



config ARCH_OMAP_OTG

	bool



comment "OMAP Feature Selections"



config POWER_AVS_OMAP

	bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"

	depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM

	select POWER_SUPPLY

	help

	  Say Y to enable AVS(Adaptive Voltage Scaling)

	  support on OMAP containing the version 1 or

	  version 2 of the SmartReflex IP.

	  V1 is the 65nm version used in OMAP3430.

	  V2 is the update for the 45nm version of the IP used in OMAP3630

	  and OMAP4430



	  Please note, that by default SmartReflex is only

	  initialized and not enabled. To enable the automatic voltage

	  compensation for vdd mpu and vdd core from user space,

	  user must write 1 to

		/debug/smartreflex/sr_<X>/autocomp,

	  where X is mpu_iva or core for OMAP3.

	  Optionally autocompensation can be enabled in the kernel

	  by default during system init via the enable_on_init flag

	  which an be passed as platform data to the smartreflex driver.



config POWER_AVS_OMAP_CLASS3

	bool "Class 3 mode of Smartreflex Implementation"

	depends on POWER_AVS_OMAP && TWL4030_CORE

	help

	  Say Y to enable Class 3 implementation of Smartreflex



	  Class 3 implementation of Smartreflex employs continuous hardware

	  voltage calibration.



config OMAP_RESET_CLOCKS

	bool "Reset unused clocks during boot"

	depends on ARCH_OMAP

	help

	  Say Y if you want to reset unused clocks during boot.

	  This option saves power, but assumes all drivers are

	  using the clock framework. Broken drivers that do not

	  yet use clock framework may not work with this option.

	  If you are booting from another operating system, you

	  probably do not want this option enabled until your

	  device drivers work properly.



config OMAP_MPU_TIMER

	bool "Use mpu timer"

	depends on ARCH_OMAP1

	help

	  Select this option if you want to use the OMAP mpu timer. This

	  timer provides more intra-tick resolution than the 32KHz timer,

	  but consumes more power.



config OMAP3_L2_AUX_SECURE_SAVE_RESTORE

	bool "OMAP3 HS/EMU save and restore for L2 AUX control register"

	depends on ARCH_OMAP3 && PM

	help

	  Without this option, L2 Auxiliary control register contents are

	  lost during off-mode entry on HS/EMU devices. This feature

	  requires support from PPA / boot-loader in HS/EMU devices, which

	  currently does not exist by default.



config OMAP3_L2_AUX_SECURE_SERVICE_SET_ID

	int "Service ID for the support routine to set L2 AUX control"

	depends on OMAP3_L2_AUX_SECURE_SAVE_RESTORE

	default 43

	help

	  PPA routine service ID for setting L2 auxiliary control register.



config OMAP_SERIAL_WAKE

	bool "Enable wake-up events for serial ports"

	depends on ARCH_OMAP1 && OMAP_MUX

	default y

	help

	  Select this option if you want to have your system wake up

	  to data on the serial RX line. This allows you to wake the

	  system from serial console.



endmenu



endif