Merge tag 'asoc-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 3241a1bdc9eaf29be24b7b11738a1a82af7a607b..e7f86db0d94c3c21dfa23fcb46c523db20063750 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -310,7 +310,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
        /*
         * E3 need to overwrite
         */
-       if (rsnd_is_e3(priv))
+       if (rsnd_is_gen3_e3(priv))
                switch (rsnd_mod_id(mod)) {
                case 0:
                case 4:
@@ -606,13 +606,13 @@ static void rsnd_src_debug_info(struct seq_file *m,
                                struct rsnd_dai_stream *io,
                                struct rsnd_mod *mod)
 {
-       rsnd_debugfs_mod_reg_show(m, mod, RSND_GEN2_SCU,
+       rsnd_debugfs_mod_reg_show(m, mod, RSND_BASE_SCU,
                                  rsnd_mod_id(mod) * 0x20, 0x20);
        seq_puts(m, "\n");
-       rsnd_debugfs_mod_reg_show(m, mod, RSND_GEN2_SCU,
+       rsnd_debugfs_mod_reg_show(m, mod, RSND_BASE_SCU,
                                  0x1c0, 0x20);
        seq_puts(m, "\n");
-       rsnd_debugfs_mod_reg_show(m, mod, RSND_GEN2_SCU,
+       rsnd_debugfs_mod_reg_show(m, mod, RSND_BASE_SCU,
                                  0x200 + rsnd_mod_id(mod) * 0x40, 0x40);
 }
 #define DEBUG_INFO .debug_info = rsnd_src_debug_info
@@ -652,10 +652,6 @@ int rsnd_src_probe(struct rsnd_priv *priv)
        char name[RSND_SRC_NAME_SIZE];
        int i, nr, ret;
 
-       /* This driver doesn't support Gen1 at this point */
-       if (rsnd_is_gen1(priv))
-               return 0;
-
        node = rsnd_src_of_node(priv);
        if (!node)
                return 0; /* not used is not error */