mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
041c79514a
This time we have a very typical update which is mostly fixes and updates to
drivers and no new drivers.
- Biggest change is coming from Peter for edma cleanup which even caused
some last minute regression, things seem settled now
- idma64 and dw updates
- iotdma updates
- module autoload fixes for various drivers
- scatter gather support for hdmac
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJWP1vYAAoJEHwUBw8lI4NHKg8QAKwJ/iPxZDMfWwCLAoZoeaDp
GgOmxIZ3LWrFQHIziI1IUcxSAU28Z+N6GBziaXycw49oQic4J/ukHGhgxwI2GM/W
JGbFzHalnwdGqKzVZyfWGV0njT3KRvwKl7qqb66ZhikF5lD5imga66QGGxof8wBK
uoXra7yycrE8nGpyY5Gdd4H59aWVyAK1fW6+0cxa2kMfWo8vLkgj/olbzYZydhQz
DFCEvx2hbTyP/8VjGybVhtd+oeLjX43tGJOm6weyCb/8z3/soD73CChZIP53Mt6i
g+LKPfurRZ3VGILgdemkiMB+5pXi4jhmziw5pCSI6BluUGVZAMyg8hC1zapFUr/2
HaLfVmtxYdsBlceuMss1f3vyN2d+kRdDPKlOb9Td0PC2TEpSa5QayuMscvVfau+Q
epSdIxgjlHqAVDVZJ0kX55FLdmItx36tat6zJL5cUcZmrDvEY3TQmvcXyR2dIltY
U9WB2lRaETOG4Js0gAItXDjijNvLs0F4q10Zk6RdH4BcWbuqvONAhaCpWKeOWNsf
NgQkkg+DqHqol6+C0pI0uX6dvEfwJuZ4bqq98wl4SryuxWJNra/g55/oFEFDbJCU
oRMPYguMUgV8tzCpAurmDhxcrsZu/dvaSSW+flVz2QP81ecvFjRnZ8hhXbCr6iWi
VVoAISmQBQPCXoqPr7ZC
=tIzO
-----END PGP SIGNATURE-----
Merge tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine updates from Vinod Koul:
"This time we have a very typical update which is mostly fixes and
updates to drivers and no new drivers.
- the biggest change is coming from Peter for edma cleanup which even
caused some last minute regression, things seem settled now
- idma64 and dw updates
- iotdma updates
- module autoload fixes for various drivers
- scatter gather support for hdmac"
* tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (77 commits)
dmaengine: edma: Add dummy driver skeleton for edma3-tptc
Revert "ARM: DTS: am33xx: Use the new DT bindings for the eDMA3"
Revert "ARM: DTS: am437x: Use the new DT bindings for the eDMA3"
dmaengine: dw: some Intel devices has no memcpy support
dmaengine: dw: platform: provide platform data for Intel
dmaengine: dw: don't override platform data with autocfg
dmaengine: hdmac: Add scatter-gathered memset support
dmaengine: hdmac: factorise memset descriptor allocation
dmaengine: virt-dma: Fix kernel-doc annotations
ARM: DTS: am437x: Use the new DT bindings for the eDMA3
ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
dmaengine: edma: New device tree binding
dmaengine: Kconfig: edma: Select TI_DMA_CROSSBAR in case of ARCH_OMAP
dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx
dmaengine: edma: Merge the of parsing functions
dmaengine: edma: Do not allocate memory for edma_rsv_info in case of DT boot
dmaengine: edma: Refactor the dma device and channel struct initialization
dmaengine: edma: Get qDMA channel information from HW also
dmaengine: edma: Merge map_dmach_to_queue into assign_channel_eventq
dmaengine: edma: Correct PaRAM access function names (_parm_ to _param_)
...
240 lines
4.9 KiB
Text
240 lines
4.9 KiB
Text
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
|
|
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
|