ASoC: soc-cache: Add spi_write support for all I/O types
Ensure that all drivers that use SPI and I2C will work properly by providing SPI write functions for all different I/O types. Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
bb5a027026
commit
f479fd93d4
|
@ -211,6 +211,36 @@ static unsigned int snd_soc_8_8_read(struct snd_soc_codec *codec,
|
||||||
return cache[reg];
|
return cache[reg];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_SPI_MASTER)
|
||||||
|
static int snd_soc_8_8_spi_write(void *control_data, const char *data,
|
||||||
|
int len)
|
||||||
|
{
|
||||||
|
struct spi_device *spi = control_data;
|
||||||
|
struct spi_transfer t;
|
||||||
|
struct spi_message m;
|
||||||
|
u8 msg[2];
|
||||||
|
|
||||||
|
if (len <= 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
msg[0] = data[0];
|
||||||
|
msg[1] = data[1];
|
||||||
|
|
||||||
|
spi_message_init(&m);
|
||||||
|
memset(&t, 0, (sizeof t));
|
||||||
|
|
||||||
|
t.tx_buf = &msg[0];
|
||||||
|
t.len = len;
|
||||||
|
|
||||||
|
spi_message_add_tail(&t, &m);
|
||||||
|
spi_sync(spi, &m);
|
||||||
|
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#define snd_soc_8_8_spi_write NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
|
static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
|
||||||
unsigned int value)
|
unsigned int value)
|
||||||
{
|
{
|
||||||
|
@ -254,6 +284,37 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_SPI_MASTER)
|
||||||
|
static int snd_soc_8_16_spi_write(void *control_data, const char *data,
|
||||||
|
int len)
|
||||||
|
{
|
||||||
|
struct spi_device *spi = control_data;
|
||||||
|
struct spi_transfer t;
|
||||||
|
struct spi_message m;
|
||||||
|
u8 msg[3];
|
||||||
|
|
||||||
|
if (len <= 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
msg[0] = data[0];
|
||||||
|
msg[1] = data[1];
|
||||||
|
msg[2] = data[2];
|
||||||
|
|
||||||
|
spi_message_init(&m);
|
||||||
|
memset(&t, 0, (sizeof t));
|
||||||
|
|
||||||
|
t.tx_buf = &msg[0];
|
||||||
|
t.len = len;
|
||||||
|
|
||||||
|
spi_message_add_tail(&t, &m);
|
||||||
|
spi_sync(spi, &m);
|
||||||
|
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#define snd_soc_8_16_spi_write NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
|
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
|
||||||
static unsigned int snd_soc_8_8_read_i2c(struct snd_soc_codec *codec,
|
static unsigned int snd_soc_8_8_read_i2c(struct snd_soc_codec *codec,
|
||||||
unsigned int r)
|
unsigned int r)
|
||||||
|
@ -518,6 +579,38 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg,
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_SPI_MASTER)
|
||||||
|
static int snd_soc_16_16_spi_write(void *control_data, const char *data,
|
||||||
|
int len)
|
||||||
|
{
|
||||||
|
struct spi_device *spi = control_data;
|
||||||
|
struct spi_transfer t;
|
||||||
|
struct spi_message m;
|
||||||
|
u8 msg[4];
|
||||||
|
|
||||||
|
if (len <= 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
msg[0] = data[0];
|
||||||
|
msg[1] = data[1];
|
||||||
|
msg[2] = data[2];
|
||||||
|
msg[3] = data[3];
|
||||||
|
|
||||||
|
spi_message_init(&m);
|
||||||
|
memset(&t, 0, (sizeof t));
|
||||||
|
|
||||||
|
t.tx_buf = &msg[0];
|
||||||
|
t.len = len;
|
||||||
|
|
||||||
|
spi_message_add_tail(&t, &m);
|
||||||
|
spi_sync(spi, &m);
|
||||||
|
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#define snd_soc_16_16_spi_write NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
int addr_bits;
|
int addr_bits;
|
||||||
int data_bits;
|
int data_bits;
|
||||||
|
@ -540,11 +633,13 @@ static struct {
|
||||||
.addr_bits = 8, .data_bits = 8,
|
.addr_bits = 8, .data_bits = 8,
|
||||||
.write = snd_soc_8_8_write, .read = snd_soc_8_8_read,
|
.write = snd_soc_8_8_write, .read = snd_soc_8_8_read,
|
||||||
.i2c_read = snd_soc_8_8_read_i2c,
|
.i2c_read = snd_soc_8_8_read_i2c,
|
||||||
|
.spi_write = snd_soc_8_8_spi_write,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.addr_bits = 8, .data_bits = 16,
|
.addr_bits = 8, .data_bits = 16,
|
||||||
.write = snd_soc_8_16_write, .read = snd_soc_8_16_read,
|
.write = snd_soc_8_16_write, .read = snd_soc_8_16_read,
|
||||||
.i2c_read = snd_soc_8_16_read_i2c,
|
.i2c_read = snd_soc_8_16_read_i2c,
|
||||||
|
.spi_write = snd_soc_8_16_spi_write,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.addr_bits = 16, .data_bits = 8,
|
.addr_bits = 16, .data_bits = 8,
|
||||||
|
@ -556,6 +651,7 @@ static struct {
|
||||||
.addr_bits = 16, .data_bits = 16,
|
.addr_bits = 16, .data_bits = 16,
|
||||||
.write = snd_soc_16_16_write, .read = snd_soc_16_16_read,
|
.write = snd_soc_16_16_write, .read = snd_soc_16_16_read,
|
||||||
.i2c_read = snd_soc_16_16_read_i2c,
|
.i2c_read = snd_soc_16_16_read_i2c,
|
||||||
|
.spi_write = snd_soc_16_16_spi_write,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue