3 files changed, 23 insertions, 9 deletions

diff --git a/Documentation/sound/alsa/Channel-Mapping-API.txt b/Documentation/sound/alsa/Channel-Mapping-API.txt
index 4bbf12d5553f..3c43d1a4ca0e 100644
--- a/Documentation/sound/alsa/Channel-Mapping-API.txt
+++ b/Documentation/sound/alsa/Channel-Mapping-API.txt
@@ -76,8 +76,10 @@ here is a cut:
 
 /* channel positions */
 enum {
-        /* this follows the alsa-lib mixer channel value + 1 */
         SNDRV_CHMAP_UNKNOWN = 0,
+        SNDRV_CHMAP_NA,         /* N/A, silent */
+        SNDRV_CHMAP_MONO,       /* mono stream */
+        /* this follows the alsa-lib mixer channel value + 3 */
         SNDRV_CHMAP_FL,         /* front left */
         SNDRV_CHMAP_FR,         /* front right */
         SNDRV_CHMAP_RL,         /* rear left */
@@ -98,8 +100,13 @@ enum {
         SNDRV_CHMAP_FCH,        /* front center high */
         SNDRV_CHMAP_FRH,        /* front right high */
         SNDRV_CHMAP_TC,         /* top center */
-        SNDRV_CHMAP_NA,         /* N/A, silent */
-        SNDRV_CHMAP_LAST = SNDRV_CHMAP_NA,
+        SNDRV_CHMAP_TFL,        /* top front left */
+        SNDRV_CHMAP_TFR,        /* top front right */
+        SNDRV_CHMAP_TFC,        /* top front center */
+        SNDRV_CHMAP_TRL,        /* top rear left */
+        SNDRV_CHMAP_TRR,        /* top rear right */
+        SNDRV_CHMAP_TRC,        /* top rear center */
+        SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,
 };
 
 When a PCM stream can provide more than one channel map, you can
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 27686da0f650..dfe7d441748c 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -474,8 +474,10 @@ enum {
 
 /* channel positions */
 enum {
-        /* this follows the alsa-lib mixer channel value + 1 */
         SNDRV_CHMAP_UNKNOWN = 0,
+        SNDRV_CHMAP_NA,         /* N/A, silent */
+        SNDRV_CHMAP_MONO,       /* mono stream */
+        /* this follows the alsa-lib mixer channel value + 3 */
         SNDRV_CHMAP_FL,         /* front left */
         SNDRV_CHMAP_FR,         /* front right */
         SNDRV_CHMAP_RL,         /* rear left */
@@ -496,8 +498,13 @@ enum {
         SNDRV_CHMAP_FCH,        /* front center high */
         SNDRV_CHMAP_FRH,        /* front right high */
         SNDRV_CHMAP_TC,         /* top center */
-        SNDRV_CHMAP_NA,         /* N/A, silent */
-        SNDRV_CHMAP_LAST = SNDRV_CHMAP_NA,
+        SNDRV_CHMAP_TFL,        /* top front left */
+        SNDRV_CHMAP_TFR,        /* top front right */
+        SNDRV_CHMAP_TFC,        /* top front center */
+        SNDRV_CHMAP_TRL,        /* top rear left */
+        SNDRV_CHMAP_TRR,        /* top rear right */
+        SNDRV_CHMAP_TRC,        /* top rear center */
+        SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,
 };
 
 #define SNDRV_CHMAP_POSITION_MASK       0xffff
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index d317107d98cc..e8a4feb1ed86 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -397,7 +397,7 @@ static struct snd_pcm_ops ct_pcm_capture_ops = {
 
 static const struct snd_pcm_chmap_elem surround_map[] = {
         { .channels = 1,
-          .map = { SNDRV_CHMAP_UNKNOWN } },
+          .map = { SNDRV_CHMAP_MONO } },
         { .channels = 2,
           .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },
         { }
@@ -405,7 +405,7 @@ static const struct snd_pcm_chmap_elem surround_map[] = {
 
 static const struct snd_pcm_chmap_elem clfe_map[] = {
         { .channels = 1,
-          .map = { SNDRV_CHMAP_UNKNOWN } },
+          .map = { SNDRV_CHMAP_MONO } },
         { .channels = 2,
           .map = { SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },
         { }
@@ -413,7 +413,7 @@ static const struct snd_pcm_chmap_elem clfe_map[] = {
 
 static const struct snd_pcm_chmap_elem side_map[] = {
         { .channels = 1,
-          .map = { SNDRV_CHMAP_UNKNOWN } },
+          .map = { SNDRV_CHMAP_MONO } },
         { .channels = 2,
           .map = { SNDRV_CHMAP_SL, SNDRV_CHMAP_SR } },
         { }