ALSA: hda - hdmi: Use TFx channel positions instead of FxH

Channel map positions FLH, FCH, FRH duplicate positions TFL, TFC, TFR.
Both are the speakers above the front speakers (CEA uses "high" and USB
audio uses "top" nomenclature).

Since the USB audio code has used the TFx positions since v3.8
(04324ccc75f96, "ALSA: usb-audio: add channel map support") but the HDMI
code only just started using FxH in a5b7d510b2220cccb ("ALSA: hda -
hdmi: Fix channel maps with less common speakers") which is not yet in
any released kernel, standardize on TFx instead.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index e68792311bb22850eb44ae0be6659ede770a1d06..8aa104cba2418276205999a177ef8a063497ab4b 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -763,12 +763,12 @@ static struct channel_map_table map_tables[] = {
        { SNDRV_CHMAP_RC,       RC },
        { SNDRV_CHMAP_FLC,      FLC },
        { SNDRV_CHMAP_FRC,      FRC },
-       { SNDRV_CHMAP_FLH,      FLH },
-       { SNDRV_CHMAP_FRH,      FRH },
+       { SNDRV_CHMAP_TFL,      FLH },
+       { SNDRV_CHMAP_TFR,      FRH },
        { SNDRV_CHMAP_FLW,      FLW },
        { SNDRV_CHMAP_FRW,      FRW },
        { SNDRV_CHMAP_TC,       TC },
-       { SNDRV_CHMAP_FCH,      FCH },
+       { SNDRV_CHMAP_TFC,      FCH },
        {} /* terminator */
 };