ASoC: Intel: Skylake: Move platform specific init to platform dsp_init()

Move ipc_init() from helper function to respective platform's dsp_init()
as ipc_init() per platform can be different.

Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index c404a42b670a632b1898c296b9c0aa703dc299c0..71042aceb25f1af1751ed47d76689f130e54a83e 100644 (file)
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -581,6 +581,10 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
        sst_dsp_mailbox_init(sst, (BXT_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ),
                        SKL_ADSP_W0_UP_SZ, BXT_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ);
 
+       ret = skl_ipc_init(dev, skl);
+       if (ret)
+               return ret;
+
        /* set the D0i3 check */
        skl->ipc.ops.check_dsp_lp_on = skl_ipc_check_D0i0;
 

diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c
index 81ee251881b448bca09791246f4ab6a2cfc29871..369ef7ce981c799b8fab344ab4f3bfdfa34ed829 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@ -368,7 +368,6 @@ int skl_sst_ctx_init(struct device *dev, int irq, const char *fw_name,
 {
        struct skl_sst *skl;
        struct sst_dsp *sst;
-       int ret;
 
        skl = devm_kzalloc(dev, sizeof(*skl), GFP_KERNEL);
        if (skl == NULL)
@@ -388,15 +387,12 @@ int skl_sst_ctx_init(struct device *dev, int irq, const char *fw_name,
        sst->dsp_ops = dsp_ops;
        init_waitqueue_head(&skl->mod_load_wait);
        INIT_LIST_HEAD(&sst->module_list);
-       ret = skl_ipc_init(dev, skl);
-       if (ret)
-               return ret;
 
        skl->is_first_boot = true;
        if (dsp)
                *dsp = skl;
 
-       return ret;
+       return 0;
 }
 
 int skl_prepare_lib_load(struct skl_sst *skl, struct skl_lib_info *linfo,

diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index fd99e74cda036344d7890ae38a26b1541977e27c..6cc586d3f03b57abc15ec013ba12b52a6688355e 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -561,6 +561,10 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
        sst_dsp_mailbox_init(sst, (SKL_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ),
                        SKL_ADSP_W0_UP_SZ, SKL_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ);
 
+       ret = skl_ipc_init(dev, skl);
+       if (ret)
+               return ret;
+
        sst->fw_ops = skl_fw_ops;
 
        return 0;