Commit 0cd47616 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap1/multiplatform-prep' of... 

Merge branch 'omap1/multiplatform-prep' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

 into arm/multiplatform

This is the full series for converting OMAP1 to multiplatform, rebased
from my 2019 attempt to do the same thing. The soc tree contains simpler
patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which
means we are getting closer to completing this for all ARMv5 platforms
(I have patches for PXA, which is the last one remaining).

Janusz already tested the branch separately and did the missing work
for the common-clk conversion after my previous approach was broken.

Aaro found one regression during additional testing, this is fixed now.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c0c237d1 917bf5a3

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14386,6 +14386,7 @@ F: arch/arm/boot/dts/am335x-nano.dts 








OMAP1 SUPPORT









M:	Aaro Koskinen <aaro.koskinen@iki.fi>









M:	Janusz Krzysztofik <jmkrzyszt@gmail.com>









M:	Tony Lindgren <tony@atomide.com>









L:	linux-omap@vger.kernel.org









S:	Maintained
































arch/arm/Kconfig



+1
−5






























Original line number
Diff line number
Diff line







@@ -418,14 +418,12 @@ config ARCH_SA1100







config ARCH_OMAP1









	bool "TI OMAP1"









	depends on CPU_LITTLE_ENDIAN









	select ARCH_OMAP









	select CLKSRC_MMIO









	select FORCE_PCI if PCCARD









	select GENERIC_IRQ_CHIP









	select GPIOLIB









	select HAVE_LEGACY_CLK









	select IRQ_DOMAIN









	select NEED_MACH_IO_H if PCCARD









	select NEED_MACH_MEMORY_H









	select SPARSE_IRQ









	help









	  Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)








@@ -586,8 +584,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/Kconfig.debug



+3
−3






























Original line number
Diff line number
Diff line







@@ -1837,9 +1837,9 @@ config DEBUG_UART_VIRT







	default 0xfec00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN









	default 0xfec00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN









	default 0xfef36000 if DEBUG_HIGHBANK_UART









	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1









	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2









	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3









	default 0xff0b0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1









	default 0xff0b0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2









	default 0xff0b9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3









	default 0xffd01000 if DEBUG_HIP01_UART









	default DEBUG_UART_PHYS if !MMU









	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
































arch/arm/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -224,7 +224,6 @@ machine-$(CONFIG_PLAT_SPEAR)		+= spear

















# Platform directory name.  This list is sorted alphanumerically









# by CONFIG_* macro name.









plat-$(CONFIG_ARCH_OMAP)	+= omap









plat-$(CONFIG_PLAT_ORION)	+= orion









plat-$(CONFIG_PLAT_PXA)		+= pxa










































arch/arm/mach-omap1/Kconfig



+57
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,15 @@ config ARCH_OMAP16XX







	select CPU_ARM926T









	select OMAP_DM_TIMER



















config ARCH_OMAP1_ANY









	select ARCH_OMAP









	def_bool ARCH_OMAP730 || ARCH_OMAP850 || ARCH_OMAP15XX || ARCH_OMAP16XX



















config ARCH_OMAP









	bool



















comment "OMAP Feature Selections"



















config OMAP_MUX









	bool "OMAP multiplexing support"









	default y








@@ -53,6 +62,54 @@ config OMAP_MUX_WARNINGS







	  to change the pin multiplexing setup.	 When there are no warnings









	  printed, it's safe to deselect OMAP_MUX for your product.



















config OMAP_32K_TIMER









	bool "Use 32KHz timer"









	depends on ARCH_OMAP16XX









	default ARCH_OMAP16XX









	help









	  Select this option if you want to enable the OMAP 32KHz timer.









	  This timer saves power compared to the OMAP_MPU_TIMER, and has









	  support for no tick during idle. The 32KHz timer provides less









	  intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is









	  currently only available for OMAP16XX, 24XX, 34XX, OMAP4/5 and DRA7XX.



















	  On OMAP2PLUS this value is only used for CONFIG_HZ and









	  CLOCK_TICK_RATE compile time calculation.









	  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