]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
authorOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 04:21:38 +0000 (21:21 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 04:21:38 +0000 (21:21 -0700)
commitf7df257a2cb0856aa3375316e8cc6d40c2c9cbe4
treeda41ff80ee2a444e1e8666d9a87079a4006a673e
parent4a10c2ac2f368583138b774ca41fac4207911983
parent2c5a7424dae5e34b977716f9f0ab8a99d00cc7bc
Merge tag 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/cleanup

From Linus Walleij:

These three patches tear out the remaining AUXDATA in the
Nomadik platform and replace it with device tree.

Corresponding driver changes are coming from respective
subsystem tree and there are no build dependencies.

- Update device tree for VMMC regulator data
- Supply SD/MMC voltage from the VMMC regulator
- Delete auxdata for SD/MMC card and rely on DT only
- Update device tree for FSMC NAND merged for v3.12-rc1
- Delete auxdata for FSMC NAND

* tag 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: delete FSMC platform data
  ARM: nomadik: delete MMCI platform data
  ARM: nomadik: register VMMC regulator

Signed-off-by: Olof Johansson <olof@lixom.net>