mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 13:41:51 +00:00
09893ee845
This branch contains a number of updates for device tree support on
several ARM platforms, in particular:
* AT91 continues the device tree conversion adding support for a number of
on-chip drivers and other functionality
* ux500 adds probing of some of the core SoC blocks through device tree
* Initial device tree support for ST SPEAr600 platforms
* kirkwood continues the conversion to device-tree probing
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPcp12AAoJEIwa5zzehBx3c2oQAKkHhJFxYFaUSfAqUNQJtyLP
ntNyjANchckGcmoGFRRn5q17leSW+GsPopeJF0uTSOq5xojrQJJnrfKCQmgTtdzt
KiD9qJqF3bsM5PxdjkeQljiAirPZSKvyA6gZaPKozZb+NMk3ZMd3hYYi3j3EWR/c
8C9HzwyuXUOKOQ1tHuQHEYnLAtcdVTpUnDGsQItD2Shw5H+AcoN1T00z6kWtXYoJ
z/sFtBVvPxqozEEWbTEg2vm0XfT2ENlOIfHoOj+G2EfcVTjh4pSoD0TXwS11vjfX
UEniGsdCSkQn0yKVuuLTNKy7BPkWXBUTxy6duIQMSs/57lgFEb9/+f5kgAol+Sdi
OeUW4gYkZ8uAk2zOD4p1TGDZT/YHWQ2X3Wq2EhYNsYjZgbNCTlIIocet8jZ6Zfcm
f7DdADS8ot8xFcZxMH7CFJ28cmEjhyGMSrMcrAq7HXrkX0ppFutF0CYkY/43uQ/h
AGmP9wKi38PB1eXK44eAF25fRvT7ty7CiCBT88i8UZ3unj6raVbsGfqhvf5PbCki
oX8dKFjPRRE4bj+8Si7LCTR00AIFMLxuftJw45L4syk+l6Y0y+b0HMBE3E/q7bbR
dLBu3V/HHVMnuZv6vVgvI+dkZ9R6v2ychfoyKNh/AKvgXmr90diYbT0XAkcfSPk7
+yy69EZA59UvLTxt9BmN
=wiKV
-----END PGP SIGNATURE-----
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull "ARM: More device tree support updates" from Olof Johansson:
"This branch contains a number of updates for device tree support on
several ARM platforms, in particular:
* AT91 continues the device tree conversion adding support for a
number of on-chip drivers and other functionality
* ux500 adds probing of some of the core SoC blocks through device
tree
* Initial device tree support for ST SPEAr600 platforms
* kirkwood continues the conversion to device-tree probing"
Manually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and
drivers/usb/gadget/at91_udc.c due to header file include cleanups.
Also do an "evil merge" for the MACH_U8500 config option rename that the
affected RMI4 touchscreen driver in staging. It's called MACH_MOP500
now, and it was missed during previous merges.
* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
ARM: SPEAr600: Add device-tree support to SPEAr600 boards
ARM: ux500: Provide local timer support for Device Tree
ARM: ux500: Enable PL022 SSP Controller in Device Tree
ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree
ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree
ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree
ARM: ux500: db8500: list most devices in the snowball device tree
ARM: ux500: split dts file for snowball into generic part
ARM: ux500: combine the board init functions for DT boot
ARM: ux500: Initial Device Tree support for Snowball
ARM: ux500: CONFIG: Enable Device Tree support for future endeavours
ARM: kirkwood: use devicetree for rtc-mv
ARM: kirkwood: rtc-mv devicetree bindings
ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
ARM: kirkwood: fdt: facilitate new boards during fdt migration
ARM: kirkwood: fdt: absorb kirkwood_init()
ARM: kirkwood: fdt: use mrvl ticker symbol
ARM: orion: wdt: use resource vice direct access
ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.
ARM: orion: spi: remove enable_clock_fix which is not used
...
91 lines
1.9 KiB
Plaintext
91 lines
1.9 KiB
Plaintext
if ARCH_U8500
|
|
|
|
config UX500_SOC_COMMON
|
|
bool
|
|
default y
|
|
select ARM_GIC
|
|
select HAS_MTU
|
|
select PL310_ERRATA_753970
|
|
select ARM_ERRATA_754322
|
|
select ARM_ERRATA_764369
|
|
select CACHE_L2X0
|
|
|
|
config UX500_SOC_DB5500
|
|
bool
|
|
select MFD_DB5500_PRCMU
|
|
|
|
config UX500_SOC_DB8500
|
|
bool
|
|
select MFD_DB8500_PRCMU
|
|
select REGULATOR_DB8500_PRCMU
|
|
select CPU_FREQ_TABLE if CPU_FREQ
|
|
|
|
menu "Ux500 target platform (boards)"
|
|
|
|
config MACH_MOP500
|
|
bool "U8500 Development platform, MOP500 versions"
|
|
select UX500_SOC_DB8500
|
|
select I2C
|
|
select I2C_NOMADIK
|
|
select SOC_BUS
|
|
help
|
|
Include support for the MOP500 development platform.
|
|
|
|
config MACH_HREFV60
|
|
bool "U8500 Development platform, HREFv60 version"
|
|
select MACH_MOP500
|
|
help
|
|
Include support for the HREFv60 new development platform.
|
|
Includes HREFv70, v71 etc.
|
|
|
|
config MACH_SNOWBALL
|
|
bool "U8500 Snowball platform"
|
|
select MACH_MOP500
|
|
help
|
|
Include support for the snowball development platform.
|
|
|
|
config MACH_U5500
|
|
bool "U5500 Development platform"
|
|
select UX500_SOC_DB5500
|
|
help
|
|
Include support for the U5500 development platform.
|
|
|
|
config UX500_AUTO_PLATFORM
|
|
def_bool y
|
|
depends on !MACH_U5500
|
|
select MACH_MOP500
|
|
help
|
|
At least one platform needs to be selected in order to build
|
|
a working kernel. If everything else is disabled, this
|
|
automatically enables MACH_MOP500.
|
|
|
|
config MACH_UX500_DT
|
|
bool "Generic U8500 support using device tree"
|
|
depends on MACH_MOP500
|
|
select USE_OF
|
|
|
|
endmenu
|
|
|
|
config UX500_DEBUG_UART
|
|
int "Ux500 UART to use for low-level debug"
|
|
default 2
|
|
help
|
|
Choose the UART on which kernel low-level debug messages should be
|
|
output.
|
|
|
|
config U5500_MODEM_IRQ
|
|
bool "Modem IRQ support"
|
|
depends on UX500_SOC_DB5500
|
|
default y
|
|
help
|
|
Add support for handling IRQ:s from modem side
|
|
|
|
config U5500_MBOX
|
|
bool "Mailbox support"
|
|
depends on U5500_MODEM_IRQ
|
|
default y
|
|
help
|
|
Add support for U5500 mailbox communication with modem side
|
|
|
|
endif
|