Merge tag 'davinci-for-v3.18/dt' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:33:13 +0000 (22:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:33:13 +0000 (22:33 +0200)
commitfacdb3dd378e81b8516a8faa061e0be56d2ae7be
tree7732c6f60290bb309f86b6326896f51f5e79f275
parentd62584f3c7e7edf26512cbfe5d1723ef3fb739cd
parent3f526696e7840239844fc7ff9b5cf014d7192c42
Merge tag 'davinci-for-v3.18/dt' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/dt

Pull "DT additions for DA850" from Sekhar Nori:

Adds EDMA and audio support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'davinci-for-v3.18/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: DTS: da850-evm: Enable audio via simple-card
  ARM: DTS: da850-evm: Add node for tlv320aic3106 codec
  ARM: DTS: da850-evm: Enable McASP via DT boot
  ARM: DTS: da850: Add node for McASP
  ARM: DTS: da850: Add node for edma0
  ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for mcasp0