Skip to content

Commit

Permalink
ASoC: sigmadsp: Add support for fw v2
Browse files Browse the repository at this point in the history
This patch adds support for the v2 version of the SigmaDSP firmware file
format. The new format has support for having different program and
parameter settings for different samplerates. In addition it stores metadata
describing the firmware. This metadata includes the set of supported
samplerates which will be used to restrict the samplerates that can be
selected by userspace. Also included is information about the modifiable
parameters. Those will be exposed as ALSA controls so they can be changed at
runtime.

The new format is based on a binary type-length-value structure that makes
it both forward and backwards compatible.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Nov 20, 2014
1 parent d48b088 commit a35daac
Show file tree
Hide file tree
Showing 4 changed files with 504 additions and 2 deletions.
29 changes: 29 additions & 0 deletions sound/soc/codecs/sigmadsp-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,34 @@ static int sigmadsp_write_i2c(void *control_data,
return ret;
}

static int sigmadsp_read_i2c(void *control_data,
unsigned int addr, uint8_t data[], size_t len)
{
struct i2c_client *client = control_data;
struct i2c_msg msgs[2];
uint8_t buf[2];
int ret;

put_unaligned_be16(addr, buf);

msgs[0].addr = client->addr;
msgs[0].len = sizeof(buf);
msgs[0].buf = buf;
msgs[0].flags = 0;

msgs[1].addr = client->addr;
msgs[1].len = len;
msgs[1].buf = data;
msgs[1].flags = I2C_M_RD;

ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
if (ret < 0)
return ret;
else if (ret != ARRAY_SIZE(msgs))
return -EIO;
return 0;
}

/**
* devm_sigmadsp_init_i2c() - Initialize SigmaDSP instance
* @client: The parent I2C device
Expand All @@ -55,6 +83,7 @@ struct sigmadsp *devm_sigmadsp_init_i2c(struct i2c_client *client,

sigmadsp->control_data = client;
sigmadsp->write = sigmadsp_write_i2c;
sigmadsp->read = sigmadsp_read_i2c;

return sigmadsp;
}
Expand Down
8 changes: 8 additions & 0 deletions sound/soc/codecs/sigmadsp-regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ static int sigmadsp_write_regmap(void *control_data,
data, len);
}

static int sigmadsp_read_regmap(void *control_data,
unsigned int addr, uint8_t data[], size_t len)
{
return regmap_raw_read(control_data, addr,
data, len);
}

/**
* devm_sigmadsp_init_i2c() - Initialize SigmaDSP instance
* @dev: The parent device
Expand All @@ -42,6 +49,7 @@ struct sigmadsp *devm_sigmadsp_init_regmap(struct device *dev,

sigmadsp->control_data = regmap;
sigmadsp->write = sigmadsp_write_regmap;
sigmadsp->read = sigmadsp_read_regmap;

return sigmadsp;
}
Expand Down
Loading

0 comments on commit a35daac

Please sign in to comment.