Merge tag 'sound-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "There've been many updates in ASoC side at this time, especially the
  framework enhancement for multiple CODECs on a single DAI and more
  componentization works.

  The only major change in ALSA core is the addition of timestamp type
  in sw_params field.  This should behave in backward compatible way.

  Other than that, there are lots of small changes and new drivers in
  wide range, including a large code cut in HD-audio driver for
  deprecated static quirks.  Some highlights are below:

  ALSA Core:
   - Add the new timestamp type field to sw_params to choose
     MONOTONIC_RAW type

  HD-audio:
   - Continued conversion to standard printk macros, generic code
     cleanups
   - Removal of obsoleted static quirk codes for Conexant and C-Media
     codecs
   - Fixups for HP Envy TS, Dell XPS 15, HP and Dell mute/mic LED,
     Gigabyte BXBT-2807 mobo
   - Intel Braswell support

  ASoC:
   - Support for multiple CODECs attached to a single DAI, enabling
     systems with for example multiple DAC/speaker drivers on a single
     link, contributed by Benoit Cousson based on work from Misael Lopez
     Cruz
   - Support for byte controls larger than 256 bytes based on the use of
     TLVs contributed by Omair Mohammed Abdullah
   - More componentisation work from Lars-Peter Clausen
   - The remainder of the conversions of CODEC drivers to params_width()
     by Mark Brown
   - Drivers for Cirrus Logic CS4265, Freescale i.MX ASRC blocks,
     Realtek RT286 and RT5670, Rockchip RK3xxx I2S controllers and Texas
     Instruments TAS2552
   - Lots of updates and fixes, especially to the DaVinci, Intel,
     Freescale, Realtek, and rcar drivers"

* tag 'sound-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (402 commits)
  ALSA: usb-audio: Whitespace cleanups for sound/usb/midi.*
  ALSA: usb-audio: Respond to suspend and resume callbacks for MIDI input
  sound/oss/pss: Remove typedefs pss_mixerdata and pss_confdata
  sound/oss/opl3: Remove typedef opl_devinfo
  ALSA: fireworks: fix specifiers in format strings for propper output
  ASoC: imx-audmux: Use uintptr_t for port numbers
  ASoC: davinci: Enable menuconfig entry for McASP
  ASoC: fsl_asrc: Don't access members of config before checking it
  ASoC: fsl_sarc_dma: Check pair before using it
  ASoC: adau1977: Fix truncation warning on 64 bit architectures
  ALSA: virtuoso: add Xonar Essence STX II support
  ALSA: riptide: fix %d confusingly prefixed with 0x in format strings
  ALSA: fireworks: fix %d confusingly prefixed with 0x in format strings
  ALSA: hda - add codec ID for Braswell display audio codec
  ALSA: hda - add PCI IDs for Intel Braswell
  ALSA: usb-audio: Adjust Gamecom 780 volume level
  ALSA: usb-audio: improve dmesg source grepability
  ASoC: rt5670: Fix duplicate const warnings
  ASoC: rt5670: Staticise non-exported symbols
  ASoC: Intel: update stream only on stream IPC msgs
  ...

1 files changed, 78 insertions, 0 deletions

diff --git a/arch/x86/include/asm/platform_sst_audio.h b/arch/x86/include/asm/platform_sst_audio.h
new file mode 100644
index 000000000000..0a4e140315b6
--- /dev/null
+++ b/arch/x86/include/asm/platform_sst_audio.h
@@ -0,0 +1,78 @@
+/*
+ * platform_sst_audio.h:  sst audio platform data header file
+ *
+ * Copyright (C) 2012-14 Intel Corporation
+ * Author: Jeeja KP <jeeja.kp@intel.com>
+ *      Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
+ *      Vinod Koul ,vinod.koul@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#ifndef _PLATFORM_SST_AUDIO_H_
+#define _PLATFORM_SST_AUDIO_H_
+
+#include <linux/sfi.h>
+
+enum sst_audio_task_id_mrfld {
+        SST_TASK_ID_NONE = 0,
+        SST_TASK_ID_SBA = 1,
+        SST_TASK_ID_MEDIA = 3,
+        SST_TASK_ID_MAX = SST_TASK_ID_MEDIA,
+};
+
+/* Device IDs for Merrifield are Pipe IDs,
+ * ref: DSP spec v0.75 */
+enum sst_audio_device_id_mrfld {
+        /* Output pipeline IDs */
+        PIPE_ID_OUT_START = 0x0,
+        PIPE_CODEC_OUT0 = 0x2,
+        PIPE_CODEC_OUT1 = 0x3,
+        PIPE_SPROT_LOOP_OUT = 0x4,
+        PIPE_MEDIA_LOOP1_OUT = 0x5,
+        PIPE_MEDIA_LOOP2_OUT = 0x6,
+        PIPE_VOIP_OUT = 0xC,
+        PIPE_PCM0_OUT = 0xD,
+        PIPE_PCM1_OUT = 0xE,
+        PIPE_PCM2_OUT = 0xF,
+        PIPE_MEDIA0_OUT = 0x12,
+        PIPE_MEDIA1_OUT = 0x13,
+/* Input Pipeline IDs */
+        PIPE_ID_IN_START = 0x80,
+        PIPE_CODEC_IN0 = 0x82,
+        PIPE_CODEC_IN1 = 0x83,
+        PIPE_SPROT_LOOP_IN = 0x84,
+        PIPE_MEDIA_LOOP1_IN = 0x85,
+        PIPE_MEDIA_LOOP2_IN = 0x86,
+        PIPE_VOIP_IN = 0x8C,
+        PIPE_PCM0_IN = 0x8D,
+        PIPE_PCM1_IN = 0x8E,
+        PIPE_MEDIA0_IN = 0x8F,
+        PIPE_MEDIA1_IN = 0x90,
+        PIPE_MEDIA2_IN = 0x91,
+        PIPE_RSVD = 0xFF,
+};
+
+/* The stream map for each platform consists of an array of the below
+ * stream map structure.
+ */
+struct sst_dev_stream_map {
+        u8 dev_num;             /* device id */
+        u8 subdev_num;          /* substream */
+        u8 direction;
+        u8 device_id;           /* fw id */
+        u8 task_id;             /* fw task */
+        u8 status;
+};
+
+struct sst_platform_data {
+        /* Intel software platform id*/
+        struct sst_dev_stream_map *pdev_strm_map;
+        unsigned int strm_map_size;
+};
+
+int add_sst_platform_device(void);
+#endif
+