ASoC: rsnd: don't get resource from ID

All SoC has reg-name, no need to support getting resource from ID
any more. Remove it. To get physical address for DMA settings,
it still need to know the index, but it is no longer fixed.
This patch tidyup it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://msgid.link/r/87zfuca4e6.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c
index 329e6ab1b22200b64a7f9f0dbc4676ffceabdf98..ec086d8e4d4435a342fe7fed6305d361bc1c14b2 100644 (file)
--- a/sound/soc/sh/rcar/cmd.c
+++ b/sound/soc/sh/rcar/cmd.c
@@ -119,7 +119,7 @@ static void rsnd_cmd_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,
                                  0x180 + rsnd_mod_id_raw(mod) * 0x20, 0x30);
 }
 #define DEBUG_INFO .debug_info = rsnd_cmd_debug_info

diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index e39eb2ac7e9554afd56d2a94dc32a1803ef03b2c..a35fc5ef87703e798e10942916a0ad96a39cc4f2 100644 (file)
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -284,7 +284,7 @@ static void rsnd_ctu_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,
                                  0x500 + rsnd_mod_id_raw(mod) * 0x100, 0x100);
 }
 #define DEBUG_INFO .debug_info = rsnd_ctu_debug_info

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 1c494e521463c084fb51e278fb0846686f7edbe4..7b499eee50806a31f745a38ce675947245f4bd39 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -585,8 +585,8 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io,
 {
        struct rsnd_priv *priv = rsnd_io_to_priv(io);
        struct device *dev = rsnd_priv_to_dev(priv);
-       phys_addr_t ssi_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SSI);
-       phys_addr_t src_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SCU);
+       phys_addr_t ssi_reg = rsnd_gen_get_phy_addr(priv, RSND_BASE_SSI);
+       phys_addr_t src_reg = rsnd_gen_get_phy_addr(priv, RSND_BASE_SCU);
        int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod) ||
                     !!(rsnd_io_to_mod_ssiu(io) == mod);
        int use_src = !!rsnd_io_to_mod_src(io);
@@ -666,7 +666,7 @@ rsnd_gen4_dma_addr(struct rsnd_dai_stream *io, struct rsnd_mod *mod,
                   int is_play, int is_from)
 {
        struct rsnd_priv *priv = rsnd_io_to_priv(io);
-       phys_addr_t addr = rsnd_gen_get_phy_addr(priv, RSND_GEN4_SDMC);
+       phys_addr_t addr = rsnd_gen_get_phy_addr(priv, RSND_BASE_SDMC);
        int id = rsnd_mod_id(mod);
        int busif = rsnd_mod_id_sub(mod);
 

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 16befcbc312cb7de8f863af54465832e2aff1804..f349d6ab9fe5521f9e50805235a0fff4ac77757e 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -294,7 +294,7 @@ static void rsnd_dvc_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,
                                  0xe00 + rsnd_mod_id(mod) * 0x100, 0x60);
 }
 #define DEBUG_INFO .debug_info = rsnd_dvc_debug_info

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index e566712e52346918ce36c7587f1663d9b6c660d6..d1f20cde66be1f626fac4f232923180e049080fc 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -177,8 +177,6 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
        regc.name = name;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
-       if (!res)
-               res = platform_get_resource(pdev, IORESOURCE_MEM, reg_id);
        if (!res)
                return -ENODEV;
 
@@ -425,10 +423,10 @@ static int rsnd_gen4_probe(struct rsnd_priv *priv)
         * ssiu: SSIU0
         * ssi : SSI0
         */
-       int ret_ssiu = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_SSIU, "ssiu", conf_common_ssiu);
-       int ret_ssi  = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_SSI,  "ssi",  conf_common_ssi);
-       int ret_adg  = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_ADG,  "adg",  conf_common_adg);
-       int ret_sdmc = rsnd_gen_regmap_init(priv, 1, RSND_GEN4_SDMC, "sdmc", conf_null);
+       int ret_ssiu = rsnd_gen_regmap_init(priv, 1, RSND_BASE_SSIU, "ssiu", conf_common_ssiu);
+       int ret_ssi  = rsnd_gen_regmap_init(priv, 1, RSND_BASE_SSI,  "ssi",  conf_common_ssi);
+       int ret_adg  = rsnd_gen_regmap_init(priv, 1, RSND_BASE_ADG,  "adg",  conf_common_adg);
+       int ret_sdmc = rsnd_gen_regmap_init(priv, 1, RSND_BASE_SDMC, "sdmc", conf_null);
 
        return ret_adg | ret_ssiu | ret_ssi | ret_sdmc;
 }
@@ -443,10 +441,10 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
         * ssiu: SSIU0 - SSIU9
         * scu : SRC0  - SRC9 etc
         */
-       int ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSI,  "ssi",  conf_common_ssi);
-       int ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSIU, "ssiu", conf_common_ssiu);
-       int ret_scu  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SCU,  "scu",  conf_common_scu);
-       int ret_adg  = rsnd_gen_regmap_init(priv,  1, RSND_GEN2_ADG,  "adg",  conf_common_adg);
+       int ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_BASE_SSI,  "ssi",  conf_common_ssi);
+       int ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_BASE_SSIU, "ssiu", conf_common_ssiu);
+       int ret_scu  = rsnd_gen_regmap_init(priv, 10, RSND_BASE_SCU,  "scu",  conf_common_scu);
+       int ret_adg  = rsnd_gen_regmap_init(priv,  1, RSND_BASE_ADG,  "adg",  conf_common_adg);
 
        return ret_ssi | ret_ssiu | ret_scu | ret_adg;
 }
@@ -460,8 +458,8 @@ static int rsnd_gen1_probe(struct rsnd_priv *priv)
        /*
         * ssi : SSI0 - SSI8
         */
-       int ret_ssi  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SSI, "ssi", conf_common_ssi);
-       int ret_adg  = rsnd_gen_regmap_init(priv, 1, RSND_GEN1_ADG, "adg", conf_common_adg);
+       int ret_ssi  = rsnd_gen_regmap_init(priv, 9, RSND_BASE_SSI, "ssi", conf_common_ssi);
+       int ret_adg  = rsnd_gen_regmap_init(priv, 1, RSND_BASE_ADG, "adg", conf_common_adg);
 
        return ret_adg | ret_ssi;
 }

diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index 1de0e085804cc247f139e4f83bec86343e4df45b..e724103a2e8dec881c36a99872a38de89f85fbbf 100644 (file)
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -259,7 +259,7 @@ static void rsnd_mix_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,
                                  0xd00 + rsnd_mod_id(mod) * 0x40, 0x30);
 }
 #define DEBUG_INFO .debug_info = rsnd_mix_debug_info

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index e063286cc32875bcc5bb9160d1c3c75171479ac8..45cf2132028051395109d0c0b7c263b3358534da 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -20,20 +20,11 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#define RSND_GEN1_SRU  0
-#define RSND_GEN1_ADG  1
-#define RSND_GEN1_SSI  2
-
-#define RSND_GEN2_SCU  0
-#define RSND_GEN2_ADG  1
-#define RSND_GEN2_SSIU 2
-#define RSND_GEN2_SSI  3
-
-#define RSND_GEN4_ADG  0
-#define RSND_GEN4_SSIU 1
-#define RSND_GEN4_SSI  2
-#define RSND_GEN4_SDMC 3
-
+#define RSND_BASE_ADG  0
+#define RSND_BASE_SSI  1
+#define RSND_BASE_SSIU 2
+#define RSND_BASE_SCU  3       // for Gen2/Gen3
+#define RSND_BASE_SDMC 3       // for Gen4     reuse
 #define RSND_BASE_MAX  4
 
 /*

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 3241a1bdc9eaf29be24b7b11738a1a82af7a607b..8822d50b6d86c4e3268ef39fc2c60d6fb0e53f51 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -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

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 0a46aa1975fa8524bd7a0cc9e6c29438a4a0db16..8d2a86383ae01f563a66cdfe18c292648ef71f42 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -1049,7 +1049,7 @@ static void rsnd_ssi_debug_info(struct seq_file *m,
        seq_printf(m, "chan:            %d\n",          ssi->chan);
        seq_printf(m, "user:            %d\n",          ssi->usrcnt);
 
-       rsnd_debugfs_mod_reg_show(m, mod, RSND_GEN2_SSI,
+       rsnd_debugfs_mod_reg_show(m, mod, RSND_BASE_SSI,
                                  rsnd_mod_id(mod) * 0x40, 0x40);
 }
 #define DEBUG_INFO .debug_info = rsnd_ssi_debug_info

diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 17bd8cc86dd0a7aeea367c57dcdc1eecc200aacc..665e8b2db579e3d4681ed2e52407d719dc7cd4f1 100644 (file)
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -413,7 +413,7 @@ static void rsnd_ssiu_debug_info(struct seq_file *m,
                                 struct rsnd_dai_stream *io,
                                struct rsnd_mod *mod)
 {
-       rsnd_debugfs_mod_reg_show(m, mod, RSND_GEN2_SSIU,
+       rsnd_debugfs_mod_reg_show(m, mod, RSND_BASE_SSIU,
                                  rsnd_mod_id(mod) * 0x80, 0x80);
 }
 #define DEBUG_INFO .debug_info = rsnd_ssiu_debug_info