![Linus Torvalds](/assets/img/avatar_default.png)
Again we have a sizable (but not huge) cleanup branch with a net delta of about -3k lines. Main contents here is: - A bunch of development/cleanup of a few PXA boards - Removal of bockw platforms on shmobile, since the platform has now gone completely multiplatform. Whee! - move of the 32kHz timer on OMAP to a proper timesource - Misc cleanup of older OMAP material (incl removal of one board file) - Switch over to new common PWM lookup support for several platforms There's also a handful of other cleanups across the tree, but the above are the major pieces. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWQCN8AAoJEIwa5zzehBx3WWUP/1uX+W9QDC3H1qrlVbHZRjGB ytvg/q/6pL9teBF4Dga2MAAKLTUomSLWL6xJGhsIUZJjgyik5KjbTMy6SJukk7VA R04nQ9oSYeaWP61X5glE6SndrKGBemfFUZ1+e6OKWEBSu9ScU678PfOcyzvOgILA +nE+13uGwSkIGTxLHGSHPFjj1/If/lZovb3MCAqXs76Hw/GkRN9jPvQrimJY/ndI ZqDDQEJzriB5BKpKMRfF+bwTRZzTKTv/pyvz8kfTzjs1u8DQ7zwNA2do3hm7iGRt Kf0OZZCRIyDIEXUQwUgr9KNasHLf+IH5A0edRUbP4gmMo3REiwCgkPhXXgbmR0pn +xtDHkMHg+KAWJYyeEJBCgwiOCZFpTw4fVKbq3aaOR7yagK9y0jdcFtid8BL0bfa iTauKpbApVlBG5EEjSNJSuIeeDzPsSf3mgLGQtZNyuR6XGMPj2cDzSrm94vnjuVJ 4gxslILTHtqpqg6jEsHZa/Ptd8G3VYQbja6MOvIsf0O8AULo8YpSU3P4RUbzX4Pq mUAFKzh9BuaSAMcLmwXCjy40f2DuzKTQUb2FkNFeompLGeCxTUh/2kuEJ9mxN5TB MstLTyqW2/Zu5RFnVUaI/G1vOkZ4ZDJeJIwPolG13ZwlCoTpnkWvLjJAVjChbpEX 0iBistrj5vXEFrjsAz6c =uI7R -----END PGP SIGNATURE----- Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC cleanups from Olof Johansson: "Again we have a sizable (but not huge) cleanup branch with a net delta of about -3k lines. Main contents here is: - A bunch of development/cleanup of a few PXA boards - Removal of bockw platforms on shmobile, since the platform has now gone completely multiplatform. Whee! - move of the 32kHz timer on OMAP to a proper timesource - Misc cleanup of older OMAP material (incl removal of one board file) - Switch over to new common PWM lookup support for several platforms There's also a handful of other cleanups across the tree, but the above are the major pieces" * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (103 commits) ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs ARM: DRA7: hwmod data: Remove spinlock hwmod addrs ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data ARM: Remove __ref on hotplug cpu die path ARM: Remove open-coded version of IRQCHIP_DECLARE arm: omap2: board-generic: use omap4_local_timer_init for AM437x ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data ARM: OMAP: Remove duplicated operand in OR operation clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode ARM: pxa: raumfeld: make some variables static ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c ARM: OMAP2+: Rename cpu_is macros to soc_is arm: omap2: timer: limit hwmod usage to non-DT boots arm: omap2+: select 32k clocksource driver clocksource: add TI 32.768 Hz counter driver arm: omap2: timer: rename omap_sync32k_timer_init() arm: omap2: timer: always call clocksource_of_init() when DT arm: omap2: timer: move realtime_counter_init() around ...
242 lines
4.9 KiB
Plaintext
242 lines
4.9 KiB
Plaintext
menu "TI OMAP/AM/DM/DRA Family"
|
|
depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
|
|
|
|
config ARCH_OMAP2
|
|
bool "TI OMAP2"
|
|
depends on ARCH_MULTI_V6
|
|
select ARCH_OMAP2PLUS
|
|
select CPU_V6
|
|
select SOC_HAS_OMAP2_SDRC
|
|
|
|
config ARCH_OMAP3
|
|
bool "TI OMAP3"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARM_CPU_SUSPEND if PM
|
|
select OMAP_INTERCONNECT
|
|
select PM_OPP if PM
|
|
select PM if CPU_IDLE
|
|
select SOC_HAS_OMAP2_SDRC
|
|
|
|
config ARCH_OMAP4
|
|
bool "TI OMAP4"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
|
|
select ARM_CPU_SUSPEND if PM
|
|
select ARM_ERRATA_720789
|
|
select ARM_GIC
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_TWD if SMP
|
|
select OMAP_INTERCONNECT
|
|
select OMAP_INTERCONNECT_BARRIER
|
|
select PL310_ERRATA_588369 if CACHE_L2X0
|
|
select PL310_ERRATA_727915 if CACHE_L2X0
|
|
select PM_OPP if PM
|
|
select PM if CPU_IDLE
|
|
select ARM_ERRATA_754322
|
|
select ARM_ERRATA_775420
|
|
|
|
config SOC_OMAP5
|
|
bool "TI OMAP5"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARM_CPU_SUSPEND if PM
|
|
select ARM_GIC
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_ARCH_TIMER
|
|
select ARM_ERRATA_798181 if SMP
|
|
select OMAP_INTERCONNECT
|
|
select OMAP_INTERCONNECT_BARRIER
|
|
select PM_OPP if PM
|
|
select ZONE_DMA if ARM_LPAE
|
|
|
|
config SOC_AM33XX
|
|
bool "TI AM33XX"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARM_CPU_SUSPEND if PM
|
|
|
|
config SOC_AM43XX
|
|
bool "TI AM43x"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARM_GIC
|
|
select MACH_OMAP_GENERIC
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
select HAVE_ARM_SCU
|
|
|
|
config SOC_DRA7XX
|
|
bool "TI DRA7XX"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARM_CPU_SUSPEND if PM
|
|
select ARM_GIC
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_ARCH_TIMER
|
|
select IRQ_CROSSBAR
|
|
select ARM_ERRATA_798181 if SMP
|
|
select OMAP_INTERCONNECT
|
|
select OMAP_INTERCONNECT_BARRIER
|
|
select PM_OPP if PM
|
|
select ZONE_DMA if ARM_LPAE
|
|
|
|
config ARCH_OMAP2PLUS
|
|
bool
|
|
select ARCH_HAS_BANDGAP
|
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
|
select ARCH_OMAP
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select CLKSRC_MMIO
|
|
select GENERIC_IRQ_CHIP
|
|
select MACH_OMAP_GENERIC
|
|
select MEMORY
|
|
select MFD_SYSCON
|
|
select OMAP_DM_TIMER
|
|
select OMAP_GPMC
|
|
select PINCTRL
|
|
select SOC_BUS
|
|
select OMAP_IRQCHIP
|
|
select CLKSRC_TI_32K
|
|
help
|
|
Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
|
|
|
|
config OMAP_INTERCONNECT_BARRIER
|
|
bool
|
|
select ARM_HEAVY_MB
|
|
|
|
|
|
if ARCH_OMAP2PLUS
|
|
|
|
menu "TI OMAP2/3/4 Specific Features"
|
|
|
|
config ARCH_OMAP2PLUS_TYPICAL
|
|
bool "Typical OMAP configuration"
|
|
default y
|
|
select AEABI
|
|
select HIGHMEM
|
|
select I2C
|
|
select I2C_OMAP
|
|
select MENELAUS if ARCH_OMAP2
|
|
select NEON if CPU_V7
|
|
select PM
|
|
select REGULATOR
|
|
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
|
|
select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
|
|
select VFP
|
|
help
|
|
Compile a kernel suitable for booting most boards
|
|
|
|
config SOC_HAS_OMAP2_SDRC
|
|
bool "OMAP2 SDRAM Controller support"
|
|
|
|
config SOC_HAS_REALTIME_COUNTER
|
|
bool "Real time free running counter"
|
|
depends on SOC_OMAP5 || SOC_DRA7XX
|
|
default y
|
|
|
|
comment "OMAP Core Type"
|
|
depends on ARCH_OMAP2
|
|
|
|
config SOC_OMAP2420
|
|
bool "OMAP2420 support"
|
|
depends on ARCH_OMAP2
|
|
default y
|
|
select OMAP_DM_TIMER
|
|
select SOC_HAS_OMAP2_SDRC
|
|
|
|
config SOC_OMAP2430
|
|
bool "OMAP2430 support"
|
|
depends on ARCH_OMAP2
|
|
default y
|
|
select SOC_HAS_OMAP2_SDRC
|
|
|
|
config SOC_OMAP3430
|
|
bool "OMAP3430 support"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select SOC_HAS_OMAP2_SDRC
|
|
|
|
config SOC_TI81XX
|
|
bool "TI81XX support"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
|
|
config OMAP_PACKAGE_CBC
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CBB
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CUS
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CBP
|
|
bool
|
|
|
|
comment "OMAP Legacy Platform Data Board Type"
|
|
depends on ARCH_OMAP2PLUS
|
|
|
|
config MACH_OMAP_GENERIC
|
|
bool
|
|
|
|
config MACH_OMAP2_TUSB6010
|
|
bool
|
|
depends on ARCH_OMAP2 && SOC_OMAP2420
|
|
default y if MACH_NOKIA_N8X0
|
|
|
|
config MACH_OMAP_LDP
|
|
bool "OMAP3 LDP board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_OMAP3517EVM
|
|
bool "OMAP3517/ AM3517 EVM board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
|
|
config MACH_OMAP3_PANDORA
|
|
bool "OMAP3 Pandora"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
|
|
config MACH_NOKIA_N810
|
|
bool
|
|
|
|
config MACH_NOKIA_N810_WIMAX
|
|
bool
|
|
|
|
config MACH_NOKIA_N8X0
|
|
bool "Nokia N800/N810"
|
|
depends on SOC_OMAP2420
|
|
default y
|
|
select MACH_NOKIA_N810
|
|
select MACH_NOKIA_N810_WIMAX
|
|
|
|
config MACH_NOKIA_RX51
|
|
bool "Nokia N900 (RX-51) phone"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config OMAP3_SDRC_AC_TIMING
|
|
bool "Enable SDRC AC timing register changes"
|
|
depends on ARCH_OMAP3
|
|
default n
|
|
help
|
|
If you know that none of your system initiators will attempt to
|
|
access SDRAM during CORE DVFS, select Y here. This should boost
|
|
SDRAM performance at lower CORE OPPs. There are relatively few
|
|
users who will wish to say yes at this point - almost everyone will
|
|
wish to say no. Selecting yes without understanding what is
|
|
going on could result in system crashes;
|
|
|
|
endmenu
|
|
|
|
endif
|
|
|
|
endmenu
|