You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
405 lines
12 KiB
Diff
405 lines
12 KiB
Diff
From 9dc67d61a5cd72eb80482aa1540e08a51e37172c Mon Sep 17 00:00:00 2001
|
|
From: Matt Flax <flatmax@flatmax.org>
|
|
Date: Wed, 8 Mar 2017 20:04:13 +1100
|
|
Subject: [PATCH 086/454] Add support for the AudioInjector.net Octo sound card
|
|
|
|
AudioInjector Octo: sample rates, regulators, reset
|
|
|
|
This patch adds new sample rates to the Audioinjector Octo sound card. The
|
|
new supported rates are (in kHz) :
|
|
96, 48, 32, 24, 16, 8, 88.2, 44.1, 29.4, 22.05, 14.7
|
|
|
|
Reference the bcm270x DT regulators in the overlay.
|
|
|
|
This patch adds a reset GPIO for the AudioInjector.net octo sound card.
|
|
|
|
Audioinjector octo : Make the playback and capture symmetric
|
|
|
|
This patch ensures that the sample rate and channel count of the audioinjector
|
|
octo sound card are symmetric.
|
|
---
|
|
sound/soc/bcm/Kconfig | 7 +
|
|
sound/soc/bcm/Makefile | 2 +
|
|
sound/soc/bcm/audioinjector-octo-soundcard.c | 341 +++++++++++++++++++
|
|
3 files changed, 350 insertions(+)
|
|
create mode 100644 sound/soc/bcm/audioinjector-octo-soundcard.c
|
|
|
|
--- a/sound/soc/bcm/Kconfig
|
|
+++ b/sound/soc/bcm/Kconfig
|
|
@@ -119,6 +119,13 @@ config SND_AUDIOINJECTOR_PI_SOUNDCARD
|
|
help
|
|
Say Y or M if you want to add support for audioinjector.net Pi Hat
|
|
|
|
+config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
|
|
+ tristate "Support for audioinjector.net Octo channel (Hat) soundcard"
|
|
+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
+ select SND_SOC_CS42XX8_I2C
|
|
+ help
|
|
+ Say Y or M if you want to add support for audioinjector.net octo add on
|
|
+
|
|
config SND_DIGIDAC1_SOUNDCARD
|
|
tristate "Support for Red Rocks Audio DigiDAC1"
|
|
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
--- a/sound/soc/bcm/Makefile
|
|
+++ b/sound/soc/bcm/Makefile
|
|
@@ -23,6 +23,7 @@ snd-soc-iqaudio-dac-objs := iqaudio-dac.
|
|
snd-soc-iqaudio-digi-objs := iqaudio_digi.o
|
|
snd-soc-raspidac3-objs := raspidac3.o
|
|
snd-soc-audioinjector-pi-soundcard-objs := audioinjector-pi-soundcard.o
|
|
+snd-soc-audioinjector-octo-soundcard-objs := audioinjector-octo-soundcard.o
|
|
snd-soc-digidac1-soundcard-objs := digidac1-soundcard.o
|
|
snd-soc-dionaudio-loco-objs := dionaudio_loco.o
|
|
snd-soc-dionaudio-loco-v2-objs := dionaudio_loco-v2.o
|
|
@@ -46,6 +47,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC
|
|
obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI) += snd-soc-iqaudio-digi.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_RASPIDAC3) += snd-soc-raspidac3.o
|
|
obj-$(CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD) += snd-soc-audioinjector-pi-soundcard.o
|
|
+obj-$(CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD) += snd-soc-audioinjector-octo-soundcard.o
|
|
obj-$(CONFIG_SND_DIGIDAC1_SOUNDCARD) += snd-soc-digidac1-soundcard.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO) += snd-soc-dionaudio-loco.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o
|
|
--- /dev/null
|
|
+++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
|
|
@@ -0,0 +1,341 @@
|
|
+/*
|
|
+ * ASoC Driver for AudioInjector Pi octo channel soundcard (hat)
|
|
+ *
|
|
+ * Created on: 27-October-2016
|
|
+ * Author: flatmax@flatmax.org
|
|
+ * based on audioinjector-pi-soundcard.c
|
|
+ *
|
|
+ * 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 <linux/gpio/consumer.h>
|
|
+
|
|
+#include <sound/core.h>
|
|
+#include <sound/soc.h>
|
|
+#include <sound/pcm_params.h>
|
|
+#include <sound/control.h>
|
|
+
|
|
+static struct gpio_descs *mult_gpios;
|
|
+static struct gpio_desc *codec_rst_gpio;
|
|
+static unsigned int audioinjector_octo_rate;
|
|
+
|
|
+static const unsigned int audioinjector_octo_rates[] = {
|
|
+ 96000, 48000, 32000, 24000, 16000, 8000, 88200, 44100, 29400, 22050, 14700,
|
|
+};
|
|
+
|
|
+static struct snd_pcm_hw_constraint_list audioinjector_octo_constraints = {
|
|
+ .list = audioinjector_octo_rates,
|
|
+ .count = ARRAY_SIZE(audioinjector_octo_rates),
|
|
+};
|
|
+
|
|
+static int audioinjector_octo_dai_init(struct snd_soc_pcm_runtime *rtd)
|
|
+{
|
|
+ return snd_soc_dai_set_bclk_ratio(rtd->cpu_dai, 64);
|
|
+}
|
|
+
|
|
+static int audioinjector_octo_startup(struct snd_pcm_substream *substream)
|
|
+{
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+ rtd->cpu_dai->driver->playback.channels_min = 8;
|
|
+ rtd->cpu_dai->driver->playback.channels_max = 8;
|
|
+ rtd->cpu_dai->driver->capture.channels_min = 8;
|
|
+ rtd->cpu_dai->driver->capture.channels_max = 8;
|
|
+ rtd->codec_dai->driver->capture.channels_max = 8;
|
|
+
|
|
+ snd_pcm_hw_constraint_list(substream->runtime, 0,
|
|
+ SNDRV_PCM_HW_PARAM_RATE,
|
|
+ &audioinjector_octo_constraints);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void audioinjector_octo_shutdown(struct snd_pcm_substream *substream)
|
|
+{
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+ rtd->cpu_dai->driver->playback.channels_min = 2;
|
|
+ rtd->cpu_dai->driver->playback.channels_max = 2;
|
|
+ rtd->cpu_dai->driver->capture.channels_min = 2;
|
|
+ rtd->cpu_dai->driver->capture.channels_max = 2;
|
|
+ rtd->codec_dai->driver->capture.channels_max = 6;
|
|
+}
|
|
+
|
|
+static int audioinjector_octo_hw_params(struct snd_pcm_substream *substream,
|
|
+ struct snd_pcm_hw_params *params)
|
|
+{
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+
|
|
+ // set codec DAI configuration
|
|
+ int ret = snd_soc_dai_set_fmt(rtd->codec_dai,
|
|
+ SND_SOC_DAIFMT_CBS_CFS|SND_SOC_DAIFMT_DSP_A|
|
|
+ SND_SOC_DAIFMT_NB_NF);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ // set cpu DAI configuration
|
|
+ ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
|
|
+ SND_SOC_DAIFMT_CBM_CFM|SND_SOC_DAIFMT_I2S|
|
|
+ SND_SOC_DAIFMT_NB_NF);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ audioinjector_octo_rate = params_rate(params);
|
|
+
|
|
+ // Set the correct sysclock for the codec
|
|
+ switch (audioinjector_octo_rate) {
|
|
+ case 96000:
|
|
+ case 48000:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000,
|
|
+ 0);
|
|
+ break;
|
|
+ case 24000:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000/2,
|
|
+ 0);
|
|
+ break;
|
|
+ case 32000:
|
|
+ case 16000:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000/3,
|
|
+ 0);
|
|
+ break;
|
|
+ case 8000:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 49152000/6,
|
|
+ 0);
|
|
+ break;
|
|
+ case 88200:
|
|
+ case 44100:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 45185400,
|
|
+ 0);
|
|
+ break;
|
|
+ case 22050:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 45185400/2,
|
|
+ 0);
|
|
+ break;
|
|
+ case 29400:
|
|
+ case 14700:
|
|
+ return snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 45185400/3,
|
|
+ 0);
|
|
+ break;
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+}
|
|
+
|
|
+static int audioinjector_octo_trigger(struct snd_pcm_substream *substream,
|
|
+ int cmd){
|
|
+ int mult[4];
|
|
+ mult[0] = 0;
|
|
+ mult[1] = 0;
|
|
+ mult[2] = 0;
|
|
+ mult[3] = 0;
|
|
+
|
|
+ switch (cmd) {
|
|
+ case SNDRV_PCM_TRIGGER_START:
|
|
+ case SNDRV_PCM_TRIGGER_RESUME:
|
|
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
|
+ switch (audioinjector_octo_rate) {
|
|
+ case 96000:
|
|
+ mult[3] = 1;
|
|
+ case 88200:
|
|
+ mult[1] = 1;
|
|
+ mult[2] = 1;
|
|
+ break;
|
|
+ case 48000:
|
|
+ mult[3] = 1;
|
|
+ case 44100:
|
|
+ mult[2] = 1;
|
|
+ break;
|
|
+ case 32000:
|
|
+ mult[3] = 1;
|
|
+ case 29400:
|
|
+ mult[0] = 1;
|
|
+ mult[1] = 1;
|
|
+ break;
|
|
+ case 24000:
|
|
+ mult[3] = 1;
|
|
+ case 22050:
|
|
+ mult[1] = 1;
|
|
+ break;
|
|
+ case 16000:
|
|
+ mult[3] = 1;
|
|
+ case 14700:
|
|
+ mult[0] = 1;
|
|
+ break;
|
|
+ case 8000:
|
|
+ mult[3] = 1;
|
|
+ break;
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ break;
|
|
+ case SNDRV_PCM_TRIGGER_STOP:
|
|
+ case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
|
+ break;
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ gpiod_set_array_value_cansleep(mult_gpios->ndescs, mult_gpios->desc,
|
|
+ mult);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static struct snd_soc_ops audioinjector_octo_ops = {
|
|
+ .startup = audioinjector_octo_startup,
|
|
+ .shutdown = audioinjector_octo_shutdown,
|
|
+ .hw_params = audioinjector_octo_hw_params,
|
|
+ .trigger = audioinjector_octo_trigger,
|
|
+};
|
|
+
|
|
+static struct snd_soc_dai_link audioinjector_octo_dai[] = {
|
|
+ {
|
|
+ .name = "AudioInjector Octo",
|
|
+ .stream_name = "AudioInject-HIFI",
|
|
+ .codec_dai_name = "cs42448",
|
|
+ .ops = &audioinjector_octo_ops,
|
|
+ .init = audioinjector_octo_dai_init,
|
|
+ .symmetric_rates = 1,
|
|
+ .symmetric_channels = 1,
|
|
+ },
|
|
+};
|
|
+
|
|
+static const struct snd_soc_dapm_widget audioinjector_octo_widgets[] = {
|
|
+ SND_SOC_DAPM_OUTPUT("OUTPUTS0"),
|
|
+ SND_SOC_DAPM_OUTPUT("OUTPUTS1"),
|
|
+ SND_SOC_DAPM_OUTPUT("OUTPUTS2"),
|
|
+ SND_SOC_DAPM_OUTPUT("OUTPUTS3"),
|
|
+ SND_SOC_DAPM_INPUT("INPUTS0"),
|
|
+ SND_SOC_DAPM_INPUT("INPUTS1"),
|
|
+ SND_SOC_DAPM_INPUT("INPUTS2"),
|
|
+};
|
|
+
|
|
+static const struct snd_soc_dapm_route audioinjector_octo_route[] = {
|
|
+ /* Balanced outputs */
|
|
+ {"OUTPUTS0", NULL, "AOUT1L"},
|
|
+ {"OUTPUTS0", NULL, "AOUT1R"},
|
|
+ {"OUTPUTS1", NULL, "AOUT2L"},
|
|
+ {"OUTPUTS1", NULL, "AOUT2R"},
|
|
+ {"OUTPUTS2", NULL, "AOUT3L"},
|
|
+ {"OUTPUTS2", NULL, "AOUT3R"},
|
|
+ {"OUTPUTS3", NULL, "AOUT4L"},
|
|
+ {"OUTPUTS3", NULL, "AOUT4R"},
|
|
+
|
|
+ /* Balanced inputs */
|
|
+ {"AIN1L", NULL, "INPUTS0"},
|
|
+ {"AIN1R", NULL, "INPUTS0"},
|
|
+ {"AIN2L", NULL, "INPUTS1"},
|
|
+ {"AIN2R", NULL, "INPUTS1"},
|
|
+ {"AIN3L", NULL, "INPUTS2"},
|
|
+ {"AIN3R", NULL, "INPUTS2"},
|
|
+};
|
|
+
|
|
+static struct snd_soc_card snd_soc_audioinjector_octo = {
|
|
+ .name = "audioinjector-octo-soundcard",
|
|
+ .dai_link = audioinjector_octo_dai,
|
|
+ .num_links = ARRAY_SIZE(audioinjector_octo_dai),
|
|
+
|
|
+ .dapm_widgets = audioinjector_octo_widgets,
|
|
+ .num_dapm_widgets = ARRAY_SIZE(audioinjector_octo_widgets),
|
|
+ .dapm_routes = audioinjector_octo_route,
|
|
+ .num_dapm_routes = ARRAY_SIZE(audioinjector_octo_route),
|
|
+};
|
|
+
|
|
+static int audioinjector_octo_probe(struct platform_device *pdev)
|
|
+{
|
|
+ struct snd_soc_card *card = &snd_soc_audioinjector_octo;
|
|
+ int ret;
|
|
+
|
|
+ card->dev = &pdev->dev;
|
|
+
|
|
+ if (pdev->dev.of_node) {
|
|
+ struct snd_soc_dai_link *dai = &audioinjector_octo_dai[0];
|
|
+ struct device_node *i2s_node =
|
|
+ of_parse_phandle(pdev->dev.of_node,
|
|
+ "i2s-controller", 0);
|
|
+ struct device_node *codec_node =
|
|
+ of_parse_phandle(pdev->dev.of_node,
|
|
+ "codec", 0);
|
|
+
|
|
+ mult_gpios = devm_gpiod_get_array_optional(&pdev->dev, "mult",
|
|
+ GPIOD_OUT_LOW);
|
|
+ if (IS_ERR(mult_gpios))
|
|
+ return PTR_ERR(mult_gpios);
|
|
+
|
|
+ codec_rst_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
|
|
+ GPIOD_OUT_LOW);
|
|
+ if (IS_ERR(codec_rst_gpio))
|
|
+ return PTR_ERR(codec_rst_gpio);
|
|
+
|
|
+ if (codec_rst_gpio)
|
|
+ gpiod_set_value(codec_rst_gpio, 1);
|
|
+ msleep(500);
|
|
+ if (codec_rst_gpio)
|
|
+ gpiod_set_value(codec_rst_gpio, 0);
|
|
+ msleep(500);
|
|
+ if (codec_rst_gpio)
|
|
+ gpiod_set_value(codec_rst_gpio, 1);
|
|
+ msleep(500);
|
|
+
|
|
+ if (i2s_node && codec_node) {
|
|
+ dai->cpu_dai_name = NULL;
|
|
+ dai->cpu_of_node = i2s_node;
|
|
+ dai->platform_name = NULL;
|
|
+ dai->platform_of_node = i2s_node;
|
|
+ dai->codec_name = NULL;
|
|
+ dai->codec_of_node = codec_node;
|
|
+ } else
|
|
+ if (!dai->cpu_of_node) {
|
|
+ dev_err(&pdev->dev,
|
|
+ "i2s-controller missing or invalid in DT\n");
|
|
+ return -EINVAL;
|
|
+ } else {
|
|
+ dev_err(&pdev->dev,
|
|
+ "Property 'codec' missing or invalid\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ret = snd_soc_register_card(card);
|
|
+ if (ret != 0)
|
|
+ dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int audioinjector_octo_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_octo_of_match[] = {
|
|
+ { .compatible = "ai,audioinjector-octo-soundcard", },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, audioinjector_octo_of_match);
|
|
+
|
|
+static struct platform_driver audioinjector_octo_driver = {
|
|
+ .driver = {
|
|
+ .name = "audioinjector-octo",
|
|
+ .owner = THIS_MODULE,
|
|
+ .of_match_table = audioinjector_octo_of_match,
|
|
+ },
|
|
+ .probe = audioinjector_octo_probe,
|
|
+ .remove = audioinjector_octo_remove,
|
|
+};
|
|
+
|
|
+module_platform_driver(audioinjector_octo_driver);
|
|
+MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>");
|
|
+MODULE_DESCRIPTION("AudioInjector.net octo Soundcard");
|
|
+MODULE_LICENSE("GPL v2");
|
|
+MODULE_ALIAS("platform:audioinjector-octo-soundcard");
|