Linus Torvalds
b324c67d48
arm-soc: device tree conversions, part 1 ...
The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game of
booting using device trees, which is a great step forward for them. at91
and spear have pretty much completed this process with a huge amount of
work being put into at91. The other platforms are continuing the process.
We finally start to see the payback on this investment, as new machines
are getting supported purely by adding a .dts source file that can be
completely independent of the kernel source.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPueqRAAoJEIwa5zzehBx3AYkP/ibDGGd0qp1gxnxPYowliXcp
lrWP8KB2PVcX/041jwpvsWeHzWT+Gm39ryBfz2L3pq/RiuU0jPPwChKgy1iglE8X
6Rq6sPWkXoDRtyeCuoiaxf1AYuzzAVdzZ0HlPO93tSKgo5eeyZRC5OeebAnrLDCE
SDi8gZx2mm9+j2Dz46gq8QluyswMMbke3fHHHaHUlcP9fKIvFWvEfsn5j+YQ9bSw
DrSIqGOzv6Emn7F6yhFQqxmk86KLnaXDVpAWgjVDhzaPv0rcTzloN6D2Ie2e5Vev
BiRM1zvWn2d9kDk7gpm0t67nguYxsCBl1GNCP1brrncGwt15S10JimYlRhYW+B7u
qgJqMPko3OnONvyl6e8qgIa2M5N4K/mo1i/jfOwFw3+KfUjXqLeio53Ysr4a6tsM
Ev3bEsofNJKA0dlMcVzr7ntL087B6Y8mY3oJsVZji5M0KVfx1Jfn+X1W+l/2KD1H
XWhJrCGa1HlbtSnrD+E91VHGC3M4sEXbbTljMAjHImlU9dGXmmbRMNsqNwkF6qFj
EO2HnFvdN1oK+zEmeAttR1JHxfMdPFnTfmpUf3AiVSjGO//Wltelqx8ibA2Smn7S
xXmzqX/HMhIOYCh81FdvzsK4qRYU5QyOsEJB4G0UjBZ66M1A3T/+vPpWuKsw5bUb
qbnxaaXNsaZjWbbSSrZ4
=7DYv
-----END PGP SIGNATURE-----
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull device tree conversions for arm-soc, part 1, from Olof Johansson:
"The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game
of booting using device trees, which is a great step forward for them.
at91 and spear have pretty much completed this process with a huge
amount of work being put into at91. The other platforms are
continuing the process.
We finally start to see the payback on this investment, as new
machines are getting supported purely by adding a .dts source file
that can be completely independent of the kernel source."
Fix up trivial conflict in arch/arm/Kconfig
* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
arm/dts: omap4-panda: Add LEDs support
arm/dts: omap4-sdp: Add LEDs support
arm/dts: twl4030: Add twl4030-gpio node
OMAP4: devices: Do not create mcpdm device if the dtb has been provided
OMAP4: devices: Do not create dmic device if the dtb has been provided
Documentation: update docs for mmp dt
ARM: dts: refresh dts file for arch mmp
ARM: mmp: support pxa910 with device tree
ARM: mmp: support mmp2 with device tree
gpio: pxa: parse gpio from DTS file
ARM: mmp: support DT in timer
ARM: mmp: support DT in irq
ARM: mmp: append CONFIG_MACH_MMP2_DT
ARM: mmp: fix build issue on mmp with device tree
ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
ARM: SPEAr3xx: Correct keyboard data passed from DT
...
2012-05-22 09:30:52 -07:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
Update documentation for parameter *notrigger* in einj.txt
2012-03-30 03:30:19 -04:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
arm-soc: device tree conversions, part 1
2012-05-22 09:30:52 -07:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
memcg: fix up documentation on global LRU
2012-04-12 13:12:11 -07:00
cpuidle: add a sysfs entry to disable specific C state for debug purpose.
2012-03-30 01:52:58 -04:00
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
dm: add verity target
2012-03-28 18:43:38 +01:00
arm-soc: device tree conversions, part 1
2012-05-22 09:30:52 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-23 23:15:17 -04:00
Pin control subsystem changes for kernel 3.5:
2012-05-21 16:58:23 -07:00
[media] lmedm04 RS2000 Firmware details
2012-03-19 14:55:55 -03:00
drm: allow loading an EDID as firmware to override broken monitor
2012-03-20 10:09:28 +00:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
2012-05-21 19:21:20 -07:00
hwmon: (k10temp) Add support for AMD Trinity CPUs
2012-04-01 10:25:56 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: input.txt: clarify mousedev 'cat' command syntax
2012-03-30 16:03:15 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: mention scripts/diffconfig tool
2012-03-30 16:03:15 -07:00
[S390] Add s390x description to Documentation/kdump/kdump.txt
2011-12-27 11:27:13 +01:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
mmc: core: Fixup delayed work clock gating patch
2012-01-11 23:58:43 -05:00
drivers/net: delete all code/drivers depending on CONFIG_MCA
2012-05-17 16:37:41 -04:00
NFC: Add HCI documentation
2012-04-12 15:10:36 -04:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/regmap' and 'regulator/topic/register' into regulator-next
2012-05-12 11:09:47 +01:00
Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup
2012-03-18 23:59:34 +01:00
Documentation: prctl/seccomp_filter
2012-04-14 11:13:22 +10:00
rcu: Introduce rcutorture testing for rcu_barrier()
2012-04-30 10:48:18 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
sched: Remove sched_switch
2012-01-27 13:28:53 +01:00
[SCSI] megaraid_sas: Version and Changelog update
2012-04-23 19:26:41 +01:00
Smack: allow for significantly longer Smack labels v4
2012-05-14 22:48:38 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
ALSA: hda/realtek - Add a few ALC882 model strings back
2012-04-11 14:10:57 +02:00
spi: create a message queueing infrastructure
2012-03-07 19:19:48 -07:00
net: doc: merge /proc/sys/net/core/* documents into one place
2012-04-27 00:09:26 -04:00
Documentation: Fix typo in tcm_mod_builder.py
2012-02-10 09:52:18 +01:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
USB documentation: explain lifetime rules for unlinking URBs
2012-04-06 13:54:00 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
virtio: update documentation to v0.9.5 of spec
2012-05-22 12:16:09 +09:30
mm: move hugepage test examples to tools/testing/selftests/vm
2012-03-28 17:14:37 -07:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
crc32: move long comment about crc32 fundamentals to Documentation/
2012-03-23 16:58:37 -07:00
doc: Add load/store guarantees to Documentation/atomic-ops.txt
2011-12-11 10:31:58 -08:00
Documentation: common clk API
2012-03-16 20:35:01 +00:00
coccinelle.txt: update documentation to include M= option
2012-01-14 22:25:56 +01:00
Documentation: CodingStyle: add inline assembly guidelines
2012-03-30 16:03:15 -07:00
documentation: remove references to cpu_*_map.
2012-03-29 15:38:31 +10:30
crc32: move long comment about crc32 fundamentals to Documentation/
2012-03-23 16:58:37 -07:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02:00
dma-buf: document fd flags and O_CLOEXEC requirement
2012-03-26 11:33:22 +05:30
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: remove 'mach' from dontdiff file
2012-03-30 16:03:15 -07:00
dynamic_debug: process multiple debug-queries on a line
2012-01-24 12:50:36 -08:00
EDAC: Correct scrub rate API
2012-03-19 12:03:58 +01:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-05-14 11:23:37 -07:00
Documentation/gpio.txt: Explain expected pinctrl interaction
2012-03-12 11:27:07 -06:00
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
irq_domain: add documentation and MAINTAINERS entry.
2012-02-14 14:06:47 -07:00
Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1
2012-05-21 20:20:23 -07:00
kmemleak: Handle percpu memory allocation
2011-12-02 16:12:42 +00:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
lockdep: Update documentation for lock-class leak detection
2011-12-11 10:31:23 -08:00
watchdog: Update documentation
2012-02-11 15:11:28 +01:00
drivers/net: fix up stale paths from driver reorg
2012-01-30 12:54:40 -05:00
mm: move hugepage test examples to tools/testing/selftests/vm
2012-03-28 17:14:37 -07:00
md: create externally visible flags for supporting hot-replace.
2011-12-23 10:17:51 +11:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Doc: Update numastat.txt
2012-02-28 16:05:06 +01:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
pinctrl: implement devm_pinctrl_get()/put()
2012-04-18 13:53:13 +02:00
remoteproc: remove the single rpmsg vdev limitation
2012-03-06 19:14:12 +02:00
rpmsg: add virtio-based remote processor messaging bus
2012-02-08 22:53:58 +02:00
stable: update documentation to ask for kernel version
2012-01-24 10:50:22 -08:00
static keys: Add docs better explaining the whole 'struct static_key' mechanism
2012-02-24 09:12:19 +01:00
Documentation: sysrq: Crutcher Dunnavant is unavailable
2012-03-30 16:03:15 -07:00
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
b324c67d48
