Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y: (30 commits)
  ARM: dts: dra7-evm: Add HDMI sound node
  OMAPDSS: HDMI: Fix GPA Channel Setting and Channel Allocation for 6-Channels
  OMAPDSS: OMAP5: HDMI: Audio InfoFrame DB1 field offsets
  ASoC: omap-hdmi-card: Remove redundant print
  ARM: DRA7: hwmod: Fix HDMI irq number
  ARM: DRA7: clocks: Fix HDMI sys_clk mux register
  ASoC: DRA7: dra7-evm: HACK: Set McASP DMA reqs in sDMA crossbar
  ARM: dts: dra7-evm: Add sound card node
  ARM: dts: dra7: Add ATL node
  ARM: dts: dra7: Add McASP nodes
  ARM: dts: dra7-evm: Add audio pinctrl
  ASoC: DRA7: dra7-evm: Add initial support for DRA7 EVM
  ASoC: DRA7: atl: Add initial support for Audio Tracking Logic
  ARM: DRA7: clocks: Append _ck to atl_clkin* and ref_clkin*
  ARM: DRA7: clock: Fix the wrong ABE PLL lock frequency
  ARM: DRA7: hwmod: Disable smart-idle for McASP
  ASoC: davinci-mcasp: Add hw_rule for buffer_size when using AFIFO
  ASoC: davinci-mcasp: Add support for using McASP DATA port
  ASoC: davinci-mcasp: HACK: Add MCASP_VERSION_4 support
  ASoC: davinci-mcasp: Add support for 1-channel
  ...

Conflicts:
	arch/arm/boot/dts/dra7-evm.dts

Change-Id: I6134724d21801c94afeae8fb369f171bae901db6
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index 8db5ae03b6e..416c1d2abe6 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -84,12 +84,15 @@ struct snd_platform_data {
         u8 version;
         u8 txnumevt;
         u8 rxnumevt;
+        u32 tx_dismod;
+        u32 rx_dismod;
 };
 
 enum {
         MCASP_VERSION_1 = 0,    /* DM646x */
         MCASP_VERSION_2,        /* DA8xx/OMAPL1x */
         MCASP_VERSION_3,        /* TI81xx/AM33xx */
+        MCASP_VERSION_4,        /* DRA7xxx */
 };
 
 enum mcbsp_clk_input_pin {