Skip to content

Commit 9a0a9a7

Browse files
babuenirhexameron
authored and
hexameron
committed
Add clock changes and mute gpios (raspberrypi#1938)
Also improve code style and adhere to ALSA coding conventions. Signed-off-by: Baswaraj K <[email protected]> Reviewed-by: Vijay Kumar B. <[email protected]> Reviewed-by: Raashid Muhammed <[email protected]>
1 parent c69dfb3 commit 9a0a9a7

File tree

5 files changed

+291
-65
lines changed

5 files changed

+291
-65
lines changed

arch/arm/boot/dts/overlays/README

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,9 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec
323323
responsibility of the user to ensure that
324324
the Digital volume control is set to a value
325325
that does not result in clipping/distortion!)
326+
glb_mclk This option is only with Kali board. If enabled,
327+
MCLK for Kali is used and PLL is disabled for
328+
better voice quality. (default Off)
326329

327330

328331
Name: at86rf233

arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#size-cells = <0>;
2020
status = "okay";
2121

22-
pcm5122_4c: pcm5122@4c {
22+
allo_pcm5122_4c: pcm5122@4c {
2323
#sound-dai-cells = <0>;
2424
compatible = "ti,pcm5122";
2525
reg = <0x4c>;
2626
status = "okay";
2727
};
28-
pcm5122_4d: pcm5122@4d {
28+
allo_pcm5122_4d: pcm5122@4d {
2929
#sound-dai-cells = <0>;
3030
compatible = "ti,pcm5122";
3131
reg = <0x4d>;
@@ -38,14 +38,18 @@
3838
target = <&sound>;
3939
piano_dac: __overlay__ {
4040
compatible = "allo,piano-dac-plus";
41-
audio-codec = <&pcm5122_4c &pcm5122_4d>;
41+
audio-codec = <&allo_pcm5122_4c &allo_pcm5122_4d>;
4242
i2s-controller = <&i2s>;
43+
mute1-gpios = <&gpio 6 1>;
44+
mute2-gpios = <&gpio 25 1>;
4345
status = "okay";
4446
};
4547
};
4648

4749
__overrides__ {
4850
24db_digital_gain =
49-
<&piano_dac>,"piano,24db_digital_gain?";
51+
<&piano_dac>,"allo,24db_digital_gain?";
52+
glb_mclk =
53+
<&piano_dac>,"allo,glb_mclk?";
5054
};
5155
};

arch/arm/configs/bcm2709_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
885885
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
886886
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
887887
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
888+
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
888889
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
889890
CONFIG_SND_PISOUND=m
890891
CONFIG_SND_SOC_ADAU1701=m

arch/arm/configs/bcmrpi_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,9 @@ CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
876876
CONFIG_SND_DIGIDAC1_SOUNDCARD=m
877877
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
878878
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
879+
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
879880
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
881+
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
880882
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
881883
CONFIG_SND_PISOUND=m
882884
CONFIG_SND_SOC_ADAU1701=m

0 commit comments

Comments
 (0)