Unverified Commit 28084f4a authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown
Browse files

ASoC: SOF: OF: Avoid reverse module dependency 



Similar with commit 8a49cd11 ("ASoC: SOF: ACPI: avoid reverse
module dependency") we will be having hardware specific drivers that
link against a common "helper" framework.

sof-of-dev.c becomes a library with the interface defined in the newly
created file sof-of-dev.h.

This is the final step started with Kconfig simplification in
commit 7548a391 ("ASoC: SOF: i.MX: simplify Kconfig")

Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211215085703.137414-1-daniel.baluta@oss.nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9e376b14

sound/soc/sof/imx/imx-ops.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */



#ifndef __IMX_OPS_H__

#define __IMX_OPS_H__



extern struct snd_sof_dsp_ops sof_imx8_ops;

extern struct snd_sof_dsp_ops sof_imx8x_ops;

extern struct snd_sof_dsp_ops sof_imx8m_ops;



#endif

sound/soc/sof/imx/imx8.c

+38 −5
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include <linux/firmware/imx/svc/misc.h>

#include <dt-bindings/firmware/imx/rsrc.h>

#include "../ops.h"

#include "../sof-of-dev.h"

#include "imx-common.h"

#include "imx-ops.h"



/* DSP memories */

#define IRAM_OFFSET		0x10000
@@ -487,7 +487,7 @@ static int imx8_dsp_set_power_state(struct snd_sof_dev *sdev, 
}



/* i.MX8 ops */

struct snd_sof_dsp_ops sof_imx8_ops = {

static const struct snd_sof_dsp_ops sof_imx8_ops = {

	/* probe and remove */

	.probe		= imx8_probe,

	.remove		= imx8_remove,
@@ -548,10 +548,9 @@ struct snd_sof_dsp_ops sof_imx8_ops = { 


	.set_power_state	= imx8_dsp_set_power_state,

};

EXPORT_SYMBOL(sof_imx8_ops);



/* i.MX8X ops */

struct snd_sof_dsp_ops sof_imx8x_ops = {

static const struct snd_sof_dsp_ops sof_imx8x_ops = {

	/* probe and remove */

	.probe		= imx8_probe,

	.remove		= imx8_remove,
@@ -612,7 +611,41 @@ struct snd_sof_dsp_ops sof_imx8x_ops = { 
			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP

};

EXPORT_SYMBOL(sof_imx8x_ops);



static struct sof_dev_desc sof_of_imx8qxp_desc = {

	.default_fw_path = "imx/sof",

	.default_tplg_path = "imx/sof-tplg",

	.default_fw_filename = "sof-imx8x.ri",

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8x_ops,

};



static struct sof_dev_desc sof_of_imx8qm_desc = {

	.default_fw_path = "imx/sof",

	.default_tplg_path = "imx/sof-tplg",

	.default_fw_filename = "sof-imx8.ri",

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8_ops,

};



static const struct of_device_id sof_of_imx8_ids[] = {

	{ .compatible = "fsl,imx8qxp-dsp", .data = &sof_of_imx8qxp_desc},

	{ .compatible = "fsl,imx8qm-dsp", .data = &sof_of_imx8qm_desc},

	{ }

};

MODULE_DEVICE_TABLE(of, sof_of_imx8_ids);



/* DT driver definition */

static struct platform_driver snd_sof_of_imx8_driver = {

	.probe = sof_of_probe,

	.remove = sof_of_remove,

	.driver = {

		.name = "sof-audio-of-imx8",

		.pm = &sof_of_pm,

		.of_match_table = sof_of_imx8_ids,

	},

};

module_platform_driver(snd_sof_of_imx8_driver);



MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);

MODULE_LICENSE("Dual BSD/GPL");

sound/soc/sof/imx/imx8m.c

+28 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <linux/firmware/imx/dsp.h>



#include "../ops.h"

#include "../sof-of-dev.h"

#include "imx-common.h"

#include "imx-ops.h"



#define MBOX_OFFSET	0x800000

#define MBOX_SIZE	0x1000
@@ -411,7 +411,7 @@ static int imx8m_dsp_suspend(struct snd_sof_dev *sdev, unsigned int target_state 
}



/* i.MX8 ops */

struct snd_sof_dsp_ops sof_imx8m_ops = {

static const struct snd_sof_dsp_ops sof_imx8m_ops = {

	/* probe and remove */

	.probe		= imx8m_probe,

	.remove		= imx8m_remove,
@@ -470,7 +470,32 @@ struct snd_sof_dsp_ops sof_imx8m_ops = { 
		SNDRV_PCM_INFO_PAUSE |

		SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,

};

EXPORT_SYMBOL(sof_imx8m_ops);



static struct sof_dev_desc sof_of_imx8mp_desc = {

	.default_fw_path = "imx/sof",

	.default_tplg_path = "imx/sof-tplg",

	.default_fw_filename = "sof-imx8m.ri",

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8m_ops,

};



static const struct of_device_id sof_of_imx8m_ids[] = {

	{ .compatible = "fsl,imx8mp-dsp", .data = &sof_of_imx8mp_desc},

	{ }

};

MODULE_DEVICE_TABLE(of, sof_of_imx8m_ids);



/* DT driver definition */

static struct platform_driver snd_sof_of_imx8m_driver = {

	.probe = sof_of_probe,

	.remove = sof_of_remove,

	.driver = {

		.name = "sof-audio-of-imx8m",

		.pm = &sof_of_pm,

		.of_match_table = sof_of_imx8m_ids,

	},

};

module_platform_driver(snd_sof_of_imx8m_driver);



MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);

MODULE_LICENSE("Dual BSD/GPL");

sound/soc/sof/mediatek/mediatek-ops.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */



#ifndef __MEDIATEK_OPS_H__

#define __MEDIATEK_OPS_H__



extern const struct snd_sof_dsp_ops sof_mt8195_ops;



#endif

sound/soc/sof/mediatek/mt8195/mt8195.c

+28 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <sound/sof.h>

#include <sound/sof/xtensa.h>

#include "../../ops.h"

#include "../../sof-of-dev.h"

#include "../../sof-audio.h"

#include "../adsp_helper.h"

#include "../mediatek-ops.h"

#include "mt8195.h"

#include "mt8195-clk.h"
@@ -388,7 +388,7 @@ static struct snd_soc_dai_driver mt8195_dai[] = { 
};



/* mt8195 ops */

const struct snd_sof_dsp_ops sof_mt8195_ops = {

static const struct snd_sof_dsp_ops sof_mt8195_ops = {

	/* probe and remove */

	.probe		= mt8195_dsp_probe,

	.remove		= mt8195_dsp_remove,
@@ -432,7 +432,32 @@ const struct snd_sof_dsp_ops sof_mt8195_ops = { 
			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,

};

EXPORT_SYMBOL(sof_mt8195_ops);



static const struct sof_dev_desc sof_of_mt8195_desc = {

	.default_fw_path = "mediatek/sof",

	.default_tplg_path = "mediatek/sof-tplg",

	.default_fw_filename = "sof-mt8195.ri",

	.nocodec_tplg_filename = "sof-mt8195-nocodec.tplg",

	.ops = &sof_mt8195_ops,

};



static const struct of_device_id sof_of_mt8195_ids[] = {

	{ .compatible = "mediatek,mt8195-dsp", .data = &sof_of_mt8195_desc},

	{ }

};

MODULE_DEVICE_TABLE(of, sof_of_mt8195_ids);



/* DT driver definition */

static struct platform_driver snd_sof_of_mt8195_driver = {

	.probe = sof_of_probe,

	.remove = sof_of_remove,

	.driver = {

	.name = "sof-audio-of-mt8195",

		.pm = &sof_of_pm,

		.of_match_table = sof_of_mt8195_ids,

	},

};

module_platform_driver(snd_sof_of_mt8195_driver);



MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);

MODULE_LICENSE("Dual BSD/GPL");