123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399 |
- From 6fac57fc7d9e04a6f5083897b2f424cb3505dbf7 Mon Sep 17 00:00:00 2001
- From: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
- Date: Thu, 30 Jun 2016 18:38:42 +0100
- Subject: [PATCH] Add IQAudIO Digi WM8804 board support
- Support IQAudIO Digi board with iqaudio_digi machine driver and
- iqaudio-digi-wm8804-audio overlay.
- NB. Machine driver is a cut and paste of hifiberry_digi code, with format
- and general cleanup to comply with kernel coding standards.
- Signed-off-by: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
- ---
- arch/arm/boot/dts/overlays/Makefile | 1 +
- arch/arm/boot/dts/overlays/README | 9 +
- .../overlays/iqaudio-digi-wm8804-audio-overlay.dts | 47 ++++
- 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/iqaudio_digi.c | 239 +++++++++++++++++++++
- 8 files changed, 307 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
- create mode 100644 sound/soc/bcm/iqaudio_digi.c
- --- a/arch/arm/boot/dts/overlays/Makefile
- +++ b/arch/arm/boot/dts/overlays/Makefile
- @@ -42,6 +42,7 @@ dtbo-$(RPI_DT_OVERLAYS) += i2s-gpio28-31
- dtbo-$(RPI_DT_OVERLAYS) += i2s-mmap.dtbo
- dtbo-$(RPI_DT_OVERLAYS) += iqaudio-dac.dtbo
- dtbo-$(RPI_DT_OVERLAYS) += iqaudio-dacplus.dtbo
- +dtbo-$(RPI_DT_OVERLAYS) += iqaudio-digi-wm8804-audio.dtbo
- dtbo-$(RPI_DT_OVERLAYS) += justboom-dac.dtbo
- dtbo-$(RPI_DT_OVERLAYS) += justboom-digi.dtbo
- dtbo-$(RPI_DT_OVERLAYS) += lirc-rpi.dtbo
- --- a/arch/arm/boot/dts/overlays/README
- +++ b/arch/arm/boot/dts/overlays/README
- @@ -546,6 +546,15 @@ Params: 24db_digital_gain Allow ga
- the DAC driver module loads.
-
-
- +Name: iqaudio-digi-wm8804-audio
- +Info: Configures the IQAudIO Digi WM8804 audio card
- +Load: dtoverlay=iqaudio-digi-wm8804-audio,<param>=<val>
- +Params: card_name Override the default, "IQAudIODigi", card name.
- + dai_name Override the default, "IQAudIO Digi", dai name.
- + dai_stream_name Override the default, "IQAudIO Digi HiFi",
- + dai stream name.
- +
- +
- Name: justboom-dac
- Info: Configures the JustBoom DAC HAT, Amp HAT, DAC Zero and Amp Zero audio
- cards
- --- /dev/null
- +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
- @@ -0,0 +1,47 @@
- +// Definitions for IQAudIO Digi WM8804 audio board
- +/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";
- +
- + wm8804@3b {
- + #sound-dai-cells = <0>;
- + compatible = "wlf,wm8804";
- + reg = <0x3b>;
- + status = "okay";
- + // DVDD-supply = <®_3v3>;
- + // PVDD-supply = <®_3v3>;
- + };
- + };
- + };
- +
- + fragment@2 {
- + target = <&sound>;
- + wm8804_digi: __overlay__ {
- + compatible = "iqaudio,wm8804-digi";
- + i2s-controller = <&i2s>;
- + status = "okay";
- + };
- + };
- +
- + __overrides__ {
- + card_name = <&wm8804_digi>,"wm8804-digi,card-name";
- + dai_name = <&wm8804_digi>,"wm8804-digi,dai-name";
- + dai_stream_name = <&wm8804_digi>,"wm8804-digi,dai-stream-name";
- + };
- +};
- --- a/arch/arm/configs/bcm2709_defconfig
- +++ b/arch/arm/configs/bcm2709_defconfig
- @@ -865,6 +865,7 @@ CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
- CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
- CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
- CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
- +CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
- CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
- CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
- CONFIG_SND_DIGIDAC1_SOUNDCARD=m
- --- a/arch/arm/configs/bcmrpi_defconfig
- +++ b/arch/arm/configs/bcmrpi_defconfig
- @@ -857,6 +857,7 @@ CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
- CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
- CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
- CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
- +CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
- CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
- CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
- CONFIG_SND_DIGIDAC1_SOUNDCARD=m
- --- a/sound/soc/bcm/Kconfig
- +++ b/sound/soc/bcm/Kconfig
- @@ -71,6 +71,13 @@ config SND_BCM2708_SOC_IQAUDIO_DAC
- help
- Say Y or M if you want to add support for IQaudIO-DAC.
-
- +config SND_BCM2708_SOC_IQAUDIO_DIGI
- + tristate "Support for IQAudIO 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 IQAudIO Digital IO board.
- +
- config SND_BCM2708_SOC_RASPIDAC3
- tristate "Support for RaspiDAC Rev.3x"
- depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- --- a/sound/soc/bcm/Makefile
- +++ b/sound/soc/bcm/Makefile
- @@ -14,6 +14,7 @@ snd-soc-justboom-digi-objs := justboom-d
- snd-soc-rpi-dac-objs := rpi-dac.o
- snd-soc-rpi-proto-objs := rpi-proto.o
- snd-soc-iqaudio-dac-objs := iqaudio-dac.o
- +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-digidac1-soundcard-objs := digidac1-soundcard.o
- @@ -28,6 +29,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DI
- 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
- +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_DIGIDAC1_SOUNDCARD) += snd-soc-digidac1-soundcard.o
- --- /dev/null
- +++ b/sound/soc/bcm/iqaudio_digi.c
- @@ -0,0 +1,239 @@
- +/*
- + * ASoC Driver for IQAudIO WM8804 Digi
- + *
- + * Author: Daniel Matuschek <info@crazy-audio.com>
- + * based on the HifiBerry DAC driver by Florian Meier <florian.meier@koalo.de>
- + * Copyright 2013
- + *
- + * 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 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");
- +
- +static int snd_rpi_iqaudio_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_iqaudio_digi_startup(struct snd_pcm_substream *substream)
- +{
- + struct snd_soc_pcm_runtime *rtd = substream->private_data;
- + struct snd_soc_codec *codec = rtd->codec;
- +
- + /* turn on digital output */
- + snd_soc_update_bits(codec, WM8804_PWRDN, 0x3c, 0x00);
- +
- + return 0;
- +}
- +
- +static void snd_rpi_iqaudio_digi_shutdown(struct snd_pcm_substream *substream)
- +{
- + if (auto_shutdown_output) {
- + struct snd_soc_pcm_runtime *rtd = substream->private_data;
- + struct snd_soc_codec *codec = rtd->codec;
- +
- + /* turn off digital output */
- + snd_soc_update_bits(codec, WM8804_PWRDN, 0x3c, 0x3c);
- + }
- +}
- +
- +
- +static int snd_rpi_iqaudio_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_iqaudio_digi_ops = {
- + .hw_params = snd_rpi_iqaudio_digi_hw_params,
- + .startup = snd_rpi_iqaudio_digi_startup,
- + .shutdown = snd_rpi_iqaudio_digi_shutdown,
- +};
- +
- +static struct snd_soc_dai_link snd_rpi_iqaudio_digi_dai[] = {
- +{
- + .name = "IQAudIO Digi",
- + .stream_name = "IQAudIO 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_iqaudio_digi_ops,
- + .init = snd_rpi_iqaudio_digi_init,
- +},
- +};
- +
- +/* audio machine driver */
- +static struct snd_soc_card snd_rpi_iqaudio_digi = {
- + .name = "IQAudIODigi",
- + .owner = THIS_MODULE,
- + .dai_link = snd_rpi_iqaudio_digi_dai,
- + .num_links = ARRAY_SIZE(snd_rpi_iqaudio_digi_dai),
- +};
- +
- +static int snd_rpi_iqaudio_digi_probe(struct platform_device *pdev)
- +{
- + struct snd_soc_card *card = &snd_rpi_iqaudio_digi;
- + char *prefix = "wm8804-digi,";
- + char prop[128];
- + struct device_node *np;
- + int ret = 0;
- +
- + snd_rpi_iqaudio_digi.dev = &pdev->dev;
- +
- + np = pdev->dev.of_node;
- + if (np) {
- + struct snd_soc_dai_link *dai = &snd_rpi_iqaudio_digi_dai[0];
- + struct device_node *i2s_node;
- +
- + i2s_node = of_parse_phandle(np, "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;
- + }
- +
- + snprintf(prop, sizeof(prop), "%scard-name", prefix);
- + of_property_read_string(np, prop, &card->name);
- +
- + snprintf(prop, sizeof(prop), "%sdai-name", prefix);
- + of_property_read_string(np, prop, &dai->name);
- +
- + snprintf(prop, sizeof(prop), "%sdai-stream-name", prefix);
- + of_property_read_string(np, prop, &dai->stream_name);
- + }
- +
- + ret = snd_soc_register_card(card);
- + if (ret)
- + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
- + ret);
- +
- + return ret;
- +}
- +
- +static int snd_rpi_iqaudio_digi_remove(struct platform_device *pdev)
- +{
- + return snd_soc_unregister_card(&snd_rpi_iqaudio_digi);
- +}
- +
- +static const struct of_device_id snd_rpi_iqaudio_digi_of_match[] = {
- + { .compatible = "iqaudio,wm8804-digi", },
- + {},
- +};
- +MODULE_DEVICE_TABLE(of, snd_rpi_iqaudio_digi_of_match);
- +
- +static struct platform_driver snd_rpi_iqaudio_digi_driver = {
- + .driver = {
- + .name = "IQAudIODigi",
- + .owner = THIS_MODULE,
- + .of_match_table = snd_rpi_iqaudio_digi_of_match,
- + },
- + .probe = snd_rpi_iqaudio_digi_probe,
- + .remove = snd_rpi_iqaudio_digi_remove,
- +};
- +
- +module_platform_driver(snd_rpi_iqaudio_digi_driver);
- +
- +MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>");
- +MODULE_DESCRIPTION("ASoC Driver for IQAudIO WM8804 Digi");
- +MODULE_LICENSE("GPL v2");
|