Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 17908a13 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'nomadik-for-v3.19' of...

Merge tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Merge "Nomadik updates for the v3.19 series" from Linus Walleij:

Nomadik changes for the v3.19 development series:
- Rearrange the DTS files to make a pure SoC-specific file and
  a pure board file for S8815.
- Add the device tree for the NDK15 board.
- Update the defconfig and configure in the STMPE expander by
  default on the Nomadik.

* tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: nomadik: configure in STMPE support
  ARM: update Nomadik config
  ARM: nomadik: device tree for NHK15 board
  ARM: nomadik: push ethernet down to board
  ARM: nomadik: set up MCDATDIR2
  ARM: nomadik: move GPIO I2C to S8815 board file
  ARM: nomadik: disable chrystals in top level board files
  ARM: nomadik: move MMC/SD card detect GPIO to board DTS

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b265a6df 640e2f13
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment