diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 18:32:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 18:32:13 -0700 |
| commit | 9894e6d9c020b754dd962960e9f7eac18282f69f (patch) | |
| tree | d1f3c43d96095a9211ee0a941198be6fbb292f39 /arch/arm/boot/dts/omap4.dtsi | |
| parent | 82abb273d838318424644d8f02825db0fbbd400a (diff) | |
| parent | 7d0fde3986c35dc1400cb552776c0a640ac354d7 (diff) | |
| download | linux-9894e6d9c020b754dd962960e9f7eac18282f69f.tar.gz | |
Merge tag 'fbdev-omap-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull OMAP DT fbdev updates from Tomi Valkeinen: "Here are display related device tree data changes for OMAP. They are based on an already merged branch to satisfy the dependencies for the dts file changes. Add OMAP DT data: - omap5 display subsystem - display data for omap5 uEVM board - am43xx display subsystem - display data for am43xx ePOS and GP boards (LCD only) - display data for GTA04 board - display data for overo board - display data for duovero-parlor board - display data for omap3 evm and ldp boards" * tag 'fbdev-omap-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: ARM: omap5.dtsi: Add audio related parameters to hdmi node ARM: omap4.dtsi: Add audio related parametes to hdmi node ARM: dts: duovero-parlor: Add HDMI output ARM: dts: overo: Add support for 3.5'' LCD output ARM: dts: overo: Add support for 4.3'' LCD output ARM: dts: overo: Add support for DVI output ARM: dts: Add LCD panel sharp ls037v7dw01 support for omap3-evm and ldp ARM: dts: omap3-gta04: Add display support ARM: dts: omap5-uevm.dts: add display nodes ARM: dts: omap5-uevm.dts: add tca6424a ARM: dts: omap5.dtsi: add DSS nodes ARM: dts: am43x-epos-evm: add LCD data ARM: dts: am437x-gp-evm: add LCD data ARM: dts: am4372.dtsi: add DSS information
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 43a587e097d4..7e26d222bfe3 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -922,6 +922,8 @@ ti,hwmods = "dss_hdmi"; clocks = <&dss_48mhz_clk>, <&dss_sys_clk>; clock-names = "fck", "sys_clk"; + dmas = <&sdma 76>; + dma-names = "audio_tx"; }; }; }; |