diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 13:41:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 13:41:29 -0700 |
| commit | 50ae4bb946126d1ae52b83446eb125117af9dcd3 (patch) | |
| tree | fc7a3a5b4f1e689457d81877cb0a85d85ddf5626 /init | |
| parent | 5f493ace72db9fdb59301366d77d8b9a1d2f68b9 (diff) | |
| parent | a6b188e50a6ad6fa4d2da163a44f21280cea01c2 (diff) | |
Merge tag 'v4.1-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Merge "omap soc changes for v4.1" from Tony Lindgren:
SoC related changes for omaps. Mostly hwmod related changes via
Paul Walmsley <paul@pwsan.com>:
OMAP hwmod data changes for AM43xx and DRA7xx for v4.1
Add support for the AM43xx HDQ/1-wire driver and fix the GPTIMER data
for DRA7xx.
Note that I do not have AM43xx nor DRA7xx boards, and cannot test these
patches on those platforms.
Basic build, boot, and PM test logs are available at:
http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.1/20150324185246/
* tag 'v4.1-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
ARM: omap-device: add missed callback for suspend-to-disk
ARM: OMAP2: hwmod: AM43XX: Add hwmod support for HDQ-1W
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions