From: Daniel Baluta <daniel.baluta@oss.nxp.com> To: broonie@kernel.org, robh+dt@kernel.org Cc: festevam@gmail.com, alsa-devel@alsa-project.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Paul Olaru <paul.olaru@nxp.com>, Daniel Baluta <daniel.baluta@nxp.com> Subject: [RESEND 2/4] ASoC: SOF: imx8: Add ops for i.MX8QM Date: Mon, 10 Feb 2020 11:58:15 +0200 [thread overview] Message-ID: <20200210095817.13226-3-daniel.baluta@oss.nxp.com> (raw) In-Reply-To: <20200210095817.13226-1-daniel.baluta@oss.nxp.com> From: Paul Olaru <paul.olaru@nxp.com> i.MX8QM and i.MX8QXP are mostly identical platforms with minor hardware differences. One of these differences affects the firmware boot process, requiring the run operation to differ. All other ops are reused. Signed-off-by: Paul Olaru <paul.olaru@nxp.com> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/sof/imx/imx8.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index 9ffc2a955e4f..b692752b2178 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -178,6 +178,24 @@ static int imx8x_run(struct snd_sof_dev *sdev) return 0; } +static int imx8_run(struct snd_sof_dev *sdev) +{ + struct imx8_priv *dsp_priv = (struct imx8_priv *)sdev->private; + int ret; + + ret = imx_sc_misc_set_control(dsp_priv->sc_ipc, IMX_SC_R_DSP, + IMX_SC_C_OFS_SEL, 0); + if (ret < 0) { + dev_err(sdev->dev, "Error system address offset source select\n"); + return ret; + } + + imx_sc_pm_cpu_start(dsp_priv->sc_ipc, IMX_SC_R_DSP, true, + RESET_VECTOR_VADDR); + + return 0; +} + static int imx8_probe(struct snd_sof_dev *sdev) { struct platform_device *pdev = @@ -360,6 +378,39 @@ static struct snd_soc_dai_driver imx8_dai[] = { }, }; +/* i.MX8 ops */ +struct snd_sof_dsp_ops sof_imx8_ops = { + /* probe and remove */ + .probe = imx8_probe, + .remove = imx8_remove, + /* DSP core boot */ + .run = imx8_run, + + /* Block IO */ + .block_read = sof_block_read, + .block_write = sof_block_write, + + /* ipc */ + .send_msg = imx8_send_msg, + .fw_ready = sof_fw_ready, + .get_mailbox_offset = imx8_get_mailbox_offset, + .get_window_offset = imx8_get_window_offset, + + .ipc_msg_data = imx8_ipc_msg_data, + .ipc_pcm_params = imx8_ipc_pcm_params, + + /* module loading */ + .load_module = snd_sof_parse_module_memcpy, + .get_bar_index = imx8_get_bar_index, + /* firmware loading */ + .load_firmware = snd_sof_load_firmware_memcpy, + + /* DAI drivers */ + .drv = imx8_dai, + .num_drv = 1, /* we have only 1 ESAI interface on i.MX8 */ +}; +EXPORT_SYMBOL(sof_imx8_ops); + /* i.MX8X ops */ struct snd_sof_dsp_ops sof_imx8x_ops = { /* probe and remove */ -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Baluta <daniel.baluta@oss.nxp.com> To: broonie@kernel.org, robh+dt@kernel.org Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Daniel Baluta <daniel.baluta@nxp.com>, linux-kernel@vger.kernel.org, Paul Olaru <paul.olaru@nxp.com>, linux-imx@nxp.com, festevam@gmail.com Subject: [alsa-devel] [RESEND 2/4] ASoC: SOF: imx8: Add ops for i.MX8QM Date: Mon, 10 Feb 2020 11:58:15 +0200 [thread overview] Message-ID: <20200210095817.13226-3-daniel.baluta@oss.nxp.com> (raw) In-Reply-To: <20200210095817.13226-1-daniel.baluta@oss.nxp.com> From: Paul Olaru <paul.olaru@nxp.com> i.MX8QM and i.MX8QXP are mostly identical platforms with minor hardware differences. One of these differences affects the firmware boot process, requiring the run operation to differ. All other ops are reused. Signed-off-by: Paul Olaru <paul.olaru@nxp.com> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/sof/imx/imx8.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index 9ffc2a955e4f..b692752b2178 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -178,6 +178,24 @@ static int imx8x_run(struct snd_sof_dev *sdev) return 0; } +static int imx8_run(struct snd_sof_dev *sdev) +{ + struct imx8_priv *dsp_priv = (struct imx8_priv *)sdev->private; + int ret; + + ret = imx_sc_misc_set_control(dsp_priv->sc_ipc, IMX_SC_R_DSP, + IMX_SC_C_OFS_SEL, 0); + if (ret < 0) { + dev_err(sdev->dev, "Error system address offset source select\n"); + return ret; + } + + imx_sc_pm_cpu_start(dsp_priv->sc_ipc, IMX_SC_R_DSP, true, + RESET_VECTOR_VADDR); + + return 0; +} + static int imx8_probe(struct snd_sof_dev *sdev) { struct platform_device *pdev = @@ -360,6 +378,39 @@ static struct snd_soc_dai_driver imx8_dai[] = { }, }; +/* i.MX8 ops */ +struct snd_sof_dsp_ops sof_imx8_ops = { + /* probe and remove */ + .probe = imx8_probe, + .remove = imx8_remove, + /* DSP core boot */ + .run = imx8_run, + + /* Block IO */ + .block_read = sof_block_read, + .block_write = sof_block_write, + + /* ipc */ + .send_msg = imx8_send_msg, + .fw_ready = sof_fw_ready, + .get_mailbox_offset = imx8_get_mailbox_offset, + .get_window_offset = imx8_get_window_offset, + + .ipc_msg_data = imx8_ipc_msg_data, + .ipc_pcm_params = imx8_ipc_pcm_params, + + /* module loading */ + .load_module = snd_sof_parse_module_memcpy, + .get_bar_index = imx8_get_bar_index, + /* firmware loading */ + .load_firmware = snd_sof_load_firmware_memcpy, + + /* DAI drivers */ + .drv = imx8_dai, + .num_drv = 1, /* we have only 1 ESAI interface on i.MX8 */ +}; +EXPORT_SYMBOL(sof_imx8_ops); + /* i.MX8X ops */ struct snd_sof_dsp_ops sof_imx8x_ops = { /* probe and remove */ -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2020-02-10 9:58 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-10 9:58 [RESEND 0/4] Add a better separation between i.MX8 families Daniel Baluta 2020-02-10 9:58 ` [alsa-devel] " Daniel Baluta 2020-02-10 9:58 ` [RESEND 1/4] ASoC: SOF: Rename i.MX8 platform to i.MX8X Daniel Baluta 2020-02-10 9:58 ` [alsa-devel] " Daniel Baluta 2020-02-11 15:49 ` Applied "ASoC: SOF: Rename i.MX8 platform to i.MX8X" to the asoc tree Mark Brown 2020-02-11 15:49 ` [alsa-devel] " Mark Brown 2020-02-10 9:58 ` Daniel Baluta [this message] 2020-02-10 9:58 ` [alsa-devel] [RESEND 2/4] ASoC: SOF: imx8: Add ops for i.MX8QM Daniel Baluta 2020-02-11 15:49 ` Applied "ASoC: SOF: imx8: Add ops for i.MX8QM" to the asoc tree Mark Brown 2020-02-11 15:49 ` [alsa-devel] " Mark Brown 2020-02-10 9:58 ` [RESEND 3/4] ASoC: SOF: Add i.MX8QM device descriptor Daniel Baluta 2020-02-10 9:58 ` [alsa-devel] " Daniel Baluta 2020-02-11 15:49 ` Applied "ASoC: SOF: Add i.MX8QM device descriptor" to the asoc tree Mark Brown 2020-02-11 15:49 ` [alsa-devel] " Mark Brown 2020-02-10 9:58 ` [RESEND 4/4] dt-bindings: dsp: fsl: Add fsl,imx8qm-dsp entry Daniel Baluta 2020-02-10 9:58 ` [alsa-devel] [RESEND 4/4] dt-bindings: dsp: fsl: Add fsl, imx8qm-dsp entry Daniel Baluta 2020-02-19 22:14 ` [RESEND 4/4] dt-bindings: dsp: fsl: Add fsl,imx8qm-dsp entry Rob Herring 2020-02-19 22:14 ` Rob Herring 2020-03-12 21:16 ` Daniel Baluta 2020-03-12 21:16 ` Daniel Baluta 2020-02-10 14:23 ` [alsa-devel] [RESEND 0/4] Add a better separation between i.MX8 families Pierre-Louis Bossart 2020-02-10 14:23 ` Pierre-Louis Bossart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200210095817.13226-3-daniel.baluta@oss.nxp.com \ --to=daniel.baluta@oss.nxp.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=daniel.baluta@nxp.com \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=paul.olaru@nxp.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.