2 files changed, 12 insertions, 0 deletions

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 0fdc7db7a469..d80ea1ff7b0e 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -153,6 +153,15 @@ static int kirkwood_i2s_hw_params(struct snd_pcm_substream *substream,
         default:
                 return -EINVAL;
         }
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                value &= ~KIRKWOOD_PLAYCTL_MONO_MASK;
+                if (params_channels(params) == 1)
+                        value |= KIRKWOOD_PLAYCTL_MONO_BOTH;
+                else
+                        value |= KIRKWOOD_PLAYCTL_MONO_OFF;
+        }
+
         writel(i2s_value, priv->io+i2s_reg);
         writel(value, priv->io+reg);
 
diff --git a/sound/soc/kirkwood/kirkwood.h b/sound/soc/kirkwood/kirkwood.h
index b6e4f68d71dd..bb6e6a5648c9 100644
--- a/sound/soc/kirkwood/kirkwood.h
+++ b/sound/soc/kirkwood/kirkwood.h
@@ -49,6 +49,9 @@
 #define KIRKWOOD_PLAYCTL_BURST_32               (1<<11)
 #define KIRKWOOD_PLAYCTL_PAUSE                  (1<<9)
 #define KIRKWOOD_PLAYCTL_SPDIF_MUTE             (1<<8)
+#define KIRKWOOD_PLAYCTL_MONO_MASK              (3<<5)
+#define KIRKWOOD_PLAYCTL_MONO_BOTH              (3<<5)
+#define KIRKWOOD_PLAYCTL_MONO_OFF               (0<<5)
 #define KIRKWOOD_PLAYCTL_I2S_MUTE               (1<<7)
 #define KIRKWOOD_PLAYCTL_SPDIF_EN               (1<<4)
 #define KIRKWOOD_PLAYCTL_I2S_EN         (1<<3)