Merge remote-tracking branches 'asoc/fix/intel', 'asoc/fix/jz4740', 'asoc/fix/rcar', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/tlv320aic3x' into asoc-linus
This commit is contained in:
@ -13,6 +13,9 @@ Required properties:
|
|||||||
"ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)
|
"ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)
|
||||||
|
|
||||||
- reg - <int> - I2C slave address
|
- reg - <int> - I2C slave address
|
||||||
|
- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
|
||||||
|
DVDD-supply : power supplies for the device as covered in
|
||||||
|
Documentation/devicetree/bindings/regulator/regulator.txt
|
||||||
|
|
||||||
|
|
||||||
Optional properties:
|
Optional properties:
|
||||||
@ -24,9 +27,6 @@ Optional properties:
|
|||||||
3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD
|
3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD
|
||||||
If this node is not mentioned or if the value is unknown, then
|
If this node is not mentioned or if the value is unknown, then
|
||||||
micbias is set to 2.0V.
|
micbias is set to 2.0V.
|
||||||
- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
|
|
||||||
DVDD-supply : power supplies for the device as covered in
|
|
||||||
Documentation/devicetree/bindings/regulator/regulator.txt
|
|
||||||
|
|
||||||
CODEC output pins:
|
CODEC output pins:
|
||||||
* HPL
|
* HPL
|
||||||
|
@ -1399,7 +1399,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
|
|||||||
}
|
}
|
||||||
|
|
||||||
aic3x_add_widgets(codec);
|
aic3x_add_widgets(codec);
|
||||||
list_add(&aic3x->list, &reset_list);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -1569,7 +1568,13 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
|
|||||||
|
|
||||||
ret = snd_soc_register_codec(&i2c->dev,
|
ret = snd_soc_register_codec(&i2c->dev,
|
||||||
&soc_codec_dev_aic3x, &aic3x_dai, 1);
|
&soc_codec_dev_aic3x, &aic3x_dai, 1);
|
||||||
return ret;
|
|
||||||
|
if (ret != 0)
|
||||||
|
goto err_gpio;
|
||||||
|
|
||||||
|
list_add(&aic3x->list, &reset_list);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
err_gpio:
|
err_gpio:
|
||||||
if (gpio_is_valid(aic3x->gpio_reset) &&
|
if (gpio_is_valid(aic3x->gpio_reset) &&
|
||||||
|
@ -136,7 +136,7 @@ struct sst_module_data {
|
|||||||
enum sst_data_type data_type; /* type of module data */
|
enum sst_data_type data_type; /* type of module data */
|
||||||
|
|
||||||
u32 size; /* size in bytes */
|
u32 size; /* size in bytes */
|
||||||
u32 offset; /* offset in FW file */
|
int32_t offset; /* offset in FW file */
|
||||||
u32 data_offset; /* offset in ADSP memory space */
|
u32 data_offset; /* offset in ADSP memory space */
|
||||||
void *data; /* module data */
|
void *data; /* module data */
|
||||||
};
|
};
|
||||||
|
@ -617,7 +617,7 @@ static void hsw_notification_work(struct work_struct *work)
|
|||||||
case IPC_POSITION_CHANGED:
|
case IPC_POSITION_CHANGED:
|
||||||
trace_ipc_notification("DSP stream position changed for",
|
trace_ipc_notification("DSP stream position changed for",
|
||||||
stream->reply.stream_hw_id);
|
stream->reply.stream_hw_id);
|
||||||
sst_dsp_inbox_read(hsw->dsp, pos, sizeof(pos));
|
sst_dsp_inbox_read(hsw->dsp, pos, sizeof(*pos));
|
||||||
|
|
||||||
if (stream->notify_position)
|
if (stream->notify_position)
|
||||||
stream->notify_position(stream, stream->pdata);
|
stream->notify_position(stream, stream->pdata);
|
||||||
@ -991,7 +991,8 @@ int sst_hsw_stream_get_volume(struct sst_hsw *hsw, struct sst_hsw_stream *stream
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
sst_dsp_read(hsw->dsp, volume,
|
sst_dsp_read(hsw->dsp, volume,
|
||||||
stream->reply.volume_register_address[channel], sizeof(volume));
|
stream->reply.volume_register_address[channel],
|
||||||
|
sizeof(*volume));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1609,7 +1610,7 @@ int sst_hsw_dx_set_state(struct sst_hsw *hsw,
|
|||||||
trace_ipc_request("PM enter Dx state", state);
|
trace_ipc_request("PM enter Dx state", state);
|
||||||
|
|
||||||
ret = ipc_tx_message_wait(hsw, header, &state_, sizeof(state_),
|
ret = ipc_tx_message_wait(hsw, header, &state_, sizeof(state_),
|
||||||
dx, sizeof(dx));
|
dx, sizeof(*dx));
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(hsw->dev, "ipc: error set dx state %d failed\n", state);
|
dev_err(hsw->dev, "ipc: error set dx state %d failed\n", state);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
#
|
#
|
||||||
# Jz4740 Platform Support
|
# Jz4740 Platform Support
|
||||||
#
|
#
|
||||||
snd-soc-jz4740-objs := jz4740-pcm.o
|
|
||||||
snd-soc-jz4740-i2s-objs := jz4740-i2s.o
|
snd-soc-jz4740-i2s-objs := jz4740-i2s.o
|
||||||
|
|
||||||
obj-$(CONFIG_SND_JZ4740_SOC) += snd-soc-jz4740.o
|
|
||||||
obj-$(CONFIG_SND_JZ4740_SOC_I2S) += snd-soc-jz4740-i2s.o
|
obj-$(CONFIG_SND_JZ4740_SOC_I2S) += snd-soc-jz4740-i2s.o
|
||||||
|
|
||||||
# Jz4740 Machine Support
|
# Jz4740 Machine Support
|
||||||
|
@ -258,7 +258,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
|
|||||||
{
|
{
|
||||||
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
||||||
|
|
||||||
clk_enable(src->clk);
|
clk_prepare_enable(src->clk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -269,7 +269,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
|
|||||||
{
|
{
|
||||||
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
||||||
|
|
||||||
clk_disable(src->clk);
|
clk_disable_unprepare(src->clk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -171,7 +171,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
|
|||||||
u32 cr;
|
u32 cr;
|
||||||
|
|
||||||
if (0 == ssi->usrcnt) {
|
if (0 == ssi->usrcnt) {
|
||||||
clk_enable(ssi->clk);
|
clk_prepare_enable(ssi->clk);
|
||||||
|
|
||||||
if (rsnd_dai_is_clk_master(rdai)) {
|
if (rsnd_dai_is_clk_master(rdai)) {
|
||||||
if (rsnd_ssi_clk_from_parent(ssi))
|
if (rsnd_ssi_clk_from_parent(ssi))
|
||||||
@ -230,7 +230,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
|
|||||||
rsnd_ssi_master_clk_stop(ssi);
|
rsnd_ssi_master_clk_stop(ssi);
|
||||||
}
|
}
|
||||||
|
|
||||||
clk_disable(ssi->clk);
|
clk_disable_unprepare(ssi->clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));
|
dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));
|
||||||
|
Reference in New Issue
Block a user