[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250203171808.4108-5-laurentiumihalcea111@gmail.com>
Date: Mon, 3 Feb 2025 12:18:03 -0500
From: Laurentiu Mihalcea <laurentiumihalcea111@...il.com>
To: Bard Liao <yung-chuan.liao@...ux.intel.com>,
Daniel Baluta <daniel.baluta@....com>,
Iuliana Prodan <iuliana.prodan@....com>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Mark Brown <broonie@...nel.org>
Cc: linux-kernel@...r.kernel.org,
linux-sound@...r.kernel.org,
imx@...ts.linux.dev
Subject: [PATCH 4/9] ASoC: SOF: imx8: shuffle structure and function definitions
From: Laurentiu Mihalcea <laurentiu.mihalcea@....com>
Shuffle the definitions of some structures and functions such that
they are better grouped. This is purely a cosmetic change.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@....com>
Reviewed-by: Daniel Baluta <daniel.baluta@....com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@....com>
---
sound/soc/sof/imx/imx8.c | 85 ++++++++++++++++++++--------------------
1 file changed, 43 insertions(+), 42 deletions(-)
diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 05c4d70cd116..93968f077d52 100644
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -41,6 +41,49 @@
#define MBOX_OFFSET 0x800000
#define MBOX_SIZE 0x1000
+static struct snd_soc_dai_driver imx8_dai[] = {
+ IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),
+ IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),
+};
+
+static struct snd_sof_dsp_ops sof_imx8_ops;
+
+static int imx8_ops_init(struct snd_sof_dev *sdev)
+{
+ /* first copy from template */
+ memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops));
+
+ /* then set common imx8 ops */
+ sof_imx8_ops.dbg_dump = imx8_dump;
+ sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops;
+ sof_imx8_ops.debugfs_add_region_item =
+ snd_sof_debugfs_add_region_item_iomem;
+
+ /* ... and finally set DAI driver */
+ sof_imx8_ops.drv = imx8_dai;
+ sof_imx8_ops.num_drv = ARRAY_SIZE(imx8_dai);
+
+ return 0;
+}
+
+static int imx8_probe(struct snd_sof_dev *sdev)
+{
+ struct imx_common_data *common;
+ struct imx_sc_ipc *sc_ipc_handle;
+ int ret;
+
+ common = sdev->pdata->hw_pdata;
+
+ ret = imx_scu_get_handle(&sc_ipc_handle);
+ if (ret < 0)
+ return dev_err_probe(sdev->dev, ret,
+ "failed to fetch SC IPC handle\n");
+
+ common->chip_pdata = sc_ipc_handle;
+
+ return 0;
+}
+
/*
* DSP control.
*/
@@ -100,48 +143,6 @@ static int imx8_run(struct snd_sof_dev *sdev)
return 0;
}
-static int imx8_probe(struct snd_sof_dev *sdev)
-{
- struct imx_common_data *common;
- struct imx_sc_ipc *sc_ipc_handle;
- int ret;
-
- common = sdev->pdata->hw_pdata;
-
- ret = imx_scu_get_handle(&sc_ipc_handle);
- if (ret < 0)
- return dev_err_probe(sdev->dev, ret,
- "failed to fetch SC IPC handle\n");
-
- common->chip_pdata = sc_ipc_handle;
-
- return 0;
-}
-
-static struct snd_soc_dai_driver imx8_dai[] = {
- IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),
- IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),
-};
-
-static struct snd_sof_dsp_ops sof_imx8_ops;
-
-static int imx8_ops_init(struct snd_sof_dev *sdev)
-{
- /* first copy from template */
- memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops));
-
- /* then set common imx8 ops */
- sof_imx8_ops.dbg_dump = imx8_dump;
- sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops;
- sof_imx8_ops.debugfs_add_region_item =
- snd_sof_debugfs_add_region_item_iomem;
-
- /* ... and finally set DAI driver */
- sof_imx8_ops.drv = imx8_dai;
- sof_imx8_ops.num_drv = ARRAY_SIZE(imx8_dai);
-
- return 0;
-}
static const struct imx_chip_ops imx8_chip_ops = {
.probe = imx8_probe,
--
2.34.1
Powered by blists - more mailing lists