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

ASoC: SOF: Intel: move hda.c to different module 



Now that most of the code moves are done, we can add a new module and
the required EXPORT_SYMBOL definitions.

No functionality change, just a new module added.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20240503135221.229202-8-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/Kconfig

+13 −9
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ config SND_SOC_SOF_MERRIFIELD 


config SND_SOC_SOF_INTEL_SKL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_IPC4



config SND_SOC_SOF_SKYLAKE
@@ -122,7 +122,7 @@ config SND_SOC_SOF_KABYLAKE 


config SND_SOC_SOF_INTEL_APL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_IPC3

	select SND_SOC_SOF_IPC4
@@ -148,7 +148,7 @@ config SND_SOC_SOF_GEMINILAKE 


config SND_SOC_SOF_INTEL_CNL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC3

	select SND_SOC_SOF_IPC4
@@ -184,7 +184,7 @@ config SND_SOC_SOF_COMETLAKE 


config SND_SOC_SOF_INTEL_ICL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC3

	select SND_SOC_SOF_IPC4
@@ -212,7 +212,7 @@ config SND_SOC_SOF_JASPERLAKE 


config SND_SOC_SOF_INTEL_TGL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC3

	select SND_SOC_SOF_IPC4
@@ -250,7 +250,7 @@ config SND_SOC_SOF_ALDERLAKE 


config SND_SOC_SOF_INTEL_MTL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC4
@@ -266,7 +266,7 @@ config SND_SOC_SOF_METEORLAKE 


config SND_SOC_SOF_INTEL_LNL

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_HDA_GENERIC

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC4

	select SND_SOC_SOF_INTEL_MTL
@@ -283,6 +283,10 @@ config SND_SOC_SOF_LUNARLAKE 


config SND_SOC_SOF_HDA_COMMON

	tristate



config SND_SOC_SOF_HDA_GENERIC

	tristate

	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_INTEL_COMMON

	select SND_SOC_SOF_PCI_DEV

	select SND_INTEL_DSP_CONFIG
@@ -299,7 +303,7 @@ config SND_SOC_SOF_HDA_MLINK 
	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.



if SND_SOC_SOF_HDA_COMMON

if SND_SOC_SOF_HDA_GENERIC



config SND_SOC_SOF_HDA_LINK

	bool "SOF support for HDA Links(HDA/HDMI)"
@@ -319,7 +323,7 @@ config SND_SOC_SOF_HDA_AUDIO_CODEC 
	  Say Y if you want to enable HDAudio codecs with SOF.

	  If unsure select "N".



endif ## SND_SOC_SOF_HDA_COMMON

endif ## SND_SOC_SOF_HDA_GENERIC



config SND_SOC_SOF_HDA_LINK_BASELINE

	tristate

sound/soc/sof/intel/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -3,12 +3,13 @@ 
snd-sof-acpi-intel-byt-objs := byt.o

snd-sof-acpi-intel-bdw-objs := bdw.o



snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \

snd-sof-intel-hda-common-objs := hda-loader.o hda-stream.o hda-trace.o \

				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \

				 hda-dai.o hda-dai-ops.o hda-bus.o \

				 hda-common-ops.o \

				 telemetry.o tracepoints.o



snd-sof-intel-hda-generic-objs := hda.o hda-common-ops.o



snd-sof-intel-hda-mlink-objs := hda-mlink.o



snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-probes.o
@@ -21,6 +22,7 @@ obj-$(CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP) += snd-sof-intel-atom.o 
obj-$(CONFIG_SND_SOC_SOF_BAYTRAIL) += snd-sof-acpi-intel-byt.o

obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-acpi-intel-bdw.o

obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o

obj-$(CONFIG_SND_SOC_SOF_HDA_GENERIC) += snd-sof-intel-hda-generic.o

obj-$(CONFIG_SND_SOC_SOF_HDA_MLINK) += snd-sof-intel-hda-mlink.o

obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o

sound/soc/sof/intel/hda-bus.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ void sof_hda_bus_init(struct snd_sof_dev *sdev, struct device *dev) 
	spin_lock_init(&bus->reg_lock);

#endif /* CONFIG_SND_SOC_SOF_HDA_LINK */

}

EXPORT_SYMBOL_NS(sof_hda_bus_init, SND_SOC_SOF_INTEL_HDA_COMMON);



void sof_hda_bus_exit(struct snd_sof_dev *sdev)

{
@@ -103,3 +104,4 @@ void sof_hda_bus_exit(struct snd_sof_dev *sdev) 
	snd_hdac_ext_bus_exit(bus);

#endif

}

EXPORT_SYMBOL_NS(sof_hda_bus_exit, SND_SOC_SOF_INTEL_HDA_COMMON);

sound/soc/sof/intel/hda-common-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -105,4 +105,4 @@ const struct snd_sof_dsp_ops sof_hda_common_ops = { 


	.dsp_arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_hda_common_ops, SND_SOC_SOF_INTEL_HDA_COMMON);
 
EXPORT_SYMBOL_NS(sof_hda_common_ops, SND_SOC_SOF_INTEL_HDA_GENERIC);

sound/soc/sof/intel/hda-ctrl.c

+9 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ int hda_dsp_ctrl_get_caps(struct snd_sof_dev *sdev) 


	return 0;

}

EXPORT_SYMBOL_NS(hda_dsp_ctrl_get_caps, SND_SOC_SOF_INTEL_HDA_COMMON);



void hda_dsp_ctrl_ppcap_enable(struct snd_sof_dev *sdev, bool enable)

{
@@ -136,6 +137,7 @@ void hda_dsp_ctrl_ppcap_enable(struct snd_sof_dev *sdev, bool enable) 
	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

				SOF_HDA_PPCTL_GPROCEN, val);

}

EXPORT_SYMBOL_NS(hda_dsp_ctrl_ppcap_enable, SND_SOC_SOF_INTEL_HDA_COMMON);



void hda_dsp_ctrl_ppcap_int_enable(struct snd_sof_dev *sdev, bool enable)

{
@@ -144,6 +146,7 @@ void hda_dsp_ctrl_ppcap_int_enable(struct snd_sof_dev *sdev, bool enable) 
	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

				SOF_HDA_PPCTL_PIE, val);

}

EXPORT_SYMBOL_NS(hda_dsp_ctrl_ppcap_int_enable, SND_SOC_SOF_INTEL_HDA_COMMON);



void hda_dsp_ctrl_misc_clock_gating(struct snd_sof_dev *sdev, bool enable)

{
@@ -263,6 +266,7 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev) 


	return ret;

}

EXPORT_SYMBOL_NS(hda_dsp_ctrl_init_chip, SND_SOC_SOF_INTEL_HDA_COMMON);



void hda_dsp_ctrl_stop_chip(struct snd_sof_dev *sdev)

{
@@ -322,3 +326,8 @@ void hda_dsp_ctrl_stop_chip(struct snd_sof_dev *sdev) 


	bus->chip_init = false;

}



MODULE_LICENSE("Dual BSD/GPL");

MODULE_IMPORT_NS(SND_SOC_SOF_HDA_MLINK);

MODULE_IMPORT_NS(SND_SOC_SOF_HDA_AUDIO_CODEC);

MODULE_IMPORT_NS(SND_SOC_SOF_HDA_AUDIO_CODEC_I915);