Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1442bc1 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core - Add platform read and write. 



In preparation for ASoC Dynamic PCM (AKA DSP) support.

Allow platform driver to perform IO. Intended for platform DAPM.

Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 469bb638

include/sound/soc.h

+8 −0
Original line number Diff line number Diff line
@@ -312,6 +312,10 @@ int snd_soc_default_readable_register(struct snd_soc_codec *codec, 
				      unsigned int reg);

int snd_soc_default_writable_register(struct snd_soc_codec *codec,

				      unsigned int reg);

int snd_soc_platform_read(struct snd_soc_platform *platform,

					unsigned int reg);

int snd_soc_platform_write(struct snd_soc_platform *platform,

					unsigned int reg, unsigned int val);



/* Utility functions to get clock rates from various things */

int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
@@ -658,6 +662,10 @@ struct snd_soc_platform_driver { 
	/* probe ordering - for components with runtime dependencies */

	int probe_order;

	int remove_order;



	/* platform IO - used for platform DAPM */

	unsigned int (*read)(struct snd_soc_platform *, unsigned int);

	int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);

};



struct snd_soc_platform {

sound/soc/soc-core.c

+30 −0
Original line number Diff line number Diff line
@@ -1640,6 +1640,36 @@ int snd_soc_codec_writable_register(struct snd_soc_codec *codec, 
}

EXPORT_SYMBOL_GPL(snd_soc_codec_writable_register);



int snd_soc_platform_read(struct snd_soc_platform *platform,

					unsigned int reg)

{

	unsigned int ret;



	if (!platform->driver->read) {

		dev_err(platform->dev, "platform has no read back\n");

		return -1;

	}



	ret = platform->driver->read(platform, reg);

	dev_dbg(platform->dev, "read %x => %x\n", reg, ret);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_platform_read);



int snd_soc_platform_write(struct snd_soc_platform *platform,

					 unsigned int reg, unsigned int val)

{

	if (!platform->driver->write) {

		dev_err(platform->dev, "platform has no write back\n");

		return -1;

	}



	dev_dbg(platform->dev, "write %x = %x\n", reg, val);

	return platform->driver->write(platform, reg, val);

}

EXPORT_SYMBOL_GPL(snd_soc_platform_write);



/**

 * snd_soc_new_ac97_codec - initailise AC97 device

 * @codec: audio codec