mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 13:11:45 +00:00
b4b50fd78b
This branch contains mostly additions and changes to platform enablement
and SoC-level drivers. Since there's sometimes a dependency on device-tree
changes, there's also a fair amount of those in this branch.
Pieces worth mentioning are:
- Mbus driver for Marvell platforms, allowing kernel configuration
and resource allocation of on-chip peripherals.
- Enablement of the mbus infrastructure from Marvell PCI-e drivers.
- Preparation of MSI support for Marvell platforms.
- Addition of new PCI-e host controller driver for Tegra platforms
- Some churn caused by sharing of macro names between i.MX 6Q and 6DL
platforms in the device tree sources and header files.
- Various suspend/PM updates for Tegra, including LP1 support.
- Versatile Express support for MCPM, part of big little support.
- Allwinner platform support for A20 and A31 SoCs (dual and quad Cortex-A7)
- OMAP2+ support for DRA7, a new Cortex-A15-based SoC.
The code that touches other architectures are patches moving
MSI arch-specific functions over to weak symbols and removal of
ARCH_SUPPORTS_MSI, acked by PCI maintainers.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSKhYmAAoJEIwa5zzehBx322AP/1ONYs8o8f7/Gzq6lZvTN6T3
0pBTApg6Jfioi3lwKvUAEIcsW82YKQ+UZkbW66GQH6+Ri4aZJKZHuz0+JPU67OJ4
LtSLuzVWrymy2VOOUvAnS/SXkOZw/pHhU4cLNHn1dMndhUL1Uqp9/XwuiHEQyFsP
uOkpcBtIu0EWElov0PKKZ5SWBg8JJs2vy5ydiViGelWHCrZvDDZkWzIsDcBQxJLQ
juzT4+JE+KOu7vKmfw78o6iHoCS2TBRAN9YUCajRb8Wl+out1hrTahHnDWaZ5Mce
EskcQNkJROqFbjD4k3ABN4XGTv2VDmrztIwFe0SEQ7Dz/9ypCrBGT69uI9xIqTXr
GwVRIwAUFTpMupK0gy93z1ajV3N0CXV79out9+jQNUQybYE+czp8QOyhmuc1tZx0
8fn9jlBQe9Vy6yrs39gEcE7nUwrayeyQ+6UvqqwsE2pWZabNAnCMSPX5+QIu+T/3
tQ7+jYmfFeserp1sIDOHOnxfhtW9EI6U9d1h/DUCwrsuFdkL9ha4M/vh9Pwgye98
tBdz0T4yE39AJQwwFWRkv1jcQKcGu6WqJanmvS4KRBksGwuLWxy+ewOnkz2ifS25
ZYSyxAryZRBvQRqlOK11rXPfRcbGcY0MG9lkKX96rGcyWEizgE1DdjxXD8HoIleN
R8heV6GX5OzlFLGX2tKK
=fJ5x
-----END PGP SIGNATURE-----
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Olof Johansson:
"This branch contains mostly additions and changes to platform
enablement and SoC-level drivers. Since there's sometimes a
dependency on device-tree changes, there's also a fair amount of
those in this branch.
Pieces worth mentioning are:
- Mbus driver for Marvell platforms, allowing kernel configuration
and resource allocation of on-chip peripherals.
- Enablement of the mbus infrastructure from Marvell PCI-e drivers.
- Preparation of MSI support for Marvell platforms.
- Addition of new PCI-e host controller driver for Tegra platforms
- Some churn caused by sharing of macro names between i.MX 6Q and 6DL
platforms in the device tree sources and header files.
- Various suspend/PM updates for Tegra, including LP1 support.
- Versatile Express support for MCPM, part of big little support.
- Allwinner platform support for A20 and A31 SoCs (dual and quad
Cortex-A7)
- OMAP2+ support for DRA7, a new Cortex-A15-based SoC.
The code that touches other architectures are patches moving MSI
arch-specific functions over to weak symbols and removal of
ARCH_SUPPORTS_MSI, acked by PCI maintainers"
* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
ARM: dts: vf610-twr: enable i2c0 device
ARM: dts: i.MX51: Add one more I2C2 pinmux entry
ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
ARM: dts: i.MX27: Disable AUDMUX in the template
ARM: dts: wandboard: Add support for SDIO bcm4329
ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
ARM: dts: imx53-qsb: Make USBH1 functional
ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
ARM: dts: imx6qdl-sabresd: Add touchscreen support
ARM: imx: add ocram clock for imx53
ARM: dts: imx: ocram size is different between imx6q and imx6dl
ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
ARM: dts: i.MX27: Remove clock name from CPU node
...
439 lines
9.6 KiB
Plaintext
439 lines
9.6 KiB
Plaintext
config ARCH_OMAP
|
|
bool
|
|
|
|
config ARCH_OMAP2
|
|
bool "TI OMAP2"
|
|
depends on ARCH_MULTI_V6
|
|
select ARCH_OMAP2PLUS
|
|
select CPU_V6
|
|
select MULTI_IRQ_HANDLER
|
|
select SOC_HAS_OMAP2_SDRC
|
|
select COMMON_CLK
|
|
|
|
config ARCH_OMAP3
|
|
bool "TI OMAP3"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARCH_HAS_OPP
|
|
select ARM_CPU_SUSPEND if PM
|
|
select CPU_V7
|
|
select MULTI_IRQ_HANDLER
|
|
select OMAP_INTERCONNECT
|
|
select PM_OPP if PM
|
|
select PM_RUNTIME if CPU_IDLE
|
|
select SOC_HAS_OMAP2_SDRC
|
|
select COMMON_CLK
|
|
select USB_ARCH_HAS_EHCI if USB_SUPPORT
|
|
|
|
config ARCH_OMAP4
|
|
bool "TI OMAP4"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARCH_HAS_OPP
|
|
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
|
|
select ARM_CPU_SUSPEND if PM
|
|
select ARM_ERRATA_720789
|
|
select ARM_GIC
|
|
select CACHE_L2X0
|
|
select CPU_V7
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_TWD if SMP
|
|
select HAVE_SMP
|
|
select OMAP_INTERCONNECT
|
|
select PL310_ERRATA_588369
|
|
select PL310_ERRATA_727915
|
|
select PM_OPP if PM
|
|
select PM_RUNTIME if CPU_IDLE
|
|
select USB_ARCH_HAS_EHCI if USB_SUPPORT
|
|
select COMMON_CLK
|
|
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 CPU_V7
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_TWD if LOCAL_TIMERS
|
|
select HAVE_SMP
|
|
select COMMON_CLK
|
|
select HAVE_ARM_ARCH_TIMER
|
|
select ARM_ERRATA_798181 if SMP
|
|
|
|
config SOC_AM33XX
|
|
bool "TI AM33XX"
|
|
depends on ARCH_MULTI_V7
|
|
select ARCH_OMAP2PLUS
|
|
select ARM_CPU_SUSPEND if PM
|
|
select CPU_V7
|
|
select MULTI_IRQ_HANDLER
|
|
select COMMON_CLK
|
|
|
|
config SOC_AM43XX
|
|
bool "TI AM43x"
|
|
depends on ARCH_MULTI_V7
|
|
select CPU_V7
|
|
select ARCH_OMAP2PLUS
|
|
select MULTI_IRQ_HANDLER
|
|
select ARM_GIC
|
|
select COMMON_CLK
|
|
select MACH_OMAP_GENERIC
|
|
|
|
config ARCH_OMAP2PLUS
|
|
bool
|
|
select ARCH_HAS_BANDGAP
|
|
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 SOC_BUS
|
|
select SPARSE_IRQ
|
|
select TI_PRIV_EDMA
|
|
select USE_OF
|
|
help
|
|
Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
|
|
|
|
|
|
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_RUNTIME
|
|
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
|
|
|
|
config SOC_DRA7XX
|
|
bool "TI DRA7XX"
|
|
select ARM_ARCH_TIMER
|
|
select CPU_V7
|
|
select ARM_GIC
|
|
select HAVE_SMP
|
|
select COMMON_CLK
|
|
|
|
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_ZAF
|
|
bool
|
|
|
|
config OMAP_PACKAGE_ZAC
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CBC
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CBB
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CUS
|
|
bool
|
|
|
|
config OMAP_PACKAGE_CBP
|
|
bool
|
|
|
|
comment "OMAP Board Type"
|
|
depends on ARCH_OMAP2PLUS
|
|
|
|
config MACH_OMAP_GENERIC
|
|
bool "Generic OMAP2+ board"
|
|
depends on ARCH_OMAP2PLUS
|
|
default y
|
|
help
|
|
Support for generic TI OMAP2+ boards using Flattened Device Tree.
|
|
More information at Documentation/devicetree
|
|
|
|
config MACH_OMAP2_TUSB6010
|
|
bool
|
|
depends on ARCH_OMAP2 && SOC_OMAP2420
|
|
default y if MACH_NOKIA_N8X0
|
|
|
|
config MACH_OMAP_H4
|
|
bool "OMAP 2420 H4 board"
|
|
depends on SOC_OMAP2420
|
|
default y
|
|
select OMAP_DEBUG_DEVICES
|
|
select OMAP_PACKAGE_ZAF
|
|
|
|
config MACH_OMAP_2430SDP
|
|
bool "OMAP 2430 SDP board"
|
|
depends on SOC_OMAP2430
|
|
default y
|
|
select OMAP_PACKAGE_ZAC
|
|
|
|
config MACH_OMAP3_BEAGLE
|
|
bool "OMAP3 BEAGLE board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_DEVKIT8000
|
|
bool "DEVKIT8000 board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CUS
|
|
|
|
config MACH_OMAP_LDP
|
|
bool "OMAP3 LDP board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_OMAP3530_LV_SOM
|
|
bool "OMAP3 Logic 3530 LV SOM board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
help
|
|
Support for the LogicPD OMAP3530 SOM Development kit
|
|
for full description please see the products webpage at
|
|
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap35x-development-kit
|
|
|
|
config MACH_OMAP3_TORPEDO
|
|
bool "OMAP3 Logic 35x Torpedo board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
help
|
|
Support for the LogicPD OMAP35x Torpedo Development kit
|
|
for full description please see the products webpage at
|
|
http://www.logicpd.com/products/development-kits/zoom-omap35x-torpedo-development-kit
|
|
|
|
config MACH_OVERO
|
|
bool "Gumstix Overo board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_OMAP3EVM
|
|
bool "OMAP 3530 EVM 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
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_CRANEBOARD
|
|
bool "AM3517/05 CRANE board"
|
|
depends on ARCH_OMAP3
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
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_TOUCHBOOK
|
|
bool "OMAP3 Touch Book"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_OMAP_3430SDP
|
|
bool "OMAP 3430 SDP board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_NOKIA_N800
|
|
bool
|
|
|
|
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_N800
|
|
select MACH_NOKIA_N810
|
|
select MACH_NOKIA_N810_WIMAX
|
|
select OMAP_PACKAGE_ZAC
|
|
|
|
config MACH_NOKIA_RM680
|
|
bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select MACH_NOKIA_RM696
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_NOKIA_RX51
|
|
bool "Nokia N900 (RX-51) phone"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_OMAP_ZOOM2
|
|
bool "OMAP3 Zoom2 board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
|
|
config MACH_OMAP_ZOOM3
|
|
bool "OMAP3630 Zoom3 board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBP
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
|
|
config MACH_CM_T35
|
|
bool "CompuLab CM-T35/CM-T3730 modules"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select MACH_CM_T3730
|
|
select OMAP_PACKAGE_CUS
|
|
|
|
config MACH_CM_T3517
|
|
bool "CompuLab CM-T3517 module"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_CM_T3730
|
|
bool
|
|
|
|
config MACH_IGEP0020
|
|
bool "IGEP v2 board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_IGEP0030
|
|
bool "IGEP OMAP3 module"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select MACH_IGEP0020
|
|
select OMAP_PACKAGE_CBB
|
|
|
|
config MACH_SBC3530
|
|
bool "OMAP3 SBC STALKER board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CUS
|
|
|
|
config MACH_OMAP_3630SDP
|
|
bool "OMAP3630 SDP board"
|
|
depends on ARCH_OMAP3
|
|
default y
|
|
select OMAP_PACKAGE_CBP
|
|
|
|
config MACH_TI8168EVM
|
|
bool "TI8168 Evaluation Module"
|
|
depends on SOC_TI81XX
|
|
default y
|
|
|
|
config MACH_TI8148EVM
|
|
bool "TI8148 Evaluation Module"
|
|
depends on SOC_TI81XX
|
|
default y
|
|
|
|
config OMAP3_EMU
|
|
bool "OMAP3 debugging peripherals"
|
|
depends on ARCH_OMAP3
|
|
select ARM_AMBA
|
|
select OC_ETM
|
|
help
|
|
Say Y here to enable debugging hardware of omap3
|
|
|
|
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;
|
|
|
|
config OMAP4_ERRATA_I688
|
|
bool "OMAP4 errata: Async Bridge Corruption"
|
|
depends on (ARCH_OMAP4 || SOC_OMAP5) && !ARCH_MULTIPLATFORM
|
|
select ARCH_HAS_BARRIERS
|
|
help
|
|
If a data is stalled inside asynchronous bridge because of back
|
|
pressure, it may be accepted multiple times, creating pointer
|
|
misalignment that will corrupt next transfers on that data path
|
|
until next reset of the system (No recovery procedure once the
|
|
issue is hit, the path remains consistently broken). Async bridge
|
|
can be found on path between MPU to EMIF and MPU to L3 interconnect.
|
|
This situation can happen only when the idle is initiated by a
|
|
Master Request Disconnection (which is trigged by software when
|
|
executing WFI on CPU).
|
|
The work-around for this errata needs all the initiators connected
|
|
through async bridge must ensure that data path is properly drained
|
|
before issuing WFI. This condition will be met if one Strongly ordered
|
|
access is performed to the target right before executing the WFI.
|
|
In MPU case, L3 T2ASYNC FIFO and DDR T2ASYNC FIFO needs to be drained.
|
|
IO barrier ensure that there is no synchronisation loss on initiators
|
|
operating on both interconnect port simultaneously.
|
|
endmenu
|
|
|
|
endif
|