Commit a0694861 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support 



Flip on multiplatform support for omap2+.

No changes to omap2plus_defconfig needed, but please note
that you may need to update your custom config files to
make sure you have:

CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_OMAP2PLUS=y

And may need CONFIG_ARCH_MULTI_V6=y if booting omap2 boards.

Cc: Russell King <linux@arm.linux.org.uk>
Tested-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a62a6e98

arch/arm/Kconfig

+10 −3
Original line number Original line Diff line number Diff line
@@ -937,17 +937,24 @@ config ARCH_DAVINCI 
	help

	help

	  Support for TI's DaVinci platform.

	  Support for TI's DaVinci platform.





config ARCH_OMAP

config ARCH_OMAP1

	bool "TI OMAP"

	bool "TI OMAP1"

	depends on MMU

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select HAVE_CLK

	select HAVE_CLK

	select HAVE_IDE

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).

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





config ARCH_VT8500_SINGLE

config ARCH_VT8500_SINGLE

	bool "VIA/WonderMedia 85xx"

	bool "VIA/WonderMedia 85xx"

arch/arm/configs/omap2plus_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2PLUS=y

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_MUX_DEBUG=y

CONFIG_OMAP_MUX_DEBUG=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_THUMBEE=y

arch/arm/mach-omap2/Kconfig

+23 −0
Original line number Original line Diff line number Diff line 
config ARCH_OMAP

	bool



config ARCH_OMAP2PLUS

	bool "TI OMAP2/3/4/5 SoCs with device tree support" if (ARCH_MULTI_V6 || ARCH_MULTI_V7)

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select HAVE_CLK

	select OMAP_DM_TIMER

	select PINCTRL

	select PROC_DEVICETREE if PROC_FS

	select SPARSE_IRQ

	select USE_OF

	help

	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5





if ARCH_OMAP2PLUS

if ARCH_OMAP2PLUS





menu "TI OMAP2/3/4 Specific Features"

menu "TI OMAP2/3/4 Specific Features"

arch/arm/mach-omap2/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,9 @@ 
# Makefile for the linux kernel.

# Makefile for the linux kernel.

#

#





ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \

	-I$(srctree)/arch/arm/plat-omap/include



# Common support

# Common support

obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \

obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

arch/arm/plat-omap/Kconfig

+0 −30
Original line number Original line Diff line number Diff line
@@ -5,36 +5,6 @@ menu "TI OMAP Common Features" 
config ARCH_OMAP_OTG

config ARCH_OMAP_OTG

	bool

	bool





choice

	prompt "OMAP System Type"

	default ARCH_OMAP2PLUS



config ARCH_OMAP1

	bool "TI OMAP1"

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

	select NEED_MACH_MEMORY_H

	help

	  "Systems based on omap7xx, omap15xx or omap16xx"



config ARCH_OMAP2PLUS

	bool "TI OMAP2/3/4"

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select OMAP_DM_TIMER

	select PINCTRL

	select PROC_DEVICETREE if PROC_FS

	select SPARSE_IRQ

	select USE_OF

	help

	  "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5"



endchoice



comment "OMAP Feature Selections"

comment "OMAP Feature Selections"





config OMAP_DEBUG_DEVICES

config OMAP_DEBUG_DEVICES

CRA Git | Maintained and supported by SUSTech CRA and CCSE