Merge branch 'asoc-5.5' into asoc-next

[sfrench/cifs-2.6.git] / sound / soc / sh / rcar / core.c

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index fc32cbbba78f6a5203a697ea92ee4b0f3bb67609..399dc6e9bde5b0426eaa0811435535812a1e0eed 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -376,6 +376,17 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
  */
 u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
 {
+       static const u32 dalign_values[8][2] = {
+               {0x76543210, 0x67452301},
+               {0x00000032, 0x00000023},
+               {0x00007654, 0x00006745},
+               {0x00000076, 0x00000067},
+               {0xfedcba98, 0xefcdab89},
+               {0x000000ba, 0x000000ab},
+               {0x0000fedc, 0x0000efcd},
+               {0x000000fe, 0x000000ef},
+       };
+       int id = 0, inv;
        struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io);
        struct rsnd_mod *target;
        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -411,13 +422,18 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
                target = cmd ? cmd : ssiu;
        }
 
+       if (mod == ssiu)
+               id = rsnd_mod_id_sub(mod);
+
        /* Non target mod or non 16bit needs normal DALIGN */
        if ((snd_pcm_format_width(runtime->format) != 16) ||
            (mod != target))
-               return 0x76543210;
+               inv = 0;
        /* Target mod needs inverted DALIGN when 16bit */
        else
-               return 0x67452301;
+               inv = 1;
+
+       return dalign_values[id][inv];
 }
 
 u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod)