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

ASoC: SOF: Intel: hda: add namespace for hda-codec functionality 



Define namespaces (one generic and one dedicated for i915) and include
them in HDaudio top-level module.

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


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

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

+7 −7
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) 
void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {}

void hda_codec_jack_check(struct snd_sof_dev *sdev) {}

#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

EXPORT_SYMBOL(hda_codec_jack_wake_enable);

EXPORT_SYMBOL(hda_codec_jack_check);

EXPORT_SYMBOL_NS(hda_codec_jack_wake_enable, SND_SOC_SOF_HDA_AUDIO_CODEC);

EXPORT_SYMBOL_NS(hda_codec_jack_check, SND_SOC_SOF_HDA_AUDIO_CODEC);



/* probe individual codec */

static int hda_codec_probe(struct snd_sof_dev *sdev, int address,
@@ -160,7 +160,7 @@ void hda_codec_probe_bus(struct snd_sof_dev *sdev, 
		}

	}

}

EXPORT_SYMBOL(hda_codec_probe_bus);

EXPORT_SYMBOL_NS(hda_codec_probe_bus, SND_SOC_SOF_HDA_AUDIO_CODEC);



#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) || \

	IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
@@ -172,7 +172,7 @@ void hda_codec_i915_get(struct snd_sof_dev *sdev) 
	dev_dbg(bus->dev, "Turning i915 HDAC power on\n");

	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true);

}

EXPORT_SYMBOL(hda_codec_i915_get);

EXPORT_SYMBOL_NS(hda_codec_i915_get, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);



void hda_codec_i915_put(struct snd_sof_dev *sdev)

{
@@ -181,7 +181,7 @@ void hda_codec_i915_put(struct snd_sof_dev *sdev) 
	dev_dbg(bus->dev, "Turning i915 HDAC power off\n");

	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, false);

}

EXPORT_SYMBOL(hda_codec_i915_put);

EXPORT_SYMBOL_NS(hda_codec_i915_put, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);



int hda_codec_i915_init(struct snd_sof_dev *sdev)

{
@@ -197,7 +197,7 @@ int hda_codec_i915_init(struct snd_sof_dev *sdev) 


	return 0;

}

EXPORT_SYMBOL(hda_codec_i915_init);

EXPORT_SYMBOL_NS(hda_codec_i915_init, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);



int hda_codec_i915_exit(struct snd_sof_dev *sdev)

{
@@ -210,7 +210,7 @@ int hda_codec_i915_exit(struct snd_sof_dev *sdev) 


	return ret;

}

EXPORT_SYMBOL(hda_codec_i915_exit);

EXPORT_SYMBOL_NS(hda_codec_i915_exit, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);



#endif

sound/soc/sof/intel/hda.c

+2 −0
Original line number Diff line number Diff line
@@ -795,3 +795,5 @@ void hda_machine_select(struct snd_sof_dev *sdev) 
}



MODULE_LICENSE("Dual BSD/GPL");

MODULE_IMPORT_NS(SND_SOC_SOF_HDA_AUDIO_CODEC);

MODULE_IMPORT_NS(SND_SOC_SOF_HDA_AUDIO_CODEC_I915);

CRA Git | Maintained and supported by SUSTech CRA and CCSE