mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
319 lines
9.0 KiB
Diff
319 lines
9.0 KiB
Diff
From 525cdff530e74a8428a60859f9308bca825463fd Mon Sep 17 00:00:00 2001
|
|
From: sandeepal <alsandeep@cem-solutions.net>
|
|
Date: Fri, 2 Jun 2017 18:59:46 +0530
|
|
Subject: [PATCH 088/454] Allo Digione Driver (#2048)
|
|
|
|
Driver for the Allo Digione soundcard
|
|
|
|
allo-digione: 192kHz clicking sound fix
|
|
|
|
See: https://github.com/raspberrypi/linux/pull/2149
|
|
---
|
|
sound/soc/bcm/Kconfig | 7 +
|
|
sound/soc/bcm/Makefile | 2 +
|
|
sound/soc/bcm/allo-digione.c | 265 +++++++++++++++++++++++++++++++++++
|
|
3 files changed, 274 insertions(+)
|
|
create mode 100644 sound/soc/bcm/allo-digione.c
|
|
|
|
--- a/sound/soc/bcm/Kconfig
|
|
+++ b/sound/soc/bcm/Kconfig
|
|
@@ -176,6 +176,13 @@ config SND_BCM2708_SOC_ALLO_BOSS_DAC
|
|
help
|
|
Say Y or M if you want to add support for Allo Boss DAC.
|
|
|
|
+config SND_BCM2708_SOC_ALLO_DIGIONE
|
|
+ tristate "Support for Allo DigiOne"
|
|
+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
+ select SND_SOC_PCM512x_I2C
|
|
+ help
|
|
+ Say Y or M if you want to add support for Allo DigiOne.
|
|
+
|
|
config SND_BCM2708_SOC_FE_PI_AUDIO
|
|
tristate "Support for Fe-Pi-Audio"
|
|
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
|
|
--- a/sound/soc/bcm/Makefile
|
|
+++ b/sound/soc/bcm/Makefile
|
|
@@ -34,6 +34,7 @@ snd-soc-dionaudio-loco-v2-objs := dionau
|
|
snd-soc-allo-boss-dac-objs := allo-boss-dac.o
|
|
snd-soc-allo-piano-dac-objs := allo-piano-dac.o
|
|
snd-soc-allo-piano-dac-plus-objs := allo-piano-dac-plus.o
|
|
+snd-soc-allo-digione-objs := allo-digione.o
|
|
snd-soc-pisound-objs := pisound.o
|
|
snd-soc-fe-pi-audio-objs := fe-pi-audio.o
|
|
|
|
@@ -60,5 +61,6 @@ obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_L
|
|
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC) += snd-soc-allo-boss-dac.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS) += snd-soc-allo-piano-dac-plus.o
|
|
+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE) += snd-soc-allo-digione.o
|
|
obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
|
|
obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
|
|
--- /dev/null
|
|
+++ b/sound/soc/bcm/allo-digione.c
|
|
@@ -0,0 +1,265 @@
|
|
+/*
|
|
+ * ASoC Driver for Allo DigiOne
|
|
+ *
|
|
+ * Author: Baswaraj <jaikumar@cemsolutions.net>
|
|
+ * Copyright 2017
|
|
+ * 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 <linux/gpio/consumer.h>
|
|
+
|
|
+#include "../codecs/wm8804.h"
|
|
+
|
|
+static short int auto_shutdown_output;
|
|
+module_param(auto_shutdown_output, short,
|
|
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
|
|
+MODULE_PARM_DESC(auto_shutdown_output, "Shutdown SP/DIF output if playback is stopped");
|
|
+
|
|
+#define CLK_44EN_RATE 22579200UL
|
|
+#define CLK_48EN_RATE 24576000UL
|
|
+
|
|
+static struct gpio_desc *snd_allo_clk44gpio;
|
|
+static struct gpio_desc *snd_allo_clk48gpio;
|
|
+
|
|
+static int samplerate = 44100;
|
|
+
|
|
+static uint32_t snd_allo_digione_enable_clock(int sample_rate)
|
|
+{
|
|
+ switch (sample_rate) {
|
|
+ case 11025:
|
|
+ case 22050:
|
|
+ case 44100:
|
|
+ case 88200:
|
|
+ case 176400:
|
|
+ gpiod_set_value_cansleep(snd_allo_clk44gpio, 1);
|
|
+ gpiod_set_value_cansleep(snd_allo_clk48gpio, 0);
|
|
+ return CLK_44EN_RATE;
|
|
+ default:
|
|
+ gpiod_set_value_cansleep(snd_allo_clk48gpio, 1);
|
|
+ gpiod_set_value_cansleep(snd_allo_clk44gpio, 0);
|
|
+ return CLK_48EN_RATE;
|
|
+ }
|
|
+}
|
|
+
|
|
+
|
|
+static int snd_allo_digione_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_allo_digione_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_allo_digione_shutdown(struct snd_pcm_substream *substream)
|
|
+{
|
|
+ /* turn off output */
|
|
+ if (auto_shutdown_output) {
|
|
+ /* 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_allo_digione_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;
|
|
+
|
|
+ samplerate = params_rate(params);
|
|
+ mclk_freq = samplerate * 256;
|
|
+ mclk_div = WM8804_MCLKDIV_256FS;
|
|
+
|
|
+ sysclk = snd_allo_digione_enable_clock(samplerate);
|
|
+
|
|
+ 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_allo_digione_ops = {
|
|
+ .hw_params = snd_allo_digione_hw_params,
|
|
+ .startup = snd_allo_digione_startup,
|
|
+ .shutdown = snd_allo_digione_shutdown,
|
|
+};
|
|
+
|
|
+static struct snd_soc_dai_link snd_allo_digione_dai[] = {
|
|
+{
|
|
+ .name = "Allo DigiOne",
|
|
+ .stream_name = "Allo DigiOne 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_allo_digione_ops,
|
|
+ .init = snd_allo_digione_init,
|
|
+},
|
|
+};
|
|
+
|
|
+/* audio machine driver */
|
|
+static struct snd_soc_card snd_allo_digione = {
|
|
+ .name = "snd_allo_digione",
|
|
+ .driver_name = "AlloDigiOne",
|
|
+ .owner = THIS_MODULE,
|
|
+ .dai_link = snd_allo_digione_dai,
|
|
+ .num_links = ARRAY_SIZE(snd_allo_digione_dai),
|
|
+};
|
|
+
|
|
+static int snd_allo_digione_probe(struct platform_device *pdev)
|
|
+{
|
|
+ int ret = 0;
|
|
+
|
|
+ snd_allo_digione.dev = &pdev->dev;
|
|
+
|
|
+ if (pdev->dev.of_node) {
|
|
+ struct device_node *i2s_node;
|
|
+ struct snd_soc_dai_link *dai = &snd_allo_digione_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;
|
|
+ }
|
|
+
|
|
+ snd_allo_clk44gpio =
|
|
+ devm_gpiod_get(&pdev->dev, "clock44", GPIOD_OUT_LOW);
|
|
+ if (IS_ERR(snd_allo_clk44gpio))
|
|
+ dev_err(&pdev->dev, "devm_gpiod_get() failed\n");
|
|
+
|
|
+ snd_allo_clk48gpio =
|
|
+ devm_gpiod_get(&pdev->dev, "clock48", GPIOD_OUT_LOW);
|
|
+ if (IS_ERR(snd_allo_clk48gpio))
|
|
+ dev_err(&pdev->dev, "devm_gpiod_get() failed\n");
|
|
+ }
|
|
+
|
|
+ ret = snd_soc_register_card(&snd_allo_digione);
|
|
+ if (ret && ret != -EPROBE_DEFER)
|
|
+ dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
|
|
+ ret);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int snd_allo_digione_remove(struct platform_device *pdev)
|
|
+{
|
|
+ return snd_soc_unregister_card(&snd_allo_digione);
|
|
+}
|
|
+
|
|
+static const struct of_device_id snd_allo_digione_of_match[] = {
|
|
+ { .compatible = "allo,allo-digione", },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, snd_allo_digione_of_match);
|
|
+
|
|
+static struct platform_driver snd_allo_digione_driver = {
|
|
+ .driver = {
|
|
+ .name = "snd-allo-digione",
|
|
+ .owner = THIS_MODULE,
|
|
+ .of_match_table = snd_allo_digione_of_match,
|
|
+ },
|
|
+ .probe = snd_allo_digione_probe,
|
|
+ .remove = snd_allo_digione_remove,
|
|
+};
|
|
+
|
|
+module_platform_driver(snd_allo_digione_driver);
|
|
+
|
|
+MODULE_AUTHOR("Baswaraj <jaikumar@cem-solutions.net>");
|
|
+MODULE_DESCRIPTION("ASoC Driver for Allo DigiOne");
|
|
+MODULE_LICENSE("GPL v2");
|