zymon/seeed-voicecard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

override channels in dts setting

Browse source
This commit is contained in:
peter.yang 2017-11-22 07:33:59 +00:00
parent 878027066d
commit 5607fed986
5 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
seeed-4mic-voicecard-overlay.dts
View file

@ -51,6 +51,8 @@
simple-audio-card,bitclock-master = <&codec_dai>; simple-audio-card,bitclock-master = <&codec_dai>;
simple-audio-card,frame-master = <&codec_dai>; simple-audio-card,frame-master = <&codec_dai>;
simple-audio-card,channels-playback-override = <4>;
simple-audio-card,channels-capture-override = <4>;
cpu_dai: simple-audio-card,cpu { cpu_dai: simple-audio-card,cpu {
sound-dai = <&i2s>; sound-dai = <&i2s>;

BIN
seeed-4mic-voicecard.dtbo
View file

Binary file not shown.

2
seeed-8mic-voicecard-overlay.dts
View file

@ -58,6 +58,8 @@
simple-audio-card,bitclock-master = <&codec_dai>; simple-audio-card,bitclock-master = <&codec_dai>;
simple-audio-card,frame-master = <&codec_dai>; simple-audio-card,frame-master = <&codec_dai>;
simple-audio-card,channels-playback-override = <8>;
simple-audio-card,channels-capture-override = <8>;
cpu_dai: simple-audio-card,cpu { cpu_dai: simple-audio-card,cpu {
sound-dai = <&i2s>; sound-dai = <&i2s>;

BIN
seeed-8mic-voicecard.dtbo
View file

Binary file not shown.

39
simple-card.c
View file

@ -35,6 +35,10 @@ struct simple_card_data {
unsigned int mclk_fs; unsigned int mclk_fs;
} *dai_props; } *dai_props;
unsigned int mclk_fs; unsigned int mclk_fs;
unsigned channels_playback_default;
unsigned channels_playback_override;
unsigned channels_capture_default;
unsigned channels_capture_override;
struct asoc_simple_jack hp_jack; struct asoc_simple_jack hp_jack;
struct asoc_simple_jack mic_jack; struct asoc_simple_jack mic_jack;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
@ -125,10 +129,16 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
if (ret) if (ret)
clk_disable_unprepare(dai_props->cpu_dai.clk); clk_disable_unprepare(dai_props->cpu_dai.clk);
rtd->cpu_dai->driver->playback.channels_min = 8; if (rtd->cpu_dai->driver->playback.channels_min) {
rtd->cpu_dai->driver->playback.channels_max = 8; priv->channels_playback_default = rtd->cpu_dai->driver->playback.channels_min;
rtd->cpu_dai->driver->capture.channels_min = 8; }
rtd->cpu_dai->driver->capture.channels_max = 8; if (rtd->cpu_dai->driver->capture.channels_min) {
priv->channels_capture_default = rtd->cpu_dai->driver->capture.channels_min;
}
rtd->cpu_dai->driver->playback.channels_min = priv->channels_playback_override;
rtd->cpu_dai->driver->playback.channels_max = priv->channels_playback_override;
rtd->cpu_dai->driver->capture.channels_min = priv->channels_capture_override;
rtd->cpu_dai->driver->capture.channels_max = priv->channels_capture_override;
return ret; return ret;
} }
@ -140,10 +150,10 @@ static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream)
struct simple_dai_props *dai_props = struct simple_dai_props *dai_props =
simple_priv_to_props(priv, rtd->num); simple_priv_to_props(priv, rtd->num);
rtd->cpu_dai->driver->playback.channels_min = 2; rtd->cpu_dai->driver->playback.channels_min = priv->channels_playback_default;
rtd->cpu_dai->driver->playback.channels_max = 2; rtd->cpu_dai->driver->playback.channels_max = priv->channels_playback_default;
rtd->cpu_dai->driver->capture.channels_min = 2; rtd->cpu_dai->driver->capture.channels_min = priv->channels_capture_default;
rtd->cpu_dai->driver->capture.channels_max = 2; rtd->cpu_dai->driver->capture.channels_max = priv->channels_capture_default;
clk_disable_unprepare(dai_props->cpu_dai.clk); clk_disable_unprepare(dai_props->cpu_dai.clk);
@ -421,6 +431,19 @@ static int asoc_simple_card_parse_of(struct device_node *node,
ret = asoc_simple_card_parse_aux_devs(node, priv); ret = asoc_simple_card_parse_aux_devs(node, priv);
priv->channels_playback_default = 0;
priv->channels_playback_override = 2;
priv->channels_capture_default = 0;
priv->channels_capture_override = 2;
of_property_read_u32(node, PREFIX "channels-playback-default",
&priv->channels_playback_default);
of_property_read_u32(node, PREFIX "channels-playback-override",
&priv->channels_playback_override);
of_property_read_u32(node, PREFIX "channels-capture-default",
&priv->channels_capture_default);
of_property_read_u32(node, PREFIX "channels-capture-override",
&priv->channels_capture_override);
card_parse_end: card_parse_end:
of_node_put(dai_link); of_node_put(dai_link);