Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
  go7007 - Add missing dependency on sound subsystem
  ALSA: ps3: Add support for SPDIF/HDMI passthru
  ps3: Add passthru support for non-audio streams
  ps3: Add ps3av_audio_mute_analog()
  ALSA: misc typo fixes
  sound: add missing pcm kernel-doc

3 files changed, 28 insertions, 9 deletions

diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index 6f2f90ebb020..06848b254d57 100644
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -915,6 +915,22 @@ int ps3av_video_mute(int mute)
 
 EXPORT_SYMBOL_GPL(ps3av_video_mute);
 
+/* mute analog output only */
+int ps3av_audio_mute_analog(int mute)
+{
+        int i, res;
+
+        for (i = 0; i < ps3av->av_hw_conf.num_of_avmulti; i++) {
+                res = ps3av_cmd_av_audio_mute(1,
+                        &ps3av->av_port[i + ps3av->av_hw_conf.num_of_hdmi],
+                        mute);
+                if (res < 0)
+                        return -1;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(ps3av_audio_mute_analog);
+
 int ps3av_audio_mute(int mute)
 {
         return ps3av_set_audio_mute(mute ? PS3AV_CMD_MUTE_ON
diff --git a/drivers/ps3/ps3av_cmd.c b/drivers/ps3/ps3av_cmd.c
index 7f880c26122f..11eb50318fec 100644
--- a/drivers/ps3/ps3av_cmd.c
+++ b/drivers/ps3/ps3av_cmd.c
@@ -660,9 +660,10 @@ u32 ps3av_cmd_set_av_audio_param(void *p, u32 port,
 }
 
 /* default cs val */
-static const u8 ps3av_mode_cs_info[] = {
+u8 ps3av_mode_cs_info[] = {
         0x00, 0x09, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00
 };
+EXPORT_SYMBOL_GPL(ps3av_mode_cs_info);
 
 #define CS_44   0x00
 #define CS_48   0x02
@@ -677,7 +678,7 @@ void ps3av_cmd_set_audio_mode(struct ps3av_pkt_audio_mode *audio, u32 avport,
                               u32 ch, u32 fs, u32 word_bits, u32 format,
                               u32 source)
 {
-        int spdif_through, spdif_bitstream;
+        int spdif_through;
         int i;
 
         if (!(ch | fs | format | word_bits | source)) {
@@ -687,7 +688,6 @@ void ps3av_cmd_set_audio_mode(struct ps3av_pkt_audio_mode *audio, u32 avport,
                 format = PS3AV_CMD_AUDIO_FORMAT_PCM;
                 source = PS3AV_CMD_AUDIO_SOURCE_SERIAL;
         }
-        spdif_through = spdif_bitstream = 0;    /* XXX not supported */
 
         /* audio mode */
         memset(audio, 0, sizeof(*audio));
@@ -777,16 +777,17 @@ void ps3av_cmd_set_audio_mode(struct ps3av_pkt_audio_mode *audio, u32 avport,
                 break;
         }
 
+        /* non-audio bit */
+        spdif_through = audio->audio_cs_info[0] & 0x02;
+
         /* pass through setting */
         if (spdif_through &&
             (avport == PS3AV_CMD_AVPORT_SPDIF_0 ||
-             avport == PS3AV_CMD_AVPORT_SPDIF_1)) {
+             avport == PS3AV_CMD_AVPORT_SPDIF_1 ||
+             avport == PS3AV_CMD_AVPORT_HDMI_0 ||
+             avport == PS3AV_CMD_AVPORT_HDMI_1)) {
                 audio->audio_word_bits = PS3AV_CMD_AUDIO_WORD_BITS_16;
-                audio->audio_source = PS3AV_CMD_AUDIO_SOURCE_SPDIF;
-                if (spdif_bitstream) {
-                        audio->audio_format = PS3AV_CMD_AUDIO_FORMAT_BITSTREAM;
-                        audio->audio_cs_info[0] |= CS_BIT;
-                }
+                audio->audio_format = PS3AV_CMD_AUDIO_FORMAT_BITSTREAM;
         }
 }
 
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig
index 57a121c338c4..593fdb767aad 100644
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@ -1,10 +1,12 @@
 config VIDEO_GO7007
         tristate "Go 7007 support"
         depends on VIDEO_DEV && PCI && I2C && INPUT
+        depends on SND
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
+        select SND_PCM
         select CRC32
         default N
         ---help---