Unverified Commit 0f501c7c authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: move arch_ops under ops 



The current structures are not well designed. We include Xtensa
information from the ACPI and PCI levels, but at the Kconfig/module
level everything Xtensa related is included at the sof/intel level.

Move the arch_ops under ops so that Xtensa is hidden in the DSP ops,
with a structure that follows the Kconfig/module partition.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191217202231.18259-8-pierre-louis.bossart@linux.intel.com


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

include/sound/sof.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct sof_dev_desc { 
	const char *default_fw_filename;



	const struct snd_sof_dsp_ops *ops;

	const struct sof_arch_ops *arch_ops;

};



int sof_nocodec_setup(struct device *dev,

sound/soc/sof/intel/apl.c

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ const struct snd_sof_dsp_ops sof_apl_ops = { 
			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,



	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_apl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

sound/soc/sof/intel/bdw.c

+2 −0
Original line number Diff line number Diff line
@@ -632,6 +632,8 @@ const struct snd_sof_dsp_ops sof_bdw_ops = { 
			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_BATCH,



	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_bdw_ops, SND_SOC_SOF_BROADWELL);

sound/soc/sof/intel/byt.c

+6 −0
Original line number Diff line number Diff line
@@ -618,6 +618,8 @@ const struct snd_sof_dsp_ops sof_tng_ops = { 
			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_BATCH,



	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_tng_ops, SND_SOC_SOF_MERRIFIELD);
@@ -792,6 +794,8 @@ const struct snd_sof_dsp_ops sof_byt_ops = { 
			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_BATCH,



	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_byt_ops, SND_SOC_SOF_BAYTRAIL);
@@ -865,6 +869,8 @@ const struct snd_sof_dsp_ops sof_cht_ops = { 
			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_BATCH,



	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_cht_ops, SND_SOC_SOF_BAYTRAIL);

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ const struct snd_sof_dsp_ops sof_cnl_ops = { 
			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,



	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

CRA Git | Maintained and supported by SUSTech CRA and CCSE