author | Dan Murphy <dmurphy@ti.com> | |
Tue, 5 Mar 2013 21:49:28 +0000 (15:49 -0600) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Tue, 5 Mar 2013 21:49:28 +0000 (15:49 -0600) | ||
commit | ad6a13d36204bd7eb6bf9aff11750a75d59a4dd4 | |
tree | b456a5468975602307e8ee70abb31fdac63ab898 | tree | snapshot (tar.xz tar.gz zip) |
parent | b0742b3edd97248727f8303454944e53d8c4eeb3 | commit | diff |
parent | c67ce9ae330d23e6feee69fb59eeea7ccda2bfb3 | commit | diff |
Merge branch 'omap5_audio_video-3.8.y' into ti-linux-3.8.y
TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y
* omap5_audio_video-3.8.y: (307 commits)
arm: dts: ompa5-panda: fix pinmux configuration for hdmi i2c master
OMAPDSS: HDMI: Add additional DDC SDA vs SCL delay.
OMAPDSS: omap5 hdmi: Fix i2c master addresses
OMAPDSS: HDMI: Fix HSync width value for OMAP5 ES2.0
OMAPDSS: HDMI: Increase M2 divider value
drm/omap: Add OMAP5 support
drm/omap: Add PM capabilities
OMAPDSS: DISPC: Revert to older DISPC Smart Standby mechanism for OMAP5
hack: omap4/5: dt: change compatible bus type for DSS
OMAPDSS: HDMI: Update panel in order to avoid audio disable.
OMAPDSS: HDMI: Update for multichannels audio.
OMAPDSS: HDMI: Update Audio layout for 6 channels mode
OMAPDSS: HDMI: Update HDMI audio rate according to ES2.0
ASoC: OMAP: HDMI: Add support for DT boot
ASoC: HDMI: CPU-DAI: Correct typo
ASoC: OMAP: HDMI: Add config support for OMAP5
ARM: dts: omap4-panda: Add sound node for HDMI
ARM: dts: omap4-sdp: Add sound support for HDMI
ARM: dts: omap5-panda: Add HDMI support
ARM: dts: omap5-evm: Add HDMI support
...
Conflicts:
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap5-evm.dts
arch/arm/boot/dts/omap5-panda.dts
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/devices.c
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y
* omap5_audio_video-3.8.y: (307 commits)
arm: dts: ompa5-panda: fix pinmux configuration for hdmi i2c master
OMAPDSS: HDMI: Add additional DDC SDA vs SCL delay.
OMAPDSS: omap5 hdmi: Fix i2c master addresses
OMAPDSS: HDMI: Fix HSync width value for OMAP5 ES2.0
OMAPDSS: HDMI: Increase M2 divider value
drm/omap: Add OMAP5 support
drm/omap: Add PM capabilities
OMAPDSS: DISPC: Revert to older DISPC Smart Standby mechanism for OMAP5
hack: omap4/5: dt: change compatible bus type for DSS
OMAPDSS: HDMI: Update panel in order to avoid audio disable.
OMAPDSS: HDMI: Update for multichannels audio.
OMAPDSS: HDMI: Update Audio layout for 6 channels mode
OMAPDSS: HDMI: Update HDMI audio rate according to ES2.0
ASoC: OMAP: HDMI: Add support for DT boot
ASoC: HDMI: CPU-DAI: Correct typo
ASoC: OMAP: HDMI: Add config support for OMAP5
ARM: dts: omap4-panda: Add sound node for HDMI
ARM: dts: omap4-sdp: Add sound support for HDMI
ARM: dts: omap5-panda: Add HDMI support
ARM: dts: omap5-evm: Add HDMI support
...
Conflicts:
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap5-evm.dts
arch/arm/boot/dts/omap5-panda.dts
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/devices.c
Signed-off-by: Dan Murphy <dmurphy@ti.com>
19 files changed: