diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/950-0190-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0190-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch | 251 |
1 files changed, 0 insertions, 251 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0190-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch b/target/linux/brcm2708/patches-4.9/950-0190-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch deleted file mode 100644 index eb6422a469..0000000000 --- a/target/linux/brcm2708/patches-4.9/950-0190-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch +++ /dev/null @@ -1,251 +0,0 @@ -From a20dbe4972ea3df27f24c5397102e1346462a4f4 Mon Sep 17 00:00:00 2001 -From: Miquel <miquelblauw@hotmail.com> -Date: Fri, 24 Feb 2017 20:51:06 +0100 -Subject: [PATCH] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT - -Signed-off-by: Miquel Blauw <info@dionaudio.nl> ---- - arch/arm/boot/dts/overlays/Makefile | 1 + - arch/arm/boot/dts/overlays/README | 19 +++++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - sound/soc/bcm/Kconfig | 7 ++ - sound/soc/bcm/Makefile | 2 + - sound/soc/bcm/dionaudio_loco-v2.c | 140 ++++++++++++++++++++++++++++++++++++ - 7 files changed, 171 insertions(+) - create mode 100644 sound/soc/bcm/dionaudio_loco-v2.c - ---- a/arch/arm/boot/dts/overlays/Makefile -+++ b/arch/arm/boot/dts/overlays/Makefile -@@ -13,6 +13,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ - bmp085_i2c-sensor.dtbo \ - dht11.dtbo \ - dionaudio-loco.dtbo \ -+ dionaudio-loco-v2.dtbo \ - dpi18.dtbo \ - dpi24.dtbo \ - dwc-otg.dtbo \ ---- a/arch/arm/boot/dts/overlays/README -+++ b/arch/arm/boot/dts/overlays/README -@@ -308,6 +308,25 @@ Load: dtoverlay=dionaudio-loco - Params: <None> - - -+Name: dionaudio-loco-v2 -+Info: Configures the Dion Audio LOCO-V2 DAC-AMP -+Load: dtoverlay=dionaudio-loco-v2,<param>=<val> -+Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec -+ Digital volume control. Enable with -+ "dtoverlay=hifiberry-dacplus,24db_digital_gain" -+ (The default behaviour is that the Digital -+ volume control is limited to a maximum of -+ 0dB. ie. it can attenuate but not provide -+ gain. For most users, this will be desired -+ as it will prevent clipping. By appending -+ the 24dB_digital_gain parameter, the Digital -+ volume control will allow up to 24dB of -+ gain. If this parameter is enabled, it is the -+ responsibility of the user to ensure that -+ the Digital volume control is set to a value -+ that does not result in clipping/distortion!) -+ -+ - Name: dpi18 - Info: Overlay for a generic 18-bit DPI display - This uses GPIOs 0-21 (so no I2C, uart etc.), and activates the output ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -889,6 +889,7 @@ CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m - CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m - CONFIG_SND_PISOUND=m - CONFIG_SND_SOC_ADAU1701=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -883,6 +883,7 @@ CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m - CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m - CONFIG_SND_PISOUND=m - CONFIG_SND_SOC_ADAU1701=m ---- a/sound/soc/bcm/Kconfig -+++ b/sound/soc/bcm/Kconfig -@@ -133,6 +133,13 @@ config SND_BCM2708_SOC_DIONAUDIO_LOCO - help - Say Y or M if you want to add support for Dion Audio LOCO. - -+config SND_BCM2708_SOC_DIONAUDIO_LOCO_V2 -+ tristate "Support for Dion Audio LOCO-V2 DAC-AMP" -+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S -+ select SND_SOC_PCM5122 -+ help -+ Say Y or M if you want to add support for Dion Audio LOCO-V2. -+ - config SND_BCM2708_SOC_ALLO_PIANO_DAC - tristate "Support for Allo Piano DAC" - depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S ---- a/sound/soc/bcm/Makefile -+++ b/sound/soc/bcm/Makefile -@@ -25,6 +25,7 @@ snd-soc-raspidac3-objs := raspidac3.o - snd-soc-audioinjector-pi-soundcard-objs := audioinjector-pi-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 - snd-soc-allo-piano-dac-objs := allo-piano-dac.o - snd-soc-pisound-objs := pisound.o - -@@ -44,5 +45,6 @@ obj-$(CONFIG_SND_BCM2708_SOC_RASPIDAC3) - obj-$(CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD) += snd-soc-audioinjector-pi-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 - obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o - obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o ---- /dev/null -+++ b/sound/soc/bcm/dionaudio_loco-v2.c -@@ -0,0 +1,140 @@ -+/* -+ * ASoC Driver for Dion Audio LOCO-V2 DAC-AMP -+ * -+ * Author: Miquel Blauw <info@dionaudio.nl> -+ * Copyright 2017 -+ * -+ * Based on the software of the RPi-DAC writen by Florian Meier -+ * -+ * 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/platform_device.h> -+ -+#include <sound/core.h> -+#include <sound/pcm.h> -+#include <sound/pcm_params.h> -+#include <sound/soc.h> -+#include <sound/jack.h> -+ -+static bool digital_gain_0db_limit = true; -+ -+static int snd_rpi_dionaudio_loco_v2_init(struct snd_soc_pcm_runtime *rtd) -+{ -+ if (digital_gain_0db_limit) { -+ int ret; -+ struct snd_soc_card *card = rtd->card; -+ -+ ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207); -+ if (ret < 0) -+ dev_warn(card->dev, "Failed to set volume limit: %d\n", ret); -+ } -+ -+ return 0; -+} -+ -+static int snd_rpi_dionaudio_loco_v2_hw_params( -+ struct snd_pcm_substream *substream, -+ struct snd_pcm_hw_params *params) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -+ -+ unsigned int sample_bits = -+ snd_pcm_format_physical_width(params_format(params)); -+ -+ return snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2); -+} -+ -+/* machine stream operations */ -+static struct snd_soc_ops snd_rpi_dionaudio_loco_v2_ops = { -+ .hw_params = snd_rpi_dionaudio_loco_v2_hw_params, -+}; -+ -+static struct snd_soc_dai_link snd_rpi_dionaudio_loco_v2_dai[] = { -+{ -+ .name = "DionAudio LOCO-V2", -+ .stream_name = "DionAudio LOCO-V2 DAC-AMP", -+ .cpu_dai_name = "bcm2708-i2s.0", -+ .codec_dai_name = "pcm512x-hifi", -+ .platform_name = "bcm2708-i2s.0", -+ .codec_name = "pcm512x.1-004d", -+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | -+ SND_SOC_DAIFMT_CBS_CFS, -+ .ops = &snd_rpi_dionaudio_loco_v2_ops, -+ .init = snd_rpi_dionaudio_loco_v2_init, -+},}; -+ -+/* audio machine driver */ -+static struct snd_soc_card snd_rpi_dionaudio_loco_v2 = { -+ .name = "Dion Audio LOCO-V2", -+ .dai_link = snd_rpi_dionaudio_loco_v2_dai, -+ .num_links = ARRAY_SIZE(snd_rpi_dionaudio_loco_v2_dai), -+}; -+ -+static int snd_rpi_dionaudio_loco_v2_probe(struct platform_device *pdev) -+{ -+ int ret = 0; -+ -+ snd_rpi_dionaudio_loco_v2.dev = &pdev->dev; -+ -+ if (pdev->dev.of_node) { -+ struct device_node *i2s_node; -+ struct snd_soc_dai_link *dai = -+ &snd_rpi_dionaudio_loco_v2_dai[0]; -+ -+ 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; -+ } -+ -+ digital_gain_0db_limit = !of_property_read_bool( -+ pdev->dev.of_node, "dionaudio,24db_digital_gain"); -+ } -+ -+ ret = snd_soc_register_card(&snd_rpi_dionaudio_loco_v2); -+ if (ret) -+ dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", -+ ret); -+ -+ return ret; -+} -+ -+static int snd_rpi_dionaudio_loco_v2_remove(struct platform_device *pdev) -+{ -+ return snd_soc_unregister_card(&snd_rpi_dionaudio_loco_v2); -+} -+ -+static const struct of_device_id dionaudio_of_match[] = { -+ { .compatible = "dionaudio,dionaudio-loco-v2", }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, dionaudio_of_match); -+ -+static struct platform_driver snd_rpi_dionaudio_loco_v2_driver = { -+ .driver = { -+ .name = "snd-rpi-dionaudio-loco-v2", -+ .owner = THIS_MODULE, -+ .of_match_table = dionaudio_of_match, -+ }, -+ .probe = snd_rpi_dionaudio_loco_v2_probe, -+ .remove = snd_rpi_dionaudio_loco_v2_remove, -+}; -+ -+module_platform_driver(snd_rpi_dionaudio_loco_v2_driver); -+ -+MODULE_AUTHOR("Miquel Blauw <info@dionaudio.nl>"); -+MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO-V2"); -+MODULE_LICENSE("GPL v2"); |