Merge tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2015 23:23:07 +0000 (00:23 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2015 23:23:07 +0000 (00:23 +0100)
commit1a7022f181ec40d0f63ab3ea7f196e330e59dc47
treed0889d8fb8385b8f064f168b422ddf7989d462b7
parent406ca4493cbf1946d6b161c23d3be681df73d53a
parent2f23cda3bfa5820fd3702dff45453af4420f7ada
Merge tag 'ux500-dt-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-stericsson into next/dt

Merge "Device Tree changes for Ux500" from Linus Walleij:

- Push the Rohm touchscreen to the STUIB, as the TVK UIB has
  a Synaptics RMI4 touchscreen.
- Set up the right sensor IRQs for the Snowball, so that
  periodic data ready-IRQ capture starts working.
- Use wakeup-source consequently.
- Remove legacy regulator-compatible strings.
- Define the sensors on the HREFP TVK board properly.

* tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: configure the sensors on the TVK board correctly
  ARM: u300: remove regulator-compatible usage
  ARM: ux500: remove regulator-compatible usage
  ARM: ux500: replace legacy *,wakeup property with wakeup-source
  ARM: ux500: Assign proper sensor IRQs for Snowball
  ARM: ux500: push down Rohm TS to STUIB