Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allo Digione Driver #2048

Merged
merged 4 commits into from
Jun 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
ads7846.dtbo \
akkordion-iqdacplus.dtbo \
allo-boss-dac-pcm512x-audio.dtbo \
allo-digione.dtbo \
allo-piano-dac-pcm512x-audio.dtbo \
allo-piano-dac-plus-pcm512x-audio.dtbo \
at86rf233.dtbo \
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/overlays/README
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,12 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec
slave"


Name: allo-digione
Info: Configures the Allo Digione audio card
Load: dtoverlay=allo-digione
Params: <None>


Name: allo-piano-dac-pcm512x-audio
Info: Configures the Allo Piano DAC (2.0/2.1) audio cards.
(NB. This initial support is for 2.0 channel audio ONLY! ie. stereo.
Expand Down
44 changes: 44 additions & 0 deletions arch/arm/boot/dts/overlays/allo-digione-overlay.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Definitions for Allo DigiOne
/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>;
PVDD-supply = <&vdd_3v3_reg>;
DVDD-supply = <&vdd_3v3_reg>;
status = "okay";
wlf,reset-gpio = <&gpio 17 0>;
};
};
};

fragment@2 {
target = <&sound>;
__overlay__ {
compatible = "allo,allo-digione";
i2s-controller = <&i2s>;
status = "okay";
clock44-gpio = <&gpio 5 0>;
clock48-gpio = <&gpio 6 0>;
};
};
};
1 change: 1 addition & 0 deletions arch/arm/configs/bcm2709_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,7 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
CONFIG_SND_PISOUND=m
CONFIG_SND_SOC_ADAU1701=m
CONFIG_SND_SOC_ADAU7002=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/bcmrpi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
CONFIG_SND_PISOUND=m
CONFIG_SND_SOC_ADAU1701=m
CONFIG_SND_SOC_ADAU7002=m
Expand Down
6 changes: 6 additions & 0 deletions sound/soc/bcm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,12 @@ 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_PISOUND
tristate "Support for Blokas Labs pisound"
Expand Down
2 changes: 2 additions & 0 deletions sound/soc/bcm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ snd-soc-dionaudio-loco-v2-objs := dionaudio_loco-v2.o
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

Expand All @@ -60,5 +61,6 @@ obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o
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
268 changes: 268 additions & 0 deletions sound/soc/bcm/allo-digione.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
/*
* 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 = 0;
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);

if (samplerate <= 96000) {
mclk_freq = samplerate * 256;
mclk_div = WM8804_MCLKDIV_256FS;
} else {
mclk_freq = samplerate * 128;
mclk_div = WM8804_MCLKDIV_128FS;
}

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");