forked from raspberrypi/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New AudioInjector.net Pi soundcard with low jitter audio in and out.
Contains the sound/soc/bcm ALSA machine driver and necessary alterations to the Kconfig and Makefile. Adds the dts overlay and updates the Makefile and README. Updates the relevant defconfig files to enable building for the Raspberry Pi. Thanks to Phil Elwell (pelwell) for the review, simple-card concepts and discussion. Thanks to Clive Messer for overlay naming suggestions.
- Loading branch information
Showing
8 changed files
with
200 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Definitions for audioinjector.net audio add on soundcard | ||
| /dts-v1/; | ||
| /plugin/; | ||
|
|
||
| / { | ||
| compatible = "brcm,bcm2708"; | ||
|
|
||
| fragment@0 { | ||
| target = <&i2s>; | ||
| __overlay__ { | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@1 { | ||
| target = <&i2c1>; | ||
| __overlay__ { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| status = "okay"; | ||
|
|
||
| wm8731@1a { | ||
| #sound-dai-cells = <0>; | ||
| compatible = "wlf,wm8731"; | ||
| reg = <0x1a>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| fragment@2 { | ||
| target = <&sound>; | ||
| __overlay__ { | ||
| compatible = "ai,audioinjector-pi-soundcard"; | ||
| i2s-controller = <&i2s>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * ASoC Driver for AudioInjector Pi add on soundcard | ||
| * | ||
| * Created on: 13-May-2016 | ||
| * Author: flatmax@flatmax.org | ||
| * based on code by Cliff Cai <Cliff.Cai@analog.com> for the ssm2602 machine blackfin. | ||
| * with help from Lars-Peter Clausen for simplifying the original code to use the dai_fmt field. | ||
| * i2s_node code taken from the other sound/soc/bcm machine drivers. | ||
| * | ||
| * Copyright (C) 2016 Flatmax Pty. Ltd. | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * version 2 as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * General Public License for more details. | ||
| */ | ||
|
|
||
| #include <linux/module.h> | ||
| #include <linux/types.h> | ||
|
|
||
| #include <sound/core.h> | ||
| #include <sound/soc.h> | ||
| #include <sound/pcm_params.h> | ||
| #include <sound/control.h> | ||
|
|
||
| #include "../codecs/wm8731.h" | ||
|
|
||
| static int audioinjector_pi_soundcard_dai_init(struct snd_soc_pcm_runtime *rtd) | ||
| { | ||
| struct snd_soc_dapm_context *dapm = &rtd->card->dapm; | ||
|
|
||
| // not connected | ||
| snd_soc_dapm_nc_pin(dapm, "Mic Bias"); | ||
| snd_soc_dapm_nc_pin(dapm, "MICIN"); | ||
| snd_soc_dapm_nc_pin(dapm, "RHPOUT"); | ||
| snd_soc_dapm_nc_pin(dapm, "LHPOUT"); | ||
|
|
||
| return snd_soc_dai_set_sysclk(rtd->codec_dai, WM8731_SYSCLK_XTAL, 12000000, SND_SOC_CLOCK_IN); | ||
| } | ||
|
|
||
| static struct snd_soc_dai_link audioinjector_pi_soundcard_dai[] = { | ||
| { | ||
| .name = "AudioInjector audio", | ||
| .stream_name = "AudioInjector audio", | ||
| .cpu_dai_name = "bcm2708-i2s.0", | ||
| .codec_dai_name = "wm8731-hifi", | ||
| .platform_name = "bcm2835-i2s.0", | ||
| .codec_name = "wm8731.1-001a", | ||
| .init = audioinjector_pi_soundcard_dai_init, | ||
| .dai_fmt = SND_SOC_DAIFMT_CBM_CFM|SND_SOC_DAIFMT_I2S|SND_SOC_DAIFMT_NB_NF, | ||
| }, | ||
| }; | ||
|
|
||
| static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = { | ||
| SND_SOC_DAPM_SPK("Ext Spk", NULL), | ||
| SND_SOC_DAPM_LINE("Line In Jacks", NULL), | ||
| }; | ||
|
|
||
| /* Corgi machine connections to the codec pins */ | ||
| static const struct snd_soc_dapm_route audioinjector_audio_map[] = { | ||
| /* speaker connected to LOUT, ROUT */ | ||
| {"Ext Spk", NULL, "ROUT"}, | ||
| {"Ext Spk", NULL, "LOUT"}, | ||
|
|
||
| /* line inputs */ | ||
| {"Line In Jacks", NULL, "Line Input"}, | ||
| }; | ||
|
|
||
| static struct snd_soc_card snd_soc_audioinjector = { | ||
| .name = "audioinjector-pi-soundcard", | ||
| .dai_link = audioinjector_pi_soundcard_dai, | ||
| .num_links = 1, | ||
|
|
||
| .dapm_widgets = wm8731_dapm_widgets, | ||
| .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), | ||
| .dapm_routes = audioinjector_audio_map, | ||
| .num_dapm_routes = ARRAY_SIZE(audioinjector_audio_map), | ||
| }; | ||
|
|
||
| static int audioinjector_pi_soundcard_probe(struct platform_device *pdev) | ||
| { | ||
| struct snd_soc_card *card = &snd_soc_audioinjector; | ||
| int ret; | ||
|
|
||
| card->dev = &pdev->dev; | ||
|
|
||
| if (pdev->dev.of_node) { | ||
| struct snd_soc_dai_link *dai = &audioinjector_pi_soundcard_dai[0]; | ||
| struct device_node *i2s_node = of_parse_phandle(pdev->dev.of_node, | ||
| "i2s-controller", 0); | ||
|
|
||
| if (i2s_node) { | ||
| dai->cpu_dai_name = NULL; | ||
| dai->cpu_of_node = i2s_node; | ||
| dai->platform_name = NULL; | ||
| dai->platform_of_node = i2s_node; | ||
| } else | ||
| if (!dai->cpu_of_node) { | ||
| dev_err(&pdev->dev, "Property 'i2s-controller' missing or invalid\n"); | ||
| return -EINVAL; | ||
| } | ||
| } | ||
|
|
||
| if ((ret = snd_soc_register_card(card))) { | ||
| dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| static int audioinjector_pi_soundcard_remove(struct platform_device *pdev) | ||
| { | ||
| struct snd_soc_card *card = platform_get_drvdata(pdev); | ||
| return snd_soc_unregister_card(card); | ||
|
|
||
| } | ||
|
|
||
| static const struct of_device_id audioinjector_pi_soundcard_of_match[] = { | ||
| { .compatible = "ai,audioinjector-pi-soundcard", }, | ||
| {}, | ||
| }; | ||
| MODULE_DEVICE_TABLE(of, audioinjector_pi_soundcard_of_match); | ||
|
|
||
| static struct platform_driver audioinjector_pi_soundcard_driver = { | ||
| .driver = { | ||
| .name = "audioinjector-audio", | ||
| .owner = THIS_MODULE, | ||
| .of_match_table = audioinjector_pi_soundcard_of_match, | ||
| }, | ||
| .probe = audioinjector_pi_soundcard_probe, | ||
| .remove = audioinjector_pi_soundcard_remove, | ||
| }; | ||
|
|
||
| module_platform_driver(audioinjector_pi_soundcard_driver); | ||
| MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>"); | ||
| MODULE_DESCRIPTION("AudioInjector.net Pi Soundcard"); | ||
| MODULE_LICENSE("GPL v2"); | ||
| MODULE_ALIAS("platform:audioinjector-pi-soundcard"); | ||
|
|