Imported linux-2.6.27.39 suse/xen patches.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.arch / ppc-ps3-add-ps3av-audio-mute-analog.patch

diff --git a/src/patches/suse-2.6.27.31/patches.arch/ppc-ps3-add-ps3av-audio-mute-analog.patch b/src/patches/suse-2.6.27.31/patches.arch/ppc-ps3-add-ps3av-audio-mute-analog.patch
deleted file mode 100644 (file)
index 713b55e..0000000
--- a/src/patches/suse-2.6.27.31/patches.arch/ppc-ps3-add-ps3av-audio-mute-analog.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Subject: ps3: Add ps3av_audio_mute_analog()
-From: Masakazu Mokuno mokuno@sm.sony.co.jp Mon Oct 20 08:03:33 2008 +0200
-Date: Mon Oct 20 08:04:59 2008 +0200:
-Git: 756ba83ee370fbf62643777e7ba4a4f05932f6fb
-
-Add support for muting the analog output so that it does not
-play noises while non-PCM data is played.
-
-Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Stefan Assmann <sassmann@suse.de>
-
-diff --git a/arch/powerpc/include/asm/ps3av.h b/arch/powerpc/include/asm/ps3av.h
-index fda9871..d30bde2 100644
---- a/arch/powerpc/include/asm/ps3av.h
-+++ b/arch/powerpc/include/asm/ps3av.h
-@@ -735,6 +735,7 @@ extern int ps3av_get_mode(void);
- extern int ps3av_video_mode2res(u32, u32 *, u32 *);
- extern int ps3av_video_mute(int);
- extern int ps3av_audio_mute(int);
-+extern int ps3av_audio_mute_analog(int);
- extern int ps3av_dev_open(void);
- extern int ps3av_dev_close(void);
- extern void ps3av_register_flip_ctl(void (*flip_ctl)(int on, void *data),
-diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
-index 6f2f90e..06848b2 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