| author | Dan Murphy <dmurphy@ti.com> | |
| Wed, 27 May 2015 17:21:34 +0000 (12:21 -0500) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Wed, 27 May 2015 17:21:34 +0000 (12:21 -0500) |
TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y
* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
OMAPDSS: dra7-tpd12s015: support system suspend
OMAPDSS: dra7-tpd12s015: lock i2c adapter when using DDC
OMAPDSS: dra7-tpd12s015: move ddc pixmux to .dts
OMAPDSS: dra7-tpd12s015: remove legacy platform data
ASoC: davinci-mcasp: HACK interface to handle dra7-evm's i2c2/HDMI mux
ARM: DTS: dra7-evm: Enable mcasp8
ARM: DTS: dra7: Add node for McASP8
ARM: DRA7: hwmod: Add data for McASP8
ARM: clk: dra7xx: Correct mcasp8_ahclkx_mux name
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y
* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
OMAPDSS: dra7-tpd12s015: support system suspend
OMAPDSS: dra7-tpd12s015: lock i2c adapter when using DDC
OMAPDSS: dra7-tpd12s015: move ddc pixmux to .dts
OMAPDSS: dra7-tpd12s015: remove legacy platform data
ASoC: davinci-mcasp: HACK interface to handle dra7-evm's i2c2/HDMI mux
ARM: DTS: dra7-evm: Enable mcasp8
ARM: DTS: dra7: Add node for McASP8
ARM: DRA7: hwmod: Add data for McASP8
ARM: clk: dra7xx: Correct mcasp8_ahclkx_mux name
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Trivial merge