Compare commits
9 commits
v6.6-order
...
v6.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
575578c362 | ||
|
|
c3a2d96ba2 | ||
|
|
7aef82f3be | ||
|
|
8f377d1eaa | ||
|
|
aaa2090dbf | ||
|
|
a46c3f6324 | ||
|
|
2a40c7dbff | ||
|
|
a03624a0ce | ||
|
|
0bb3ca6c98 |
5 changed files with 27 additions and 22 deletions
|
|
@ -5,7 +5,7 @@ The drivers for [ReSpeaker Mic Hat](https://www.seeedstudio.com/ReSpeaker-2-Mics
|
||||||
### Install seeed-voicecard
|
### Install seeed-voicecard
|
||||||
Get the seeed voice card source code and install all linux kernel drivers
|
Get the seeed voice card source code and install all linux kernel drivers
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/respeaker/seeed-voicecard
|
git clone https://github.com/HinTak/seeed-voicecard
|
||||||
cd seeed-voicecard
|
cd seeed-voicecard
|
||||||
sudo ./install.sh
|
sudo ./install.sh
|
||||||
sudo reboot
|
sudo reboot
|
||||||
|
|
|
||||||
4
ac101.c
4
ac101.c
|
|
@ -955,7 +955,7 @@ void ac101_aif_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai
|
||||||
|
|
||||||
AC101_DBG("stream = %s, play: %d, capt: %d, active: %d\n",
|
AC101_DBG("stream = %s, play: %d, capt: %d, active: %d\n",
|
||||||
snd_pcm_stream_str(substream),
|
snd_pcm_stream_str(substream),
|
||||||
codec_dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK], codec_dai->stream_active[SNDRV_PCM_STREAM_CAPTURE],
|
codec_dai->stream[SNDRV_PCM_STREAM_PLAYBACK].active, codec_dai->stream[SNDRV_PCM_STREAM_CAPTURE].active,
|
||||||
snd_soc_dai_active(codec_dai));
|
snd_soc_dai_active(codec_dai));
|
||||||
|
|
||||||
if (!snd_soc_dai_active(codec_dai)) {
|
if (!snd_soc_dai_active(codec_dai)) {
|
||||||
|
|
@ -1080,7 +1080,7 @@ int ac101_hw_params(struct snd_pcm_substream *substream,
|
||||||
freq_out = _FREQ_24_576K;
|
freq_out = _FREQ_24_576K;
|
||||||
for (i = 0; i < ARRAY_SIZE(codec_aif1_fs); i++) {
|
for (i = 0; i < ARRAY_SIZE(codec_aif1_fs); i++) {
|
||||||
if (codec_aif1_fs[i].samp_rate == params_rate(params)) {
|
if (codec_aif1_fs[i].samp_rate == params_rate(params)) {
|
||||||
if (codec_dai->stream_active[SNDRV_PCM_STREAM_CAPTURE] && dmic_used && codec_aif1_fs[i].samp_rate == 44100) {
|
if (codec_dai->stream[SNDRV_PCM_STREAM_CAPTURE].active && dmic_used && codec_aif1_fs[i].samp_rate == 44100) {
|
||||||
ac101_update_bits(codec, AIF_SR_CTRL, (0xf<<AIF1_FS), (0x4<<AIF1_FS));
|
ac101_update_bits(codec, AIF_SR_CTRL, (0xf<<AIF1_FS), (0x4<<AIF1_FS));
|
||||||
} else {
|
} else {
|
||||||
ac101_update_bits(codec, AIF_SR_CTRL, (0xf<<AIF1_FS), ((codec_aif1_fs[i].srbit)<<AIF1_FS));
|
ac101_update_bits(codec, AIF_SR_CTRL, (0xf<<AIF1_FS), ((codec_aif1_fs[i].srbit)<<AIF1_FS));
|
||||||
|
|
|
||||||
28
ac108.c
28
ac108.c
|
|
@ -653,7 +653,7 @@ static int ac108_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_h
|
||||||
|
|
||||||
dev_dbg(dai->dev, "%s() stream=%s play:%d capt:%d +++\n", __func__,
|
dev_dbg(dai->dev, "%s() stream=%s play:%d capt:%d +++\n", __func__,
|
||||||
snd_pcm_stream_str(substream),
|
snd_pcm_stream_str(substream),
|
||||||
dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK], dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]);
|
dai->stream[SNDRV_PCM_STREAM_PLAYBACK].active, dai->stream[SNDRV_PCM_STREAM_CAPTURE].active);
|
||||||
|
|
||||||
if (ac10x->i2c101) {
|
if (ac10x->i2c101) {
|
||||||
ret = ac101_hw_params(substream, params, dai);
|
ret = ac101_hw_params(substream, params, dai);
|
||||||
|
|
@ -664,8 +664,8 @@ static int ac108_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_h
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE && dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK])
|
if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE && dai->stream[SNDRV_PCM_STREAM_PLAYBACK].active)
|
||||||
|| (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && dai->stream_active[SNDRV_PCM_STREAM_CAPTURE])) {
|
|| (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && dai->stream[SNDRV_PCM_STREAM_CAPTURE].active)) {
|
||||||
/* not configure hw_param twice */
|
/* not configure hw_param twice */
|
||||||
/* return 0; */
|
/* return 0; */
|
||||||
}
|
}
|
||||||
|
|
@ -1410,7 +1410,15 @@ static const struct regmap_config ac108_regmap = {
|
||||||
.max_register = 0xDF,
|
.max_register = 0xDF,
|
||||||
.cache_type = REGCACHE_FLAT,
|
.cache_type = REGCACHE_FLAT,
|
||||||
};
|
};
|
||||||
static int ac108_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *i2c_id) {
|
static const struct i2c_device_id ac108_i2c_id[] = {
|
||||||
|
{ "ac108_0", 0 },
|
||||||
|
{ "ac108_1", 1 },
|
||||||
|
{ "ac108_2", 2 },
|
||||||
|
{ "ac108_3", 3 },
|
||||||
|
{ "ac101", AC101_I2C_ID },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
static int ac108_i2c_probe(struct i2c_client *i2c) {
|
||||||
struct device_node *np = i2c->dev.of_node;
|
struct device_node *np = i2c->dev.of_node;
|
||||||
unsigned int val = 0;
|
unsigned int val = 0;
|
||||||
int ret = 0, index;
|
int ret = 0, index;
|
||||||
|
|
@ -1423,11 +1431,11 @@ static int ac108_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *i
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
index = (int)i2c_id->driver_data;
|
index = (int)i2c_match_id(ac108_i2c_id, i2c)->driver_data;
|
||||||
if (index == AC101_I2C_ID) {
|
if (index == AC101_I2C_ID) {
|
||||||
ac10x->i2c101 = i2c;
|
ac10x->i2c101 = i2c;
|
||||||
i2c_set_clientdata(i2c, ac10x);
|
i2c_set_clientdata(i2c, ac10x);
|
||||||
ret = ac101_probe(i2c, i2c_id);
|
ret = ac101_probe(i2c, i2c_match_id(ac108_i2c_id, i2c));
|
||||||
if (ret) {
|
if (ret) {
|
||||||
ac10x->i2c101 = NULL;
|
ac10x->i2c101 = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -1520,14 +1528,6 @@ __ret:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct i2c_device_id ac108_i2c_id[] = {
|
|
||||||
{ "ac108_0", 0 },
|
|
||||||
{ "ac108_1", 1 },
|
|
||||||
{ "ac108_2", 2 },
|
|
||||||
{ "ac108_3", 3 },
|
|
||||||
{ "ac101", AC101_I2C_ID },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(i2c, ac108_i2c_id);
|
MODULE_DEVICE_TABLE(i2c, ac108_i2c_id);
|
||||||
|
|
||||||
static const struct of_device_id ac108_of_match[] = {
|
static const struct of_device_id ac108_of_match[] = {
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,7 @@ static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd
|
||||||
|
|
||||||
dev_dbg(rtd->card->dev, "%s() stream=%s cmd=%d play:%d, capt:%d\n",
|
dev_dbg(rtd->card->dev, "%s() stream=%s cmd=%d play:%d, capt:%d\n",
|
||||||
__FUNCTION__, snd_pcm_stream_str(substream), cmd,
|
__FUNCTION__, snd_pcm_stream_str(substream), cmd,
|
||||||
dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK], dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]);
|
dai->stream[SNDRV_PCM_STREAM_PLAYBACK].active, dai->stream[SNDRV_PCM_STREAM_CAPTURE].active);
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case SNDRV_PCM_TRIGGER_START:
|
case SNDRV_PCM_TRIGGER_START:
|
||||||
|
|
@ -242,7 +242,7 @@ static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd
|
||||||
case SNDRV_PCM_TRIGGER_SUSPEND:
|
case SNDRV_PCM_TRIGGER_SUSPEND:
|
||||||
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
||||||
/* capture channel resync, if overrun */
|
/* capture channel resync, if overrun */
|
||||||
if (dai->stream_active[SNDRV_PCM_STREAM_CAPTURE] && substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
if (dai->stream[SNDRV_PCM_STREAM_CAPTURE].active && substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -262,7 +262,7 @@ static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd
|
||||||
|
|
||||||
dev_dbg(rtd->card->dev, "%s() stream=%s cmd=%d play:%d, capt:%d;finished %d\n",
|
dev_dbg(rtd->card->dev, "%s() stream=%s cmd=%d play:%d, capt:%d;finished %d\n",
|
||||||
__FUNCTION__, snd_pcm_stream_str(substream), cmd,
|
__FUNCTION__, snd_pcm_stream_str(substream), cmd,
|
||||||
dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK], dai->stream_active[SNDRV_PCM_STREAM_CAPTURE], ret);
|
dai->stream[SNDRV_PCM_STREAM_PLAYBACK].active, dai->stream[SNDRV_PCM_STREAM_CAPTURE].active, ret);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -396,8 +396,14 @@ static int asoc_simple_init_dai_link_params(struct snd_soc_pcm_runtime *rtd)
|
||||||
params->channels_min = hw.channels_min;
|
params->channels_min = hw.channels_min;
|
||||||
params->channels_max = hw.channels_max;
|
params->channels_max = hw.channels_max;
|
||||||
|
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,0)
|
||||||
|
dai_link->c2c_params = params;
|
||||||
|
dai_link->num_c2c_params = 1;
|
||||||
|
#else
|
||||||
|
/* apparently this goes back to 5.6.x */
|
||||||
dai_link->params = params;
|
dai_link->params = params;
|
||||||
dai_link->num_params = 1;
|
dai_link->num_params = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
3
wm8960.c
3
wm8960.c
|
|
@ -1318,8 +1318,7 @@ static void wm8960_set_pdata_from_of(struct i2c_client *i2c,
|
||||||
pdata->shared_lrclk = true;
|
pdata->shared_lrclk = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int wm8960_i2c_probe(struct i2c_client *i2c,
|
static int wm8960_i2c_probe(struct i2c_client *i2c)
|
||||||
const struct i2c_device_id *id)
|
|
||||||
{
|
{
|
||||||
struct wm8960_data *pdata = dev_get_platdata(&i2c->dev);
|
struct wm8960_data *pdata = dev_get_platdata(&i2c->dev);
|
||||||
struct wm8960_priv *wm8960;
|
struct wm8960_priv *wm8960;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue