Merge remote-tracking branch 'asoc/topic/core' into asoc-next (b8139d0a) · Commits · e / devices / android_kernel_fairphone_FP5

include/sound/soc.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -1146,6 +1146,33 @@ static inline struct snd_soc_platform *snd_soc_component_to_platform(
		return container_of(component, struct snd_soc_platform, component);
		}

		/**
		* snd_soc_dapm_to_codec() - Casts a DAPM context to the CODEC it is embedded in
		* @dapm: The DAPM context to cast to the CODEC
		*
		* This function must only be used on DAPM contexts that are known to be part of
		* a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.
		*/
		static inline struct snd_soc_codec *snd_soc_dapm_to_codec(
		struct snd_soc_dapm_context *dapm)
		{
		return container_of(dapm, struct snd_soc_codec, dapm);
		}

		/**
		* snd_soc_dapm_to_platform() - Casts a DAPM context to the platform it is
		* embedded in
		* @dapm: The DAPM context to cast to the platform.
		*
		* This function must only be used on DAPM contexts that are known to be part of
		* a platform (e.g. in a platform driver). Otherwise the behavior is undefined.
		*/
		static inline struct snd_soc_platform *snd_soc_dapm_to_platform(
		struct snd_soc_dapm_context *dapm)
		{
		return container_of(dapm, struct snd_soc_platform, dapm);
		}

		/* codec IO */
		unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
		int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,

+3 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,9 @@ int snd_soc_cache_init(struct snd_soc_codec *codec)

		reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;

		if (!reg_size)
		return 0;

		mutex_init(&codec->cache_rw_mutex);

		dev_dbg(codec->dev, "ASoC: Initializing cache for %s codec\n",