mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
fce21ae4cc
Right now all brcm2708 patches are extracted from the non-mainline raspberrypi/linux git tree. Many of them are hacks and/or are unneeded in LEDE. Raspberry Pi is getting better and better mainline support so it would be nice to finally start maintaining patches in a cleaner way: 1) Backport patches accepted in upstream tree 2) Start using upstream drivers 3) Pick only these patches that are needed for more complete support Handling above tasks requires grouping patches - ideally using the same prefixes as generic ones. It means we should rename existing patches to use some high prefix. This will allow e.g. use 0xx for backported code. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Stijn Tintel <stijn@linux-ipv6.be>
447 lines
14 KiB
Diff
447 lines
14 KiB
Diff
From 4a8ebf575ea143c14fd815ecd1f5398b6a6aee67 Mon Sep 17 00:00:00 2001
|
|
From: Aaron Shaw <shawaj@gmail.com>
|
|
Date: Thu, 7 Apr 2016 21:26:21 +0100
|
|
Subject: [PATCH] Add Support for JustBoom Audio boards
|
|
|
|
justboom-dac: Adjust for ALSA API change
|
|
|
|
As of 4.4, snd_soc_limit_volume now takes a struct snd_soc_card *
|
|
rather than a struct snd_soc_codec *.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
sound/soc/bcm/Kconfig | 14 +++
|
|
sound/soc/bcm/Makefile | 4 +
|
|
sound/soc/bcm/justboom-dac.c | 162 +++++++++++++++++++++++++++++++
|
|
sound/soc/bcm/justboom-digi.c | 215 ++++++++++++++++++++++++++++++++++++++++++
|
|
4 files changed, 395 insertions(+)
|
|
create mode 100644 sound/soc/bcm/justboom-dac.c
|
|
create mode 100644 sound/soc/bcm/justboom-digi.c
|
|
|
|
--- a/sound/soc/bcm/Kconfig
|
|
+++ b/sound/soc/bcm/Kconfig
|
|
@@ -59,6 +59,20 @@ config SND_BCM2708_SOC_RPI_PROTO
|
|
help
|
|
Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731).
|
|
|
|
+config SND_BCM2708_SOC_JUSTBOOM_DAC
|
|
+ tristate "Support for JustBoom DAC"
|
|
+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
+ select SND_SOC_PCM512x
|
|
+ help
|
|
+ Say Y or M if you want to add support for JustBoom DAC.
|
|
+
|
|
+config SND_BCM2708_SOC_JUSTBOOM_DIGI
|
|
+ tristate "Support for JustBoom Digi"
|
|
+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
+ select SND_SOC_WM8804
|
|
+ help
|
|
+ Say Y or M if you want to add support for JustBoom Digi.
|
|
+
|
|
config SND_BCM2708_SOC_IQAUDIO_DAC
|
|
tristate "Support for IQaudIO-DAC"
|
|
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
--- a/sound/soc/bcm/Makefile
|
|
+++ b/sound/soc/bcm/Makefile
|
|
@@ -13,6 +13,8 @@ snd-soc-hifiberry-amp-objs := hifiberry_
|
|
snd-soc-hifiberry-dac-objs := hifiberry_dac.o
|
|
snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
|
|
snd-soc-hifiberry-digi-objs := hifiberry_digi.o
|
|
+snd-soc-justboom-dac-objs := justboom-dac.o
|
|
+snd-soc-justboom-digi-objs := justboom-digi.o
|
|
snd-soc-rpi-dac-objs := rpi-dac.o
|
|
snd-soc-rpi-proto-objs := rpi-proto.o
|
|
snd-soc-iqaudio-dac-objs := iqaudio-dac.o
|
|
@@ -22,6 +24,8 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_A
|
|
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
|
|
+obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o
|
|
+obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI) += snd-soc-justboom-digi.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
|
|
--- /dev/null
|
|
+++ b/sound/soc/bcm/justboom-dac.c
|
|
@@ -0,0 +1,162 @@
|
|
+/*
|
|
+ * ASoC Driver for JustBoom DAC Raspberry Pi HAT Sound Card
|
|
+ *
|
|
+ * Author: Milan Neskovic
|
|
+ * Copyright 2016
|
|
+ * based on code by Daniel Matuschek <info@crazy-audio.com>
|
|
+ * based on code by Florian Meier <florian.meier@koalo.de>
|
|
+ *
|
|
+ * 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>
|
|
+
|
|
+#include "../codecs/pcm512x.h"
|
|
+
|
|
+static bool digital_gain_0db_limit = true;
|
|
+
|
|
+static int snd_rpi_justboom_dac_init(struct snd_soc_pcm_runtime *rtd)
|
|
+{
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+ snd_soc_update_bits(codec, PCM512x_GPIO_EN, 0x08, 0x08);
|
|
+ snd_soc_update_bits(codec, PCM512x_GPIO_OUTPUT_4, 0xf, 0x02);
|
|
+ snd_soc_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08,0x08);
|
|
+
|
|
+ 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_justboom_dac_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;
|
|
+ /*return snd_soc_dai_set_bclk_ratio(cpu_dai, 64);*/
|
|
+ unsigned int sample_bits =
|
|
+ snd_pcm_format_physical_width(params_format(params));
|
|
+ return snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2);
|
|
+}
|
|
+
|
|
+static int snd_rpi_justboom_dac_startup(struct snd_pcm_substream *substream) {
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+ snd_soc_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08,0x08);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void snd_rpi_justboom_dac_shutdown(struct snd_pcm_substream *substream) {
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+ snd_soc_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08,0x00);
|
|
+}
|
|
+
|
|
+/* machine stream operations */
|
|
+static struct snd_soc_ops snd_rpi_justboom_dac_ops = {
|
|
+ .hw_params = snd_rpi_justboom_dac_hw_params,
|
|
+ .startup = snd_rpi_justboom_dac_startup,
|
|
+ .shutdown = snd_rpi_justboom_dac_shutdown,
|
|
+};
|
|
+
|
|
+static struct snd_soc_dai_link snd_rpi_justboom_dac_dai[] = {
|
|
+{
|
|
+ .name = "JustBoom DAC",
|
|
+ .stream_name = "JustBoom DAC HiFi",
|
|
+ .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_justboom_dac_ops,
|
|
+ .init = snd_rpi_justboom_dac_init,
|
|
+},
|
|
+};
|
|
+
|
|
+/* audio machine driver */
|
|
+static struct snd_soc_card snd_rpi_justboom_dac = {
|
|
+ .name = "snd_rpi_justboom_dac",
|
|
+ .owner = THIS_MODULE,
|
|
+ .dai_link = snd_rpi_justboom_dac_dai,
|
|
+ .num_links = ARRAY_SIZE(snd_rpi_justboom_dac_dai),
|
|
+};
|
|
+
|
|
+static int snd_rpi_justboom_dac_probe(struct platform_device *pdev)
|
|
+{
|
|
+ int ret = 0;
|
|
+
|
|
+ snd_rpi_justboom_dac.dev = &pdev->dev;
|
|
+
|
|
+ if (pdev->dev.of_node) {
|
|
+ struct device_node *i2s_node;
|
|
+ struct snd_soc_dai_link *dai = &snd_rpi_justboom_dac_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, "justboom,24db_digital_gain");
|
|
+ }
|
|
+
|
|
+ ret = snd_soc_register_card(&snd_rpi_justboom_dac);
|
|
+ if (ret)
|
|
+ dev_err(&pdev->dev,
|
|
+ "snd_soc_register_card() failed: %d\n", ret);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int snd_rpi_justboom_dac_remove(struct platform_device *pdev)
|
|
+{
|
|
+ return snd_soc_unregister_card(&snd_rpi_justboom_dac);
|
|
+}
|
|
+
|
|
+static const struct of_device_id snd_rpi_justboom_dac_of_match[] = {
|
|
+ { .compatible = "justboom,justboom-dac", },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, snd_rpi_justboom_dac_of_match);
|
|
+
|
|
+static struct platform_driver snd_rpi_justboom_dac_driver = {
|
|
+ .driver = {
|
|
+ .name = "snd-rpi-justboom-dac",
|
|
+ .owner = THIS_MODULE,
|
|
+ .of_match_table = snd_rpi_justboom_dac_of_match,
|
|
+ },
|
|
+ .probe = snd_rpi_justboom_dac_probe,
|
|
+ .remove = snd_rpi_justboom_dac_remove,
|
|
+};
|
|
+
|
|
+module_platform_driver(snd_rpi_justboom_dac_driver);
|
|
+
|
|
+MODULE_AUTHOR("Milan Neskovic <info@justboom.co>");
|
|
+MODULE_DESCRIPTION("ASoC Driver for JustBoom PI DAC HAT Sound Card");
|
|
+MODULE_LICENSE("GPL v2");
|
|
--- /dev/null
|
|
+++ b/sound/soc/bcm/justboom-digi.c
|
|
@@ -0,0 +1,215 @@
|
|
+/*
|
|
+ * ASoC Driver for JustBoom Raspberry Pi Digi HAT Sound Card
|
|
+ *
|
|
+ * Author: Milan Neskovic
|
|
+ * Copyright 2016
|
|
+ * based on code by Daniel Matuschek <info@crazy-audio.com>
|
|
+ * based on code by Florian Meier <florian.meier@koalo.de>
|
|
+ *
|
|
+ * 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>
|
|
+
|
|
+#include "../codecs/wm8804.h"
|
|
+
|
|
+static int snd_rpi_justboom_digi_init(struct snd_soc_pcm_runtime *rtd)
|
|
+{
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+
|
|
+ /* enable TX output */
|
|
+ snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, 0x0);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int snd_rpi_justboom_digi_startup(struct snd_pcm_substream *substream) {
|
|
+ /* turn on digital output */
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+ snd_soc_update_bits(codec, WM8804_PWRDN, 0x3c, 0x00);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void snd_rpi_justboom_digi_shutdown(struct snd_pcm_substream *substream) {
|
|
+ /* turn off output */
|
|
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+ snd_soc_update_bits(codec, WM8804_PWRDN, 0x3c, 0x3c);
|
|
+}
|
|
+
|
|
+static int snd_rpi_justboom_digi_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 *codec_dai = rtd->codec_dai;
|
|
+ struct snd_soc_codec *codec = rtd->codec;
|
|
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
|
+
|
|
+ int sysclk = 27000000; /* This is fixed on this board */
|
|
+
|
|
+ long mclk_freq=0;
|
|
+ int mclk_div=1;
|
|
+ int sampling_freq=1;
|
|
+
|
|
+ int ret;
|
|
+
|
|
+ int samplerate = params_rate(params);
|
|
+
|
|
+ if (samplerate<=96000) {
|
|
+ mclk_freq=samplerate*256;
|
|
+ mclk_div=WM8804_MCLKDIV_256FS;
|
|
+ } else {
|
|
+ mclk_freq=samplerate*128;
|
|
+ mclk_div=WM8804_MCLKDIV_128FS;
|
|
+ }
|
|
+
|
|
+ switch (samplerate) {
|
|
+ case 32000:
|
|
+ sampling_freq=0x03;
|
|
+ break;
|
|
+ case 44100:
|
|
+ sampling_freq=0x00;
|
|
+ break;
|
|
+ case 48000:
|
|
+ sampling_freq=0x02;
|
|
+ break;
|
|
+ case 88200:
|
|
+ sampling_freq=0x08;
|
|
+ break;
|
|
+ case 96000:
|
|
+ sampling_freq=0x0a;
|
|
+ break;
|
|
+ case 176400:
|
|
+ sampling_freq=0x0c;
|
|
+ break;
|
|
+ case 192000:
|
|
+ sampling_freq=0x0e;
|
|
+ break;
|
|
+ default:
|
|
+ dev_err(codec->dev,
|
|
+ "Failed to set WM8804 SYSCLK, unsupported samplerate %d\n",
|
|
+ samplerate);
|
|
+ }
|
|
+
|
|
+ snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div);
|
|
+ snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq);
|
|
+
|
|
+ ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL,
|
|
+ sysclk, SND_SOC_CLOCK_OUT);
|
|
+ if (ret < 0) {
|
|
+ dev_err(codec->dev,
|
|
+ "Failed to set WM8804 SYSCLK: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ /* Enable TX output */
|
|
+ snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, 0x0);
|
|
+
|
|
+ /* Power on */
|
|
+ snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0);
|
|
+
|
|
+ /* set sampling frequency status bits */
|
|
+ snd_soc_update_bits(codec, WM8804_SPDTX4, 0x0f, sampling_freq);
|
|
+
|
|
+ return snd_soc_dai_set_bclk_ratio(cpu_dai,64);
|
|
+}
|
|
+
|
|
+/* machine stream operations */
|
|
+static struct snd_soc_ops snd_rpi_justboom_digi_ops = {
|
|
+ .hw_params = snd_rpi_justboom_digi_hw_params,
|
|
+ .startup = snd_rpi_justboom_digi_startup,
|
|
+ .shutdown = snd_rpi_justboom_digi_shutdown,
|
|
+};
|
|
+
|
|
+static struct snd_soc_dai_link snd_rpi_justboom_digi_dai[] = {
|
|
+{
|
|
+ .name = "JustBoom Digi",
|
|
+ .stream_name = "JustBoom Digi HiFi",
|
|
+ .cpu_dai_name = "bcm2708-i2s.0",
|
|
+ .codec_dai_name = "wm8804-spdif",
|
|
+ .platform_name = "bcm2708-i2s.0",
|
|
+ .codec_name = "wm8804.1-003b",
|
|
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
+ SND_SOC_DAIFMT_CBM_CFM,
|
|
+ .ops = &snd_rpi_justboom_digi_ops,
|
|
+ .init = snd_rpi_justboom_digi_init,
|
|
+},
|
|
+};
|
|
+
|
|
+/* audio machine driver */
|
|
+static struct snd_soc_card snd_rpi_justboom_digi = {
|
|
+ .name = "snd_rpi_justboom_digi",
|
|
+ .owner = THIS_MODULE,
|
|
+ .dai_link = snd_rpi_justboom_digi_dai,
|
|
+ .num_links = ARRAY_SIZE(snd_rpi_justboom_digi_dai),
|
|
+};
|
|
+
|
|
+static int snd_rpi_justboom_digi_probe(struct platform_device *pdev)
|
|
+{
|
|
+ int ret = 0;
|
|
+
|
|
+ snd_rpi_justboom_digi.dev = &pdev->dev;
|
|
+
|
|
+ if (pdev->dev.of_node) {
|
|
+ struct device_node *i2s_node;
|
|
+ struct snd_soc_dai_link *dai = &snd_rpi_justboom_digi_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;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ret = snd_soc_register_card(&snd_rpi_justboom_digi);
|
|
+ if (ret)
|
|
+ dev_err(&pdev->dev,
|
|
+ "snd_soc_register_card() failed: %d\n", ret);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int snd_rpi_justboom_digi_remove(struct platform_device *pdev)
|
|
+{
|
|
+ return snd_soc_unregister_card(&snd_rpi_justboom_digi);
|
|
+}
|
|
+
|
|
+static const struct of_device_id snd_rpi_justboom_digi_of_match[] = {
|
|
+ { .compatible = "justboom,justboom-digi", },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, snd_rpi_justboom_digi_of_match);
|
|
+
|
|
+static struct platform_driver snd_rpi_justboom_digi_driver = {
|
|
+ .driver = {
|
|
+ .name = "snd-rpi-justboom-digi",
|
|
+ .owner = THIS_MODULE,
|
|
+ .of_match_table = snd_rpi_justboom_digi_of_match,
|
|
+ },
|
|
+ .probe = snd_rpi_justboom_digi_probe,
|
|
+ .remove = snd_rpi_justboom_digi_remove,
|
|
+};
|
|
+
|
|
+module_platform_driver(snd_rpi_justboom_digi_driver);
|
|
+
|
|
+MODULE_AUTHOR("Milan Neskovic <info@justboom.co>");
|
|
+MODULE_DESCRIPTION("ASoC Driver for JustBoom PI Digi HAT Sound Card");
|
|
+MODULE_LICENSE("GPL v2");
|