* [PATCH v2 0/2] ASoC: add support for TAS5805M digital amplifier
@ 2022-01-13 8:38 ` Daniel Beer
0 siblings, 0 replies; 13+ messages in thread
From: Daniel Beer @ 2022-01-13 8:38 UTC (permalink / raw)
To: alsa-devel, devicetree
Cc: linux-kernel, Andy Liu, Daniel Beer, Derek Simkowiak, Mark Brown,
Rob Herring, Liam Girdwood
This pair of patches implements support for the TAS5805M class D audio
amplifier. This driver, and the example configuration in the device-tree
file, were originally based on a 4.19 series kernel and have been
modified slightly from the tested version.
This resubmission differs from the first as follows:
- Some explanatory comments and constants have been introduced
- The volume control allows L/R to be set independently
- gpiod is used, and regmap is used directly
- .trigger is used instead of DAPM to coordinate DSP boot
- The component is manually registered after power-on, and explicitly
deregistered prior to power-off
- Corrections have been made to the bindings file
Daniel Beer (2):
ASoC: add support for TAS5805M digital amplifier
ASoC: dt-bindings: add bindings for TI TAS5805M.
.../devicetree/bindings/sound/tas5805m.yaml | 204 +++++++
sound/soc/codecs/Kconfig | 9 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/tas5805m.c | 554 ++++++++++++++++++
4 files changed, 769 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml
create mode 100644 sound/soc/codecs/tas5805m.c
--
2.30.2
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v2 0/2] ASoC: add support for TAS5805M digital amplifier @ 2022-01-13 8:38 ` Daniel Beer 0 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-13 8:38 UTC (permalink / raw) To: alsa-devel, devicetree Cc: Daniel Beer, linux-kernel, Rob Herring, Liam Girdwood, Andy Liu, Mark Brown, Derek Simkowiak This pair of patches implements support for the TAS5805M class D audio amplifier. This driver, and the example configuration in the device-tree file, were originally based on a 4.19 series kernel and have been modified slightly from the tested version. This resubmission differs from the first as follows: - Some explanatory comments and constants have been introduced - The volume control allows L/R to be set independently - gpiod is used, and regmap is used directly - .trigger is used instead of DAPM to coordinate DSP boot - The component is manually registered after power-on, and explicitly deregistered prior to power-off - Corrections have been made to the bindings file Daniel Beer (2): ASoC: add support for TAS5805M digital amplifier ASoC: dt-bindings: add bindings for TI TAS5805M. .../devicetree/bindings/sound/tas5805m.yaml | 204 +++++++ sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas5805m.c | 554 ++++++++++++++++++ 4 files changed, 769 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml create mode 100644 sound/soc/codecs/tas5805m.c -- 2.30.2 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 1/2] ASoC: add support for TAS5805M digital amplifier 2022-01-13 8:38 ` Daniel Beer @ 2022-01-10 23:53 ` Daniel Beer -1 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-10 23:53 UTC (permalink / raw) To: alsa-devel, devicetree Cc: linux-kernel, Andy Liu, Daniel Beer, Derek Simkowiak, Mark Brown, Rob Herring, Liam Girdwood The Texas Instruments TAS5805M is a class D audio amplifier with an integrated DSP. DSP configuration is expected to be supplied via a device-tree attribute containing a sequence of register writes. These register writes set up application-specific DSP settings and are expected to be generated using TI's PPC3 tool. Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> --- sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas5805m.c | 554 ++++++++++++++++++++++++++++++++++++ 3 files changed, 565 insertions(+) create mode 100644 sound/soc/codecs/tas5805m.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d3e5ae8310ef..d6b8f5cb6ef8 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1485,6 +1485,15 @@ config SND_SOC_TAS5720 Enable support for Texas Instruments TAS5720L/M high-efficiency mono Class-D audio power amplifiers. +config SND_SOC_TAS5805M + tristate "Texas Instruments TAS5805M speaker amplifier" + depends on I2C + help + Enable support for Texas Instruments TAS5805M Class-D + amplifiers. This is a speaker amplifier with an integrated + DSP. DSP configuration for each instance needs to be supplied + via a device-tree attribute. + config SND_SOC_TAS6424 tristate "Texas Instruments TAS6424 Quad-Channel Audio amplifier" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index ac7f20972470..b4e11c3e4a08 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -236,6 +236,7 @@ snd-soc-sti-sas-objs := sti-sas.o snd-soc-tas5086-objs := tas5086.o snd-soc-tas571x-objs := tas571x.o snd-soc-tas5720-objs := tas5720.o +snd-soc-tas5805m-objs := tas5805m.o snd-soc-tas6424-objs := tas6424.o snd-soc-tda7419-objs := tda7419.o snd-soc-tas2770-objs := tas2770.o @@ -574,6 +575,7 @@ obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o +obj-$(CONFIG_SND_SOC_TAS5805M) += snd-soc-tas5805m.o obj-$(CONFIG_SND_SOC_TAS6424) += snd-soc-tas6424.o obj-$(CONFIG_SND_SOC_TDA7419) += snd-soc-tda7419.o obj-$(CONFIG_SND_SOC_TAS2770) += snd-soc-tas2770.o diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c new file mode 100644 index 000000000000..300d28bb053d --- /dev/null +++ b/sound/soc/codecs/tas5805m.c @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Driver for the TAS5805M Audio Amplifier +// +// Author: Andy Liu <andy-liu@ti.com> +// Author: Daniel Beer <daniel.beer@igorinstitute.com> +// +// This is based on a driver originally written by Andy Liu at TI and +// posted here: +// +// https://e2e.ti.com/support/audio-group/audio/f/audio-forum/722027/linux-tas5825m-linux-drivers +// +// It has been simplified a little and reworked for the 5.x ALSA SoC API. + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/of.h> +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/regmap.h> +#include <linux/gpio/consumer.h> +#include <linux/regulator/consumer.h> +#include <linux/atomic.h> +#include <linux/workqueue.h> + +#include <sound/soc.h> +#include <sound/pcm.h> +#include <sound/initval.h> + +/* Datasheet-defined registers on page 0, book 0 */ +#define REG_PAGE 0x00 +#define REG_DEVICE_CTRL_1 0x02 +#define REG_DEVICE_CTRL_2 0x03 +#define REG_SIG_CH_CTRL 0x28 +#define REG_SAP_CTRL_1 0x33 +#define REG_FS_MON 0x37 +#define REG_BCK_MON 0x38 +#define REG_CLKDET_STATUS 0x39 +#define REG_VOL_CTL 0x4c +#define REG_AGAIN 0x54 +#define REG_ADR_PIN_CTRL 0x60 +#define REG_ADR_PIN_CONFIG 0x61 +#define REG_CHAN_FAULT 0x70 +#define REG_GLOBAL_FAULT1 0x71 +#define REG_GLOBAL_FAULT2 0x72 +#define REG_FAULT 0x78 +#define REG_BOOK 0x7f + +/* DEVICE_CTRL_2 register values */ +#define DCTRL2_MODE_DEEP_SLEEP 0x00 +#define DCTRL2_MODE_SLEEP 0x01 +#define DCTRL2_MODE_HIZ 0x02 +#define DCTRL2_MODE_PLAY 0x03 + +#define DCTRL2_MUTE 0x08 +#define DCTRL2_DIS_DSP 0x10 + +/* This sequence of register writes must always be sent, prior to the + * 5ms delay while we wait for the DSP to boot. + */ +static const uint8_t dsp_cfg_preboot[] = { + 0x00, 0x00, 0x7f, 0x00, 0x03, 0x02, 0x01, 0x11, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7f, 0x00, 0x03, 0x02, +}; + +static const uint32_t tas5805m_volume[] = { + 0x0000001B, /* 0, -110dB */ 0x0000001E, /* 1, -109dB */ + 0x00000021, /* 2, -108dB */ 0x00000025, /* 3, -107dB */ + 0x0000002A, /* 4, -106dB */ 0x0000002F, /* 5, -105dB */ + 0x00000035, /* 6, -104dB */ 0x0000003B, /* 7, -103dB */ + 0x00000043, /* 8, -102dB */ 0x0000004B, /* 9, -101dB */ + 0x00000054, /* 10, -100dB */ 0x0000005E, /* 11, -99dB */ + 0x0000006A, /* 12, -98dB */ 0x00000076, /* 13, -97dB */ + 0x00000085, /* 14, -96dB */ 0x00000095, /* 15, -95dB */ + 0x000000A7, /* 16, -94dB */ 0x000000BC, /* 17, -93dB */ + 0x000000D3, /* 18, -92dB */ 0x000000EC, /* 19, -91dB */ + 0x00000109, /* 20, -90dB */ 0x0000012A, /* 21, -89dB */ + 0x0000014E, /* 22, -88dB */ 0x00000177, /* 23, -87dB */ + 0x000001A4, /* 24, -86dB */ 0x000001D8, /* 25, -85dB */ + 0x00000211, /* 26, -84dB */ 0x00000252, /* 27, -83dB */ + 0x0000029A, /* 28, -82dB */ 0x000002EC, /* 29, -81dB */ + 0x00000347, /* 30, -80dB */ 0x000003AD, /* 31, -79dB */ + 0x00000420, /* 32, -78dB */ 0x000004A1, /* 33, -77dB */ + 0x00000532, /* 34, -76dB */ 0x000005D4, /* 35, -75dB */ + 0x0000068A, /* 36, -74dB */ 0x00000756, /* 37, -73dB */ + 0x0000083B, /* 38, -72dB */ 0x0000093C, /* 39, -71dB */ + 0x00000A5D, /* 40, -70dB */ 0x00000BA0, /* 41, -69dB */ + 0x00000D0C, /* 42, -68dB */ 0x00000EA3, /* 43, -67dB */ + 0x0000106C, /* 44, -66dB */ 0x0000126D, /* 45, -65dB */ + 0x000014AD, /* 46, -64dB */ 0x00001733, /* 47, -63dB */ + 0x00001A07, /* 48, -62dB */ 0x00001D34, /* 49, -61dB */ + 0x000020C5, /* 50, -60dB */ 0x000024C4, /* 51, -59dB */ + 0x00002941, /* 52, -58dB */ 0x00002E49, /* 53, -57dB */ + 0x000033EF, /* 54, -56dB */ 0x00003A45, /* 55, -55dB */ + 0x00004161, /* 56, -54dB */ 0x0000495C, /* 57, -53dB */ + 0x0000524F, /* 58, -52dB */ 0x00005C5A, /* 59, -51dB */ + 0x0000679F, /* 60, -50dB */ 0x00007444, /* 61, -49dB */ + 0x00008274, /* 62, -48dB */ 0x0000925F, /* 63, -47dB */ + 0x0000A43B, /* 64, -46dB */ 0x0000B845, /* 65, -45dB */ + 0x0000CEC1, /* 66, -44dB */ 0x0000E7FB, /* 67, -43dB */ + 0x00010449, /* 68, -42dB */ 0x0001240C, /* 69, -41dB */ + 0x000147AE, /* 70, -40dB */ 0x00016FAA, /* 71, -39dB */ + 0x00019C86, /* 72, -38dB */ 0x0001CEDC, /* 73, -37dB */ + 0x00020756, /* 74, -36dB */ 0x000246B5, /* 75, -35dB */ + 0x00028DCF, /* 76, -34dB */ 0x0002DD96, /* 77, -33dB */ + 0x00033718, /* 78, -32dB */ 0x00039B87, /* 79, -31dB */ + 0x00040C37, /* 80, -30dB */ 0x00048AA7, /* 81, -29dB */ + 0x00051884, /* 82, -28dB */ 0x0005B7B1, /* 83, -27dB */ + 0x00066A4A, /* 84, -26dB */ 0x000732AE, /* 85, -25dB */ + 0x00081385, /* 86, -24dB */ 0x00090FCC, /* 87, -23dB */ + 0x000A2ADB, /* 88, -22dB */ 0x000B6873, /* 89, -21dB */ + 0x000CCCCD, /* 90, -20dB */ 0x000E5CA1, /* 91, -19dB */ + 0x00101D3F, /* 92, -18dB */ 0x0012149A, /* 93, -17dB */ + 0x00144961, /* 94, -16dB */ 0x0016C311, /* 95, -15dB */ + 0x00198A13, /* 96, -14dB */ 0x001CA7D7, /* 97, -13dB */ + 0x002026F3, /* 98, -12dB */ 0x00241347, /* 99, -11dB */ + 0x00287A27, /* 100, -10dB */ 0x002D6A86, /* 101, -9dB */ + 0x0032F52D, /* 102, -8dB */ 0x00392CEE, /* 103, -7dB */ + 0x004026E7, /* 104, -6dB */ 0x0047FACD, /* 105, -5dB */ + 0x0050C336, /* 106, -4dB */ 0x005A9DF8, /* 107, -3dB */ + 0x0065AC8C, /* 108, -2dB */ 0x00721483, /* 109, -1dB */ + 0x00800000, /* 110, 0dB */ 0x008F9E4D, /* 111, 1dB */ + 0x00A12478, /* 112, 2dB */ 0x00B4CE08, /* 113, 3dB */ + 0x00CADDC8, /* 114, 4dB */ 0x00E39EA9, /* 115, 5dB */ + 0x00FF64C1, /* 116, 6dB */ 0x011E8E6A, /* 117, 7dB */ + 0x0141857F, /* 118, 8dB */ 0x0168C0C6, /* 119, 9dB */ + 0x0194C584, /* 120, 10dB */ 0x01C62940, /* 121, 11dB */ + 0x01FD93C2, /* 122, 12dB */ 0x023BC148, /* 123, 13dB */ + 0x02818508, /* 124, 14dB */ 0x02CFCC01, /* 125, 15dB */ + 0x0327A01A, /* 126, 16dB */ 0x038A2BAD, /* 127, 17dB */ + 0x03F8BD7A, /* 128, 18dB */ 0x0474CD1B, /* 129, 19dB */ + 0x05000000, /* 130, 20dB */ 0x059C2F02, /* 131, 21dB */ + 0x064B6CAE, /* 132, 22dB */ 0x07100C4D, /* 133, 23dB */ + 0x07ECA9CD, /* 134, 24dB */ 0x08E43299, /* 135, 25dB */ + 0x09F9EF8E, /* 136, 26dB */ 0x0B319025, /* 137, 27dB */ + 0x0C8F36F2, /* 138, 28dB */ 0x0E1787B8, /* 139, 29dB */ + 0x0FCFB725, /* 140, 30dB */ 0x11BD9C84, /* 141, 31dB */ + 0x13E7C594, /* 142, 32dB */ 0x16558CCB, /* 143, 33dB */ + 0x190F3254, /* 144, 34dB */ 0x1C1DF80E, /* 145, 35dB */ + 0x1F8C4107, /* 146, 36dB */ 0x2365B4BF, /* 147, 37dB */ + 0x27B766C2, /* 148, 38dB */ 0x2C900313, /* 149, 39dB */ + 0x32000000, /* 150, 40dB */ 0x3819D612, /* 151, 41dB */ + 0x3EF23ECA, /* 152, 42dB */ 0x46A07B07, /* 153, 43dB */ + 0x4F3EA203, /* 154, 44dB */ 0x58E9F9F9, /* 155, 45dB */ + 0x63C35B8E, /* 156, 46dB */ 0x6FEFA16D, /* 157, 47dB */ + 0x7D982575, /* 158, 48dB */ +}; + +#define TAS5805M_VOLUME_MAX ((int)ARRAY_SIZE(tas5805m_volume) - 1) +#define TAS5805M_VOLUME_MIN 0 + +struct tas5805m_priv { + struct regulator *pvdd; + struct gpio_desc *gpio_pdn_n; + + uint8_t *dsp_cfg_data; + int dsp_cfg_len; + + struct regmap *regmap; + struct mutex lock; + + int vol[2]; + bool is_powered; + bool is_muted; +}; + +static void set_dsp_scale(struct regmap *rm, int offset, int vol) +{ + uint8_t v[4]; + uint32_t x = tas5805m_volume[vol]; + int i; + + for (i = 0; i < 4; i++) { + v[3 - i] = x; + x >>= 8; + } + + regmap_bulk_write(rm, offset, v, ARRAY_SIZE(v)); +} + +static void tas5805m_refresh_unlocked(struct snd_soc_component *component) +{ + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + struct regmap *rm = tas5805m->regmap; + + dev_dbg(component->dev, "refresh: is_muted=%d, vol=%d/%d\n", + tas5805m->is_muted, tas5805m->vol[0], tas5805m->vol[1]); + + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x8c); + regmap_write(rm, REG_PAGE, 0x2a); + + /* Refresh volume. The actual volume control documented in the + * datasheet doesn't seem to work correctly. This is a pair of + * DSP registers which are *not* documented in the datasheet. + */ + set_dsp_scale(rm, 0x24, tas5805m->vol[0]); + set_dsp_scale(rm, 0x28, tas5805m->vol[1]); + + /* Set/clear digital soft-mute */ + regmap_write(rm, REG_DEVICE_CTRL_2, + (tas5805m->is_muted ? DCTRL2_MUTE : 0) | + DCTRL2_MODE_PLAY); +} + +static int tas5805m_vol_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 2; + + uinfo->value.integer.min = TAS5805M_VOLUME_MIN; + uinfo->value.integer.max = TAS5805M_VOLUME_MAX; + return 0; +} + +static int tas5805m_vol_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + + mutex_lock(&tas5805m->lock); + ucontrol->value.integer.value[0] = tas5805m->vol[0]; + ucontrol->value.integer.value[1] = tas5805m->vol[1]; + mutex_unlock(&tas5805m->lock); + + return 0; +} + +static inline int volume_is_valid(int v) +{ + return (v >= TAS5805M_VOLUME_MIN) && (v <= TAS5805M_VOLUME_MAX); +} + +static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + + if (!(volume_is_valid(ucontrol->value.integer.value[0]) && + volume_is_valid(ucontrol->value.integer.value[1]))) + return -EINVAL; + + mutex_lock(&tas5805m->lock); + tas5805m->vol[0] = ucontrol->value.integer.value[0]; + tas5805m->vol[1] = ucontrol->value.integer.value[1]; + dev_dbg(component->dev, "set vol=%d/%d (is_powered=%d)\n", + tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); + if (tas5805m->is_powered) + tas5805m_refresh_unlocked(component); + mutex_unlock(&tas5805m->lock); + + return 0; +} + +static const struct snd_kcontrol_new tas5805m_snd_controls[] = { + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Master Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | + SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = tas5805m_vol_info, + .get = tas5805m_vol_get, + .put = tas5805m_vol_put, + }, +}; + +static void send_cfg(struct regmap *rm, + const uint8_t *s, unsigned int len) +{ + unsigned int i; + + for (i = 0; i + 1 < len; i += 2) + regmap_write(rm, s[i], s[i + 1]); +} + +/* The TAS5805M DSP can't be configured until the I2S clock has been + * present and stable for 5ms, or else it won't boot and we get no + * sound. + */ +static int tas5805m_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + struct regmap *rm = tas5805m->regmap; + unsigned int chan, global1, global2; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + dev_dbg(component->dev, "DSP startup\n"); + + /* We mustn't issue any I2C transactions until the I2S + * clock is stable. Furthermore, we must allow a 5ms + * delay after the first set of register writes to + * allow the DSP to boot before configuring it. + */ + mutex_lock(&tas5805m->lock); + usleep_range(5000, 10000); + send_cfg(rm, dsp_cfg_preboot, + ARRAY_SIZE(dsp_cfg_preboot)); + usleep_range(5000, 15000); + send_cfg(rm, tas5805m->dsp_cfg_data, + tas5805m->dsp_cfg_len); + + tas5805m->is_powered = true; + tas5805m_refresh_unlocked(component); + mutex_unlock(&tas5805m->lock); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + dev_dbg(component->dev, "DSP shutdown\n"); + + mutex_lock(&tas5805m->lock); + tas5805m->is_powered = false; + + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x00); + + regmap_read(rm, REG_CHAN_FAULT, &chan); + regmap_read(rm, REG_GLOBAL_FAULT1, &global1); + regmap_read(rm, REG_GLOBAL_FAULT2, &global2); + + dev_dbg(component->dev, + "fault regs: CHAN=%02x, GLOBAL1=%02x, GLOBAL2=%02x\n", + chan, global1, global2); + + regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); + mutex_unlock(&tas5805m->lock); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static const struct snd_soc_dapm_route tas5805m_audio_map[] = { + { "DAC", NULL, "DAC IN" }, + { "OUT", NULL, "DAC" }, +}; + +static const struct snd_soc_dapm_widget tas5805m_dapm_widgets[] = { + SND_SOC_DAPM_AIF_IN("DAC IN", "Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_OUTPUT("OUT") +}; + +static const struct snd_soc_component_driver soc_codec_dev_tas5805m = { + .controls = tas5805m_snd_controls, + .num_controls = ARRAY_SIZE(tas5805m_snd_controls), + .dapm_widgets = tas5805m_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tas5805m_dapm_widgets), + .dapm_routes = tas5805m_audio_map, + .num_dapm_routes = ARRAY_SIZE(tas5805m_audio_map), + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; + +static int tas5805m_mute(struct snd_soc_dai *dai, int mute, int direction) +{ + struct snd_soc_component *component = dai->component; + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + + mutex_lock(&tas5805m->lock); + dev_dbg(component->dev, "set mute=%d (is_powered=%d)\n", + mute, tas5805m->is_powered); + tas5805m->is_muted = !!mute; + if (tas5805m->is_powered) + tas5805m_refresh_unlocked(component); + mutex_unlock(&tas5805m->lock); + + return 0; +} + +static const struct snd_soc_dai_ops tas5805m_dai_ops = { + .trigger = tas5805m_trigger, + .mute_stream = tas5805m_mute, + .no_capture_mute = 1, +}; + +static struct snd_soc_dai_driver tas5805m_dai = { + .name = "tas5805m-amplifier", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + }, + .ops = &tas5805m_dai_ops, +}; + +static const struct regmap_config tas5805m_regmap = { + .reg_bits = 8, + .val_bits = 8, + + /* We have quite a lot of multi-level bank switching and a + * relatively small number of register writes between bank + * switches. + */ + .cache_type = REGCACHE_NONE, +}; + +static int tas5805m_i2c_probe(struct i2c_client *i2c) +{ + struct device *dev = &i2c->dev; + struct regmap *regmap; + struct tas5805m_priv *tas5805m; + int ret; + + regmap = devm_regmap_init_i2c(i2c, &tas5805m_regmap); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + dev_err(dev, "unable to allocate register map: %d\n", ret); + return ret; + } + + tas5805m = devm_kzalloc(dev, sizeof(struct tas5805m_priv), GFP_KERNEL); + if (!tas5805m) + return -ENOMEM; + + tas5805m->pvdd = devm_regulator_get(dev, "pvdd"); + if (IS_ERR(tas5805m->pvdd)) { + dev_err(dev, "failed to get pvdd supply: %ld\n", + PTR_ERR(tas5805m->pvdd)); + return PTR_ERR(tas5805m->pvdd); + } + + dev_set_drvdata(dev, tas5805m); + tas5805m->regmap = regmap; + tas5805m->gpio_pdn_n = devm_gpiod_get(dev, "pdn", GPIOD_OUT_LOW); + if (IS_ERR(tas5805m->gpio_pdn_n)) { + dev_err(dev, "error requesting PDN gpio: %ld\n", + PTR_ERR(tas5805m->gpio_pdn_n)); + return PTR_ERR(tas5805m->gpio_pdn_n); + } + + tas5805m->dsp_cfg_len = of_property_count_elems_of_size(dev->of_node, + "ti,dsp-config", 1); + if (tas5805m->dsp_cfg_len < 0) { + dev_err(dev, "no DSP config provided\n"); + return tas5805m->dsp_cfg_len; + } + + tas5805m->dsp_cfg_data = devm_kmalloc(dev, tas5805m->dsp_cfg_len, + GFP_KERNEL); + if (!tas5805m->dsp_cfg_data) + return -ENOMEM; + + of_property_read_u8_array(dev->of_node, "ti,dsp-config", + tas5805m->dsp_cfg_data, tas5805m->dsp_cfg_len); + dev_dbg(dev, "%d bytes of DSP config loaded\n", + tas5805m->dsp_cfg_len); + + /* Do the first part of the power-on here, while we can expect + * the I2S interface to be quiet. We must raise PDN# and then + * wait 5ms before any I2S clock is sent, or else the internal + * regulator apparently won't come on. + * + * Also, we must keep the device in power down for 100ms or so + * after PVDD is applied, or else the ADR pin is sampled + * incorrectly and the device comes up with an unpredictable I2C + * address. + */ + tas5805m->vol[0] = TAS5805M_VOLUME_MIN; + tas5805m->vol[1] = TAS5805M_VOLUME_MIN; + mutex_init(&tas5805m->lock); + + ret = regulator_enable(tas5805m->pvdd); + if (ret < 0) { + dev_err(dev, "failed to enable pvdd: %d\n", ret); + return ret; + } + + usleep_range(100000, 150000); + gpiod_set_value(tas5805m->gpio_pdn_n, 1); + usleep_range(10000, 15000); + + /* Don't register through devm. We need to be able to unregister + * the component prior to deasserting PDN# + */ + ret = snd_soc_register_component(dev, &soc_codec_dev_tas5805m, + &tas5805m_dai, 1); + if (ret < 0) { + dev_err(dev, "unable to register codec: %d\n", ret); + gpiod_set_value(tas5805m->gpio_pdn_n, 0); + regulator_disable(tas5805m->pvdd); + return ret; + } + + return 0; +} + +static int tas5805m_i2c_remove(struct i2c_client *i2c) +{ + struct device *dev = &i2c->dev; + struct tas5805m_priv *tas5805m = dev_get_drvdata(dev); + + snd_soc_unregister_component(dev); + gpiod_set_value(tas5805m->gpio_pdn_n, 0); + usleep_range(10000, 15000); + regulator_disable(tas5805m->pvdd); + return 0; +} + +static const struct i2c_device_id tas5805m_i2c_id[] = { + { "tas5805m", }, + { } +}; +MODULE_DEVICE_TABLE(i2c, tas5805m_i2c_id); + +#if IS_ENABLED(CONFIG_OF) +static const struct of_device_id tas5805m_of_match[] = { + { .compatible = "ti,tas5805m", }, + { } +}; +MODULE_DEVICE_TABLE(of, tas5805m_of_match); +#endif + +static struct i2c_driver tas5805m_i2c_driver = { + .probe_new = tas5805m_i2c_probe, + .remove = tas5805m_i2c_remove, + .id_table = tas5805m_i2c_id, + .driver = { + .name = "tas5805m", + .of_match_table = of_match_ptr(tas5805m_of_match), + }, +}; + +module_i2c_driver(tas5805m_i2c_driver); + +MODULE_AUTHOR("Andy Liu <andy-liu@ti.com>"); +MODULE_AUTHOR("Daniel Beer <daniel.beer@igorinstitute.com>"); +MODULE_DESCRIPTION("TAS5805M Audio Amplifier Driver"); +MODULE_LICENSE("GPL v2"); -- 2.30.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 1/2] ASoC: add support for TAS5805M digital amplifier @ 2022-01-10 23:53 ` Daniel Beer 0 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-10 23:53 UTC (permalink / raw) To: alsa-devel, devicetree Cc: Daniel Beer, linux-kernel, Rob Herring, Liam Girdwood, Andy Liu, Mark Brown, Derek Simkowiak The Texas Instruments TAS5805M is a class D audio amplifier with an integrated DSP. DSP configuration is expected to be supplied via a device-tree attribute containing a sequence of register writes. These register writes set up application-specific DSP settings and are expected to be generated using TI's PPC3 tool. Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> --- sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas5805m.c | 554 ++++++++++++++++++++++++++++++++++++ 3 files changed, 565 insertions(+) create mode 100644 sound/soc/codecs/tas5805m.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d3e5ae8310ef..d6b8f5cb6ef8 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1485,6 +1485,15 @@ config SND_SOC_TAS5720 Enable support for Texas Instruments TAS5720L/M high-efficiency mono Class-D audio power amplifiers. +config SND_SOC_TAS5805M + tristate "Texas Instruments TAS5805M speaker amplifier" + depends on I2C + help + Enable support for Texas Instruments TAS5805M Class-D + amplifiers. This is a speaker amplifier with an integrated + DSP. DSP configuration for each instance needs to be supplied + via a device-tree attribute. + config SND_SOC_TAS6424 tristate "Texas Instruments TAS6424 Quad-Channel Audio amplifier" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index ac7f20972470..b4e11c3e4a08 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -236,6 +236,7 @@ snd-soc-sti-sas-objs := sti-sas.o snd-soc-tas5086-objs := tas5086.o snd-soc-tas571x-objs := tas571x.o snd-soc-tas5720-objs := tas5720.o +snd-soc-tas5805m-objs := tas5805m.o snd-soc-tas6424-objs := tas6424.o snd-soc-tda7419-objs := tda7419.o snd-soc-tas2770-objs := tas2770.o @@ -574,6 +575,7 @@ obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o +obj-$(CONFIG_SND_SOC_TAS5805M) += snd-soc-tas5805m.o obj-$(CONFIG_SND_SOC_TAS6424) += snd-soc-tas6424.o obj-$(CONFIG_SND_SOC_TDA7419) += snd-soc-tda7419.o obj-$(CONFIG_SND_SOC_TAS2770) += snd-soc-tas2770.o diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c new file mode 100644 index 000000000000..300d28bb053d --- /dev/null +++ b/sound/soc/codecs/tas5805m.c @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Driver for the TAS5805M Audio Amplifier +// +// Author: Andy Liu <andy-liu@ti.com> +// Author: Daniel Beer <daniel.beer@igorinstitute.com> +// +// This is based on a driver originally written by Andy Liu at TI and +// posted here: +// +// https://e2e.ti.com/support/audio-group/audio/f/audio-forum/722027/linux-tas5825m-linux-drivers +// +// It has been simplified a little and reworked for the 5.x ALSA SoC API. + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/of.h> +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/regmap.h> +#include <linux/gpio/consumer.h> +#include <linux/regulator/consumer.h> +#include <linux/atomic.h> +#include <linux/workqueue.h> + +#include <sound/soc.h> +#include <sound/pcm.h> +#include <sound/initval.h> + +/* Datasheet-defined registers on page 0, book 0 */ +#define REG_PAGE 0x00 +#define REG_DEVICE_CTRL_1 0x02 +#define REG_DEVICE_CTRL_2 0x03 +#define REG_SIG_CH_CTRL 0x28 +#define REG_SAP_CTRL_1 0x33 +#define REG_FS_MON 0x37 +#define REG_BCK_MON 0x38 +#define REG_CLKDET_STATUS 0x39 +#define REG_VOL_CTL 0x4c +#define REG_AGAIN 0x54 +#define REG_ADR_PIN_CTRL 0x60 +#define REG_ADR_PIN_CONFIG 0x61 +#define REG_CHAN_FAULT 0x70 +#define REG_GLOBAL_FAULT1 0x71 +#define REG_GLOBAL_FAULT2 0x72 +#define REG_FAULT 0x78 +#define REG_BOOK 0x7f + +/* DEVICE_CTRL_2 register values */ +#define DCTRL2_MODE_DEEP_SLEEP 0x00 +#define DCTRL2_MODE_SLEEP 0x01 +#define DCTRL2_MODE_HIZ 0x02 +#define DCTRL2_MODE_PLAY 0x03 + +#define DCTRL2_MUTE 0x08 +#define DCTRL2_DIS_DSP 0x10 + +/* This sequence of register writes must always be sent, prior to the + * 5ms delay while we wait for the DSP to boot. + */ +static const uint8_t dsp_cfg_preboot[] = { + 0x00, 0x00, 0x7f, 0x00, 0x03, 0x02, 0x01, 0x11, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7f, 0x00, 0x03, 0x02, +}; + +static const uint32_t tas5805m_volume[] = { + 0x0000001B, /* 0, -110dB */ 0x0000001E, /* 1, -109dB */ + 0x00000021, /* 2, -108dB */ 0x00000025, /* 3, -107dB */ + 0x0000002A, /* 4, -106dB */ 0x0000002F, /* 5, -105dB */ + 0x00000035, /* 6, -104dB */ 0x0000003B, /* 7, -103dB */ + 0x00000043, /* 8, -102dB */ 0x0000004B, /* 9, -101dB */ + 0x00000054, /* 10, -100dB */ 0x0000005E, /* 11, -99dB */ + 0x0000006A, /* 12, -98dB */ 0x00000076, /* 13, -97dB */ + 0x00000085, /* 14, -96dB */ 0x00000095, /* 15, -95dB */ + 0x000000A7, /* 16, -94dB */ 0x000000BC, /* 17, -93dB */ + 0x000000D3, /* 18, -92dB */ 0x000000EC, /* 19, -91dB */ + 0x00000109, /* 20, -90dB */ 0x0000012A, /* 21, -89dB */ + 0x0000014E, /* 22, -88dB */ 0x00000177, /* 23, -87dB */ + 0x000001A4, /* 24, -86dB */ 0x000001D8, /* 25, -85dB */ + 0x00000211, /* 26, -84dB */ 0x00000252, /* 27, -83dB */ + 0x0000029A, /* 28, -82dB */ 0x000002EC, /* 29, -81dB */ + 0x00000347, /* 30, -80dB */ 0x000003AD, /* 31, -79dB */ + 0x00000420, /* 32, -78dB */ 0x000004A1, /* 33, -77dB */ + 0x00000532, /* 34, -76dB */ 0x000005D4, /* 35, -75dB */ + 0x0000068A, /* 36, -74dB */ 0x00000756, /* 37, -73dB */ + 0x0000083B, /* 38, -72dB */ 0x0000093C, /* 39, -71dB */ + 0x00000A5D, /* 40, -70dB */ 0x00000BA0, /* 41, -69dB */ + 0x00000D0C, /* 42, -68dB */ 0x00000EA3, /* 43, -67dB */ + 0x0000106C, /* 44, -66dB */ 0x0000126D, /* 45, -65dB */ + 0x000014AD, /* 46, -64dB */ 0x00001733, /* 47, -63dB */ + 0x00001A07, /* 48, -62dB */ 0x00001D34, /* 49, -61dB */ + 0x000020C5, /* 50, -60dB */ 0x000024C4, /* 51, -59dB */ + 0x00002941, /* 52, -58dB */ 0x00002E49, /* 53, -57dB */ + 0x000033EF, /* 54, -56dB */ 0x00003A45, /* 55, -55dB */ + 0x00004161, /* 56, -54dB */ 0x0000495C, /* 57, -53dB */ + 0x0000524F, /* 58, -52dB */ 0x00005C5A, /* 59, -51dB */ + 0x0000679F, /* 60, -50dB */ 0x00007444, /* 61, -49dB */ + 0x00008274, /* 62, -48dB */ 0x0000925F, /* 63, -47dB */ + 0x0000A43B, /* 64, -46dB */ 0x0000B845, /* 65, -45dB */ + 0x0000CEC1, /* 66, -44dB */ 0x0000E7FB, /* 67, -43dB */ + 0x00010449, /* 68, -42dB */ 0x0001240C, /* 69, -41dB */ + 0x000147AE, /* 70, -40dB */ 0x00016FAA, /* 71, -39dB */ + 0x00019C86, /* 72, -38dB */ 0x0001CEDC, /* 73, -37dB */ + 0x00020756, /* 74, -36dB */ 0x000246B5, /* 75, -35dB */ + 0x00028DCF, /* 76, -34dB */ 0x0002DD96, /* 77, -33dB */ + 0x00033718, /* 78, -32dB */ 0x00039B87, /* 79, -31dB */ + 0x00040C37, /* 80, -30dB */ 0x00048AA7, /* 81, -29dB */ + 0x00051884, /* 82, -28dB */ 0x0005B7B1, /* 83, -27dB */ + 0x00066A4A, /* 84, -26dB */ 0x000732AE, /* 85, -25dB */ + 0x00081385, /* 86, -24dB */ 0x00090FCC, /* 87, -23dB */ + 0x000A2ADB, /* 88, -22dB */ 0x000B6873, /* 89, -21dB */ + 0x000CCCCD, /* 90, -20dB */ 0x000E5CA1, /* 91, -19dB */ + 0x00101D3F, /* 92, -18dB */ 0x0012149A, /* 93, -17dB */ + 0x00144961, /* 94, -16dB */ 0x0016C311, /* 95, -15dB */ + 0x00198A13, /* 96, -14dB */ 0x001CA7D7, /* 97, -13dB */ + 0x002026F3, /* 98, -12dB */ 0x00241347, /* 99, -11dB */ + 0x00287A27, /* 100, -10dB */ 0x002D6A86, /* 101, -9dB */ + 0x0032F52D, /* 102, -8dB */ 0x00392CEE, /* 103, -7dB */ + 0x004026E7, /* 104, -6dB */ 0x0047FACD, /* 105, -5dB */ + 0x0050C336, /* 106, -4dB */ 0x005A9DF8, /* 107, -3dB */ + 0x0065AC8C, /* 108, -2dB */ 0x00721483, /* 109, -1dB */ + 0x00800000, /* 110, 0dB */ 0x008F9E4D, /* 111, 1dB */ + 0x00A12478, /* 112, 2dB */ 0x00B4CE08, /* 113, 3dB */ + 0x00CADDC8, /* 114, 4dB */ 0x00E39EA9, /* 115, 5dB */ + 0x00FF64C1, /* 116, 6dB */ 0x011E8E6A, /* 117, 7dB */ + 0x0141857F, /* 118, 8dB */ 0x0168C0C6, /* 119, 9dB */ + 0x0194C584, /* 120, 10dB */ 0x01C62940, /* 121, 11dB */ + 0x01FD93C2, /* 122, 12dB */ 0x023BC148, /* 123, 13dB */ + 0x02818508, /* 124, 14dB */ 0x02CFCC01, /* 125, 15dB */ + 0x0327A01A, /* 126, 16dB */ 0x038A2BAD, /* 127, 17dB */ + 0x03F8BD7A, /* 128, 18dB */ 0x0474CD1B, /* 129, 19dB */ + 0x05000000, /* 130, 20dB */ 0x059C2F02, /* 131, 21dB */ + 0x064B6CAE, /* 132, 22dB */ 0x07100C4D, /* 133, 23dB */ + 0x07ECA9CD, /* 134, 24dB */ 0x08E43299, /* 135, 25dB */ + 0x09F9EF8E, /* 136, 26dB */ 0x0B319025, /* 137, 27dB */ + 0x0C8F36F2, /* 138, 28dB */ 0x0E1787B8, /* 139, 29dB */ + 0x0FCFB725, /* 140, 30dB */ 0x11BD9C84, /* 141, 31dB */ + 0x13E7C594, /* 142, 32dB */ 0x16558CCB, /* 143, 33dB */ + 0x190F3254, /* 144, 34dB */ 0x1C1DF80E, /* 145, 35dB */ + 0x1F8C4107, /* 146, 36dB */ 0x2365B4BF, /* 147, 37dB */ + 0x27B766C2, /* 148, 38dB */ 0x2C900313, /* 149, 39dB */ + 0x32000000, /* 150, 40dB */ 0x3819D612, /* 151, 41dB */ + 0x3EF23ECA, /* 152, 42dB */ 0x46A07B07, /* 153, 43dB */ + 0x4F3EA203, /* 154, 44dB */ 0x58E9F9F9, /* 155, 45dB */ + 0x63C35B8E, /* 156, 46dB */ 0x6FEFA16D, /* 157, 47dB */ + 0x7D982575, /* 158, 48dB */ +}; + +#define TAS5805M_VOLUME_MAX ((int)ARRAY_SIZE(tas5805m_volume) - 1) +#define TAS5805M_VOLUME_MIN 0 + +struct tas5805m_priv { + struct regulator *pvdd; + struct gpio_desc *gpio_pdn_n; + + uint8_t *dsp_cfg_data; + int dsp_cfg_len; + + struct regmap *regmap; + struct mutex lock; + + int vol[2]; + bool is_powered; + bool is_muted; +}; + +static void set_dsp_scale(struct regmap *rm, int offset, int vol) +{ + uint8_t v[4]; + uint32_t x = tas5805m_volume[vol]; + int i; + + for (i = 0; i < 4; i++) { + v[3 - i] = x; + x >>= 8; + } + + regmap_bulk_write(rm, offset, v, ARRAY_SIZE(v)); +} + +static void tas5805m_refresh_unlocked(struct snd_soc_component *component) +{ + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + struct regmap *rm = tas5805m->regmap; + + dev_dbg(component->dev, "refresh: is_muted=%d, vol=%d/%d\n", + tas5805m->is_muted, tas5805m->vol[0], tas5805m->vol[1]); + + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x8c); + regmap_write(rm, REG_PAGE, 0x2a); + + /* Refresh volume. The actual volume control documented in the + * datasheet doesn't seem to work correctly. This is a pair of + * DSP registers which are *not* documented in the datasheet. + */ + set_dsp_scale(rm, 0x24, tas5805m->vol[0]); + set_dsp_scale(rm, 0x28, tas5805m->vol[1]); + + /* Set/clear digital soft-mute */ + regmap_write(rm, REG_DEVICE_CTRL_2, + (tas5805m->is_muted ? DCTRL2_MUTE : 0) | + DCTRL2_MODE_PLAY); +} + +static int tas5805m_vol_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 2; + + uinfo->value.integer.min = TAS5805M_VOLUME_MIN; + uinfo->value.integer.max = TAS5805M_VOLUME_MAX; + return 0; +} + +static int tas5805m_vol_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + + mutex_lock(&tas5805m->lock); + ucontrol->value.integer.value[0] = tas5805m->vol[0]; + ucontrol->value.integer.value[1] = tas5805m->vol[1]; + mutex_unlock(&tas5805m->lock); + + return 0; +} + +static inline int volume_is_valid(int v) +{ + return (v >= TAS5805M_VOLUME_MIN) && (v <= TAS5805M_VOLUME_MAX); +} + +static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + + if (!(volume_is_valid(ucontrol->value.integer.value[0]) && + volume_is_valid(ucontrol->value.integer.value[1]))) + return -EINVAL; + + mutex_lock(&tas5805m->lock); + tas5805m->vol[0] = ucontrol->value.integer.value[0]; + tas5805m->vol[1] = ucontrol->value.integer.value[1]; + dev_dbg(component->dev, "set vol=%d/%d (is_powered=%d)\n", + tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); + if (tas5805m->is_powered) + tas5805m_refresh_unlocked(component); + mutex_unlock(&tas5805m->lock); + + return 0; +} + +static const struct snd_kcontrol_new tas5805m_snd_controls[] = { + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Master Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | + SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = tas5805m_vol_info, + .get = tas5805m_vol_get, + .put = tas5805m_vol_put, + }, +}; + +static void send_cfg(struct regmap *rm, + const uint8_t *s, unsigned int len) +{ + unsigned int i; + + for (i = 0; i + 1 < len; i += 2) + regmap_write(rm, s[i], s[i + 1]); +} + +/* The TAS5805M DSP can't be configured until the I2S clock has been + * present and stable for 5ms, or else it won't boot and we get no + * sound. + */ +static int tas5805m_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + struct regmap *rm = tas5805m->regmap; + unsigned int chan, global1, global2; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + dev_dbg(component->dev, "DSP startup\n"); + + /* We mustn't issue any I2C transactions until the I2S + * clock is stable. Furthermore, we must allow a 5ms + * delay after the first set of register writes to + * allow the DSP to boot before configuring it. + */ + mutex_lock(&tas5805m->lock); + usleep_range(5000, 10000); + send_cfg(rm, dsp_cfg_preboot, + ARRAY_SIZE(dsp_cfg_preboot)); + usleep_range(5000, 15000); + send_cfg(rm, tas5805m->dsp_cfg_data, + tas5805m->dsp_cfg_len); + + tas5805m->is_powered = true; + tas5805m_refresh_unlocked(component); + mutex_unlock(&tas5805m->lock); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + dev_dbg(component->dev, "DSP shutdown\n"); + + mutex_lock(&tas5805m->lock); + tas5805m->is_powered = false; + + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x00); + + regmap_read(rm, REG_CHAN_FAULT, &chan); + regmap_read(rm, REG_GLOBAL_FAULT1, &global1); + regmap_read(rm, REG_GLOBAL_FAULT2, &global2); + + dev_dbg(component->dev, + "fault regs: CHAN=%02x, GLOBAL1=%02x, GLOBAL2=%02x\n", + chan, global1, global2); + + regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); + mutex_unlock(&tas5805m->lock); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static const struct snd_soc_dapm_route tas5805m_audio_map[] = { + { "DAC", NULL, "DAC IN" }, + { "OUT", NULL, "DAC" }, +}; + +static const struct snd_soc_dapm_widget tas5805m_dapm_widgets[] = { + SND_SOC_DAPM_AIF_IN("DAC IN", "Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_OUTPUT("OUT") +}; + +static const struct snd_soc_component_driver soc_codec_dev_tas5805m = { + .controls = tas5805m_snd_controls, + .num_controls = ARRAY_SIZE(tas5805m_snd_controls), + .dapm_widgets = tas5805m_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tas5805m_dapm_widgets), + .dapm_routes = tas5805m_audio_map, + .num_dapm_routes = ARRAY_SIZE(tas5805m_audio_map), + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; + +static int tas5805m_mute(struct snd_soc_dai *dai, int mute, int direction) +{ + struct snd_soc_component *component = dai->component; + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + + mutex_lock(&tas5805m->lock); + dev_dbg(component->dev, "set mute=%d (is_powered=%d)\n", + mute, tas5805m->is_powered); + tas5805m->is_muted = !!mute; + if (tas5805m->is_powered) + tas5805m_refresh_unlocked(component); + mutex_unlock(&tas5805m->lock); + + return 0; +} + +static const struct snd_soc_dai_ops tas5805m_dai_ops = { + .trigger = tas5805m_trigger, + .mute_stream = tas5805m_mute, + .no_capture_mute = 1, +}; + +static struct snd_soc_dai_driver tas5805m_dai = { + .name = "tas5805m-amplifier", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + }, + .ops = &tas5805m_dai_ops, +}; + +static const struct regmap_config tas5805m_regmap = { + .reg_bits = 8, + .val_bits = 8, + + /* We have quite a lot of multi-level bank switching and a + * relatively small number of register writes between bank + * switches. + */ + .cache_type = REGCACHE_NONE, +}; + +static int tas5805m_i2c_probe(struct i2c_client *i2c) +{ + struct device *dev = &i2c->dev; + struct regmap *regmap; + struct tas5805m_priv *tas5805m; + int ret; + + regmap = devm_regmap_init_i2c(i2c, &tas5805m_regmap); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + dev_err(dev, "unable to allocate register map: %d\n", ret); + return ret; + } + + tas5805m = devm_kzalloc(dev, sizeof(struct tas5805m_priv), GFP_KERNEL); + if (!tas5805m) + return -ENOMEM; + + tas5805m->pvdd = devm_regulator_get(dev, "pvdd"); + if (IS_ERR(tas5805m->pvdd)) { + dev_err(dev, "failed to get pvdd supply: %ld\n", + PTR_ERR(tas5805m->pvdd)); + return PTR_ERR(tas5805m->pvdd); + } + + dev_set_drvdata(dev, tas5805m); + tas5805m->regmap = regmap; + tas5805m->gpio_pdn_n = devm_gpiod_get(dev, "pdn", GPIOD_OUT_LOW); + if (IS_ERR(tas5805m->gpio_pdn_n)) { + dev_err(dev, "error requesting PDN gpio: %ld\n", + PTR_ERR(tas5805m->gpio_pdn_n)); + return PTR_ERR(tas5805m->gpio_pdn_n); + } + + tas5805m->dsp_cfg_len = of_property_count_elems_of_size(dev->of_node, + "ti,dsp-config", 1); + if (tas5805m->dsp_cfg_len < 0) { + dev_err(dev, "no DSP config provided\n"); + return tas5805m->dsp_cfg_len; + } + + tas5805m->dsp_cfg_data = devm_kmalloc(dev, tas5805m->dsp_cfg_len, + GFP_KERNEL); + if (!tas5805m->dsp_cfg_data) + return -ENOMEM; + + of_property_read_u8_array(dev->of_node, "ti,dsp-config", + tas5805m->dsp_cfg_data, tas5805m->dsp_cfg_len); + dev_dbg(dev, "%d bytes of DSP config loaded\n", + tas5805m->dsp_cfg_len); + + /* Do the first part of the power-on here, while we can expect + * the I2S interface to be quiet. We must raise PDN# and then + * wait 5ms before any I2S clock is sent, or else the internal + * regulator apparently won't come on. + * + * Also, we must keep the device in power down for 100ms or so + * after PVDD is applied, or else the ADR pin is sampled + * incorrectly and the device comes up with an unpredictable I2C + * address. + */ + tas5805m->vol[0] = TAS5805M_VOLUME_MIN; + tas5805m->vol[1] = TAS5805M_VOLUME_MIN; + mutex_init(&tas5805m->lock); + + ret = regulator_enable(tas5805m->pvdd); + if (ret < 0) { + dev_err(dev, "failed to enable pvdd: %d\n", ret); + return ret; + } + + usleep_range(100000, 150000); + gpiod_set_value(tas5805m->gpio_pdn_n, 1); + usleep_range(10000, 15000); + + /* Don't register through devm. We need to be able to unregister + * the component prior to deasserting PDN# + */ + ret = snd_soc_register_component(dev, &soc_codec_dev_tas5805m, + &tas5805m_dai, 1); + if (ret < 0) { + dev_err(dev, "unable to register codec: %d\n", ret); + gpiod_set_value(tas5805m->gpio_pdn_n, 0); + regulator_disable(tas5805m->pvdd); + return ret; + } + + return 0; +} + +static int tas5805m_i2c_remove(struct i2c_client *i2c) +{ + struct device *dev = &i2c->dev; + struct tas5805m_priv *tas5805m = dev_get_drvdata(dev); + + snd_soc_unregister_component(dev); + gpiod_set_value(tas5805m->gpio_pdn_n, 0); + usleep_range(10000, 15000); + regulator_disable(tas5805m->pvdd); + return 0; +} + +static const struct i2c_device_id tas5805m_i2c_id[] = { + { "tas5805m", }, + { } +}; +MODULE_DEVICE_TABLE(i2c, tas5805m_i2c_id); + +#if IS_ENABLED(CONFIG_OF) +static const struct of_device_id tas5805m_of_match[] = { + { .compatible = "ti,tas5805m", }, + { } +}; +MODULE_DEVICE_TABLE(of, tas5805m_of_match); +#endif + +static struct i2c_driver tas5805m_i2c_driver = { + .probe_new = tas5805m_i2c_probe, + .remove = tas5805m_i2c_remove, + .id_table = tas5805m_i2c_id, + .driver = { + .name = "tas5805m", + .of_match_table = of_match_ptr(tas5805m_of_match), + }, +}; + +module_i2c_driver(tas5805m_i2c_driver); + +MODULE_AUTHOR("Andy Liu <andy-liu@ti.com>"); +MODULE_AUTHOR("Daniel Beer <daniel.beer@igorinstitute.com>"); +MODULE_DESCRIPTION("TAS5805M Audio Amplifier Driver"); +MODULE_LICENSE("GPL v2"); -- 2.30.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/2] ASoC: add support for TAS5805M digital amplifier 2022-01-10 23:53 ` Daniel Beer (?) @ 2022-01-13 9:18 ` Amadeusz Sławiński 2022-01-13 22:18 ` Daniel Beer -1 siblings, 1 reply; 13+ messages in thread From: Amadeusz Sławiński @ 2022-01-13 9:18 UTC (permalink / raw) To: Daniel Beer, alsa-devel, devicetree Cc: linux-kernel, Rob Herring, Liam Girdwood, Andy Liu, Mark Brown, Derek Simkowiak On 1/11/2022 12:53 AM, Daniel Beer wrote: > The Texas Instruments TAS5805M is a class D audio amplifier with an > integrated DSP. DSP configuration is expected to be supplied via a > device-tree attribute containing a sequence of register writes. > > These register writes set up application-specific DSP settings and are > expected to be generated using TI's PPC3 tool. > > Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> > --- ... > + > +static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct snd_soc_component *component = > + snd_soc_kcontrol_component(kcontrol); > + struct tas5805m_priv *tas5805m = > + snd_soc_component_get_drvdata(component); > + > + if (!(volume_is_valid(ucontrol->value.integer.value[0]) && > + volume_is_valid(ucontrol->value.integer.value[1]))) > + return -EINVAL; > + > + mutex_lock(&tas5805m->lock); > + tas5805m->vol[0] = ucontrol->value.integer.value[0]; > + tas5805m->vol[1] = ucontrol->value.integer.value[1]; > + dev_dbg(component->dev, "set vol=%d/%d (is_powered=%d)\n", > + tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); > + if (tas5805m->is_powered) > + tas5805m_refresh_unlocked(component); > + mutex_unlock(&tas5805m->lock); > + > + return 0; > +} > + put method should return '1' if value changed, so ALSA knows to inform userspace utilities about change. You can check if userspace is notified of changes with "alsactl monitor", you should see something like: node hw:2, #3 (2,0,0,ADC0 Capture Volume,0) VALUE when value changes. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/2] ASoC: add support for TAS5805M digital amplifier 2022-01-13 9:18 ` Amadeusz Sławiński @ 2022-01-13 22:18 ` Daniel Beer 0 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-13 22:18 UTC (permalink / raw) To: Amadeusz Sławiński Cc: alsa-devel, devicetree, linux-kernel, Rob Herring, Liam Girdwood, Andy Liu, Mark Brown, Derek Simkowiak On Thu, Jan 13, 2022 at 10:18:27AM +0100, Amadeusz Sławiński wrote: > > +static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, > > + struct snd_ctl_elem_value *ucontrol) > > +{ > > + struct snd_soc_component *component = > > + snd_soc_kcontrol_component(kcontrol); > > + struct tas5805m_priv *tas5805m = > > + snd_soc_component_get_drvdata(component); > > + > > + if (!(volume_is_valid(ucontrol->value.integer.value[0]) && > > + volume_is_valid(ucontrol->value.integer.value[1]))) > > + return -EINVAL; > > + > > + mutex_lock(&tas5805m->lock); > > + tas5805m->vol[0] = ucontrol->value.integer.value[0]; > > + tas5805m->vol[1] = ucontrol->value.integer.value[1]; > > + dev_dbg(component->dev, "set vol=%d/%d (is_powered=%d)\n", > > + tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); > > + if (tas5805m->is_powered) > > + tas5805m_refresh_unlocked(component); > > + mutex_unlock(&tas5805m->lock); > > + > > + return 0; > > +} > > + > > put method should return '1' if value changed, so ALSA knows to inform > userspace utilities about change. You can check if userspace is notified of > changes with "alsactl monitor", you should see something like: > node hw:2, #3 (2,0,0,ADC0 Capture Volume,0) VALUE > when value changes. Thanks, will fix this. -- Daniel Beer Firmware Engineer at Igor Institute daniel.beer@igorinstitute.com or +64-27-420-8101 Offices in Seattle, San Francisco, and Vancouver BC or (206) 494-3312 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/2] ASoC: add support for TAS5805M digital amplifier @ 2022-01-13 22:18 ` Daniel Beer 0 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-13 22:18 UTC (permalink / raw) To: Amadeusz Sławiński Cc: devicetree, alsa-devel, Mark Brown, linux-kernel, Liam Girdwood, Andy Liu, Rob Herring, Derek Simkowiak On Thu, Jan 13, 2022 at 10:18:27AM +0100, Amadeusz Sławiński wrote: > > +static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, > > + struct snd_ctl_elem_value *ucontrol) > > +{ > > + struct snd_soc_component *component = > > + snd_soc_kcontrol_component(kcontrol); > > + struct tas5805m_priv *tas5805m = > > + snd_soc_component_get_drvdata(component); > > + > > + if (!(volume_is_valid(ucontrol->value.integer.value[0]) && > > + volume_is_valid(ucontrol->value.integer.value[1]))) > > + return -EINVAL; > > + > > + mutex_lock(&tas5805m->lock); > > + tas5805m->vol[0] = ucontrol->value.integer.value[0]; > > + tas5805m->vol[1] = ucontrol->value.integer.value[1]; > > + dev_dbg(component->dev, "set vol=%d/%d (is_powered=%d)\n", > > + tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); > > + if (tas5805m->is_powered) > > + tas5805m_refresh_unlocked(component); > > + mutex_unlock(&tas5805m->lock); > > + > > + return 0; > > +} > > + > > put method should return '1' if value changed, so ALSA knows to inform > userspace utilities about change. You can check if userspace is notified of > changes with "alsactl monitor", you should see something like: > node hw:2, #3 (2,0,0,ADC0 Capture Volume,0) VALUE > when value changes. Thanks, will fix this. -- Daniel Beer Firmware Engineer at Igor Institute daniel.beer@igorinstitute.com or +64-27-420-8101 Offices in Seattle, San Francisco, and Vancouver BC or (206) 494-3312 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M. 2022-01-13 8:38 ` Daniel Beer @ 2022-01-11 0:00 ` Daniel Beer -1 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-11 0:00 UTC (permalink / raw) To: alsa-devel, devicetree Cc: linux-kernel, Andy Liu, Daniel Beer, Derek Simkowiak, Mark Brown, Rob Herring, Liam Girdwood The TAS5805M is a class D speaker amplifier with integrated DSP. The example here includes a tested flat configuration for mono (PBTL) output. Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> --- .../devicetree/bindings/sound/tas5805m.yaml | 204 ++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml diff --git a/Documentation/devicetree/bindings/sound/tas5805m.yaml b/Documentation/devicetree/bindings/sound/tas5805m.yaml new file mode 100644 index 000000000000..c3a714bac275 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas5805m.yaml @@ -0,0 +1,204 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/tas5805m.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TAS5805M audio amplifier + +maintainers: + - Daniel Beer <daniel.beer@igorinstitute.com> + +description: | + The TAS5805M is a class D audio amplifier with a built-in DSP. + +properties: + compatible: + enum: + - ti,tas5805m + + reg: + maxItems: 1 + description: | + I2C address of the amplifier. See the datasheet for possible values. + + pvdd-supply: + description: | + Regulator for audio power supply (PVDD in the datasheet). + + pdn-gpios: + description: | + Power-down control GPIO (PDN pin in the datasheet). + + ti,dsp-config: + description: | + A byte sequence giving DSP configuration. Each pair of bytes, in + sequence, gives a register address and a value to write. If you + are taking this data from TI's PPC3 tool, this should contain only + the register writes following the 5ms delay. + $ref: /schemas/types.yaml#/definitions/uint8-array + +examples: + - | + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + tas5805m: tas5805m@2c { + reg = <0x2c>; + compatible = "ti,tas5805m"; + status = "ok"; + + pvdd-supply = <&audiopwr>; + pdn-gpios = <&tlmm 160 0>; + + // Mono PBTL DSP configuration + ti,dsp-config = [ + 00 00 7f 00 03 00 00 00 7f 00 46 01 00 00 7f 00 + 03 02 00 00 7f 00 78 80 00 00 7f 00 61 0b 60 01 + 7d 11 7e ff 00 01 51 05 00 00 02 04 53 00 54 00 + 00 00 00 00 00 00 00 00 00 00 7f 00 66 87 7f 8c + 00 29 18 00 19 40 1a 26 1b e7 1c 00 1d 40 1e 26 + 1f e7 20 00 21 00 22 00 23 00 24 00 25 00 26 00 + 27 00 00 2a 24 00 25 80 26 00 27 00 28 00 29 80 + 2a 00 2b 00 30 00 31 71 32 94 33 9a 00 2c 0c 00 + 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 + 15 80 16 00 17 00 18 00 19 00 1a 00 1b 00 1c 00 + 1d 80 1e 00 1f 00 20 00 21 00 22 00 23 00 28 00 + 29 80 2a 00 2b 00 2c 00 2d 00 2e 00 2f 00 34 00 + 35 80 36 00 37 00 38 00 39 00 3a 00 3b 00 48 00 + 49 80 4a 00 4b 00 4c 00 4d 00 4e 00 4f 00 5c 00 + 5d 00 5e 57 5f 62 60 00 61 89 62 37 63 4c 64 08 + 65 13 66 85 67 62 68 40 69 00 6a 00 6b 00 6c 02 + 6d 66 6e c4 6f 1b 74 00 75 80 76 00 77 00 00 2d + 18 7d 19 99 1a 3b 1b e5 1c 00 1d 00 1e 57 1f 62 + 20 00 21 00 22 00 23 00 24 00 25 00 26 00 27 00 + 28 00 29 00 2a 00 2b 00 2c 00 2d 80 2e 00 2f 00 + 00 2e 24 11 25 3d 26 c3 27 1a 00 00 7f aa 00 24 + 18 08 19 00 1a 00 1b 00 1c 00 1d 00 1e 00 1f 00 + 20 00 21 00 22 00 23 00 24 00 25 00 26 00 27 00 + 28 00 29 00 2a 00 2b 00 2c 08 2d 00 2e 00 2f 00 + 30 00 31 00 32 00 33 00 34 00 35 00 36 00 37 00 + 38 00 39 00 3a 00 3b 00 3c 00 3d 00 3e 00 3f 00 + 40 08 41 00 42 00 43 00 44 00 45 00 46 00 47 00 + 48 00 49 00 4a 00 4b 00 4c 00 4d 00 4e 00 4f 00 + 50 00 51 00 52 00 53 00 54 08 55 00 56 00 57 00 + 58 00 59 00 5a 00 5b 00 5c 00 5d 00 5e 00 5f 00 + 60 00 61 00 62 00 63 00 64 00 65 00 66 00 67 00 + 68 08 69 00 6a 00 6b 00 6c 00 6d 00 6e 00 6f 00 + 70 00 71 00 72 00 73 00 74 00 75 00 76 00 77 00 + 78 00 79 00 7a 00 7b 00 7c 08 7d 00 7e 00 7f 00 + 00 25 08 00 09 00 0a 00 0b 00 0c 00 0d 00 0e 00 + 0f 00 10 00 11 00 12 00 13 00 14 00 15 00 16 00 + 17 00 18 08 19 00 1a 00 1b 00 1c 00 1d 00 1e 00 + 1f 00 20 00 21 00 22 00 23 00 24 00 25 00 26 00 + 27 00 28 00 29 00 2a 00 2b 00 2c 08 2d 00 2e 00 + 2f 00 30 00 31 00 32 00 33 00 34 00 35 00 36 00 + 37 00 38 00 39 00 3a 00 3b 00 3c 00 3d 00 3e 00 + 3f 00 40 08 41 00 42 00 43 00 44 00 45 00 46 00 + 47 00 48 00 49 00 4a 00 4b 00 4c 00 4d 00 4e 00 + 4f 00 50 00 51 00 52 00 53 00 54 08 55 00 56 00 + 57 00 58 00 59 00 5a 00 5b 00 5c 00 5d 00 5e 00 + 5f 00 60 00 61 00 62 00 63 00 64 00 65 00 66 00 + 67 00 68 08 69 00 6a 00 6b 00 6c 00 6d 00 6e 00 + 6f 00 70 00 71 00 72 00 73 00 74 00 75 00 76 00 + 77 00 78 00 79 00 7a 00 7b 00 7c 08 7d 00 7e 00 + 7f 00 00 26 08 00 09 00 0a 00 0b 00 0c 00 0d 00 + 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 15 00 + 16 00 17 00 18 08 19 00 1a 00 1b 00 1c 00 1d 00 + 1e 00 1f 00 20 00 21 00 22 00 23 00 24 00 25 00 + 26 00 27 00 28 00 29 00 2a 00 2b 00 2c 08 2d 00 + 2e 00 2f 00 30 00 31 00 32 00 33 00 34 00 35 00 + 36 00 37 00 38 00 39 00 3a 00 3b 00 3c 00 3d 00 + 3e 00 3f 00 40 08 41 00 42 00 43 00 44 00 45 00 + 46 00 47 00 48 00 49 00 4a 00 4b 00 4c 00 4d 00 + 4e 00 4f 00 50 00 51 00 52 00 53 00 54 08 55 00 + 56 00 57 00 58 00 59 00 5a 00 5b 00 5c 00 5d 00 + 5e 00 5f 00 60 00 61 00 62 00 63 00 64 00 65 00 + 66 00 67 00 68 08 69 00 6a 00 6b 00 6c 00 6d 00 + 6e 00 6f 00 70 00 71 00 72 00 73 00 74 00 75 00 + 76 00 77 00 78 00 79 00 7a 00 7b 00 7c 08 7d 00 + 7e 00 7f 00 00 27 08 00 09 00 0a 00 0b 00 0c 00 + 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 + 15 00 16 00 17 00 18 08 19 00 1a 00 1b 00 1c 00 + 1d 00 1e 00 1f 00 20 00 21 00 22 00 23 00 24 00 + 25 00 26 00 27 00 28 00 29 00 2a 00 2b 00 2c 08 + 2d 00 2e 00 2f 00 30 00 31 00 32 00 33 00 34 00 + 35 00 36 00 37 00 38 00 39 00 3a 00 3b 00 3c 00 + 3d 00 3e 00 3f 00 40 08 41 00 42 00 43 00 44 00 + 45 00 46 00 47 00 48 00 49 00 4a 00 4b 00 4c 00 + 4d 00 4e 00 4f 00 50 00 51 00 52 00 53 00 54 08 + 55 00 56 00 57 00 58 00 59 00 5a 00 5b 00 5c 00 + 5d 00 5e 00 5f 00 60 00 61 00 62 00 63 00 64 00 + 65 00 66 00 67 00 68 08 69 00 6a 00 6b 00 6c 00 + 6d 00 6e 00 6f 00 70 00 71 00 72 00 73 00 74 00 + 75 00 76 00 77 00 78 00 79 00 7a 00 7b 00 7c 08 + 7d 00 7e 00 7f 00 00 28 08 00 09 00 0a 00 0b 00 + 0c 00 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 + 14 00 15 00 16 00 17 00 18 08 19 00 1a 00 1b 00 + 1c 00 1d 00 1e 00 1f 00 20 00 21 00 22 00 23 00 + 24 00 25 00 26 00 27 00 28 00 29 00 2a 00 2b 00 + 2c 08 2d 00 2e 00 2f 00 30 00 31 00 32 00 33 00 + 34 00 35 00 36 00 37 00 38 00 39 00 3a 00 3b 00 + 3c 00 3d 00 3e 00 3f 00 40 08 41 00 42 00 43 00 + 44 00 45 00 46 00 47 00 48 00 49 00 4a 00 4b 00 + 4c 00 4d 00 4e 00 4f 00 50 00 51 00 52 00 53 00 + 54 08 55 00 56 00 57 00 58 00 59 00 5a 00 5b 00 + 5c 00 5d 00 5e 00 5f 00 60 00 61 00 62 00 63 00 + 64 00 65 00 66 00 67 00 68 08 69 00 6a 00 6b 00 + 6c 00 6d 00 6e 00 6f 00 70 00 71 00 72 00 73 00 + 74 00 75 00 76 00 77 00 78 00 79 00 7a 00 7b 00 + 7c 08 7d 00 7e 00 7f 00 00 29 08 00 09 00 0a 00 + 0b 00 0c 00 0d 00 0e 00 0f 00 10 00 11 00 12 00 + 13 00 14 00 15 00 16 00 17 00 00 2e 7c 08 7d 00 + 7e 00 7f 00 00 2f 08 00 09 00 0a 00 0b 00 0c 00 + 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 + 15 00 16 00 17 00 1c 08 1d 00 1e 00 1f 00 20 00 + 21 00 22 00 23 00 24 00 25 00 26 00 27 00 28 00 + 29 00 2a 00 2b 00 2c 00 2d 00 2e 00 2f 00 00 2a + 48 00 49 01 4a 64 4b 0a 4c 00 4d 01 4e 64 4f 0a + 50 00 51 01 52 64 53 0a 54 7e 55 d0 56 b5 57 2d + 58 82 59 59 5a 05 5b 7b 00 00 7f 8c 00 2b 34 00 + 35 0d 36 a6 37 86 38 00 39 0d 3a a6 3b 86 3c 00 + 3d 06 3e d3 3f 72 40 00 41 00 42 00 43 00 44 00 + 45 00 46 00 47 00 48 ff 49 81 4a 47 4b ae 4c f9 + 4d 06 4e 21 4f a9 50 fe 51 01 52 c0 53 79 54 00 + 55 00 56 00 57 00 58 00 59 00 5a 00 5b 00 00 2d + 58 01 59 53 5a 8f 5b cc 5c 01 5d 53 5e 8f 5f cc + 60 00 61 22 62 1d 63 95 64 00 65 00 66 00 67 00 + 68 00 69 00 6a 00 6b 00 6c ff 6d 81 6e 47 6f ae + 70 f9 71 06 72 21 73 a9 74 fe 75 01 76 c0 77 79 + 78 00 79 00 7a 00 7b 00 7c 00 7d 00 7e 00 7f 00 + 00 00 7f aa 00 2e 40 01 41 d7 42 e8 43 0a 44 01 + 45 d7 46 e8 47 0a 48 01 49 d7 4a e8 4b 0a 4c 68 + 4d 82 4e f5 4f bf 50 a7 51 9a 52 74 53 5a 00 2b + 20 6a 21 5a 22 dd 23 c9 24 95 25 a5 26 22 27 37 + 28 6a 29 5a 2a dd 2b c9 2c 68 2d 82 2e f5 2f bf + 30 a7 31 9a 32 74 33 5a 0c 6a 0d 5a 0e dd 0f c9 + 10 95 11 a5 12 22 13 37 14 6a 15 5a 16 dd 17 c9 + 18 68 19 82 1a f5 1b bf 1c a7 1d 9a 1e 74 1f 5a + 00 2a 34 00 35 01 36 64 37 0a 38 00 39 01 3a 64 + 3b 0a 3c 00 3d 01 3e 64 3f 0a 40 7e 41 d0 42 b5 + 43 2d 44 82 45 59 46 05 47 7b 00 00 7f 8c 00 2d + 30 01 31 53 32 8f 33 cc 34 01 35 53 36 8f 37 cc + 38 00 39 03 3a 69 3b c5 3c 00 3d 00 3e 00 3f 00 + 40 00 41 00 42 00 43 00 44 ff 45 81 46 47 47 ae + 48 f9 49 06 4a 21 4b a9 4c fe 4d 01 4e c0 4f 79 + 50 00 51 00 52 00 53 00 54 00 55 00 56 00 57 00 + 00 00 7f aa 00 2a 5c 7e 5d d2 5e 19 5f 37 60 81 + 61 2d 62 e6 63 c9 64 7e 65 d2 66 19 67 37 68 7e + 69 d0 6a b5 6b 2d 6c 82 6d 59 6e 05 6f 7b 70 7e + 71 d2 72 19 73 37 74 81 75 2d 76 e6 77 c9 78 7e + 79 d2 7a 19 7b 37 7c 7e 7d d0 7e b5 7f 2d 00 2b + 08 82 09 59 0a 05 0b 7b 00 2e 54 01 55 d7 56 e8 + 57 0a 58 01 59 d7 5a e8 5b 0a 5c 01 5d d7 5e e8 + 5f 0a 60 68 61 82 62 f5 63 bf 64 a7 65 9a 66 74 + 67 5a 00 00 7f 8c 00 2e 10 00 11 80 12 00 13 00 + 0c 00 0d 80 0e 00 0f 00 08 00 09 80 0a 00 0b 00 + 18 00 19 80 1a 00 1b 00 1c 40 1d 00 1e 00 1f 00 + 20 40 21 00 22 00 23 00 00 00 7f 00 30 00 4c 30 + 03 03 00 00 7f 00 78 80 + ]; + }; + }; + +additionalProperties: true -- 2.30.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M. @ 2022-01-11 0:00 ` Daniel Beer 0 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-11 0:00 UTC (permalink / raw) To: alsa-devel, devicetree Cc: Daniel Beer, linux-kernel, Rob Herring, Liam Girdwood, Andy Liu, Mark Brown, Derek Simkowiak The TAS5805M is a class D speaker amplifier with integrated DSP. The example here includes a tested flat configuration for mono (PBTL) output. Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> --- .../devicetree/bindings/sound/tas5805m.yaml | 204 ++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml diff --git a/Documentation/devicetree/bindings/sound/tas5805m.yaml b/Documentation/devicetree/bindings/sound/tas5805m.yaml new file mode 100644 index 000000000000..c3a714bac275 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas5805m.yaml @@ -0,0 +1,204 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/tas5805m.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TAS5805M audio amplifier + +maintainers: + - Daniel Beer <daniel.beer@igorinstitute.com> + +description: | + The TAS5805M is a class D audio amplifier with a built-in DSP. + +properties: + compatible: + enum: + - ti,tas5805m + + reg: + maxItems: 1 + description: | + I2C address of the amplifier. See the datasheet for possible values. + + pvdd-supply: + description: | + Regulator for audio power supply (PVDD in the datasheet). + + pdn-gpios: + description: | + Power-down control GPIO (PDN pin in the datasheet). + + ti,dsp-config: + description: | + A byte sequence giving DSP configuration. Each pair of bytes, in + sequence, gives a register address and a value to write. If you + are taking this data from TI's PPC3 tool, this should contain only + the register writes following the 5ms delay. + $ref: /schemas/types.yaml#/definitions/uint8-array + +examples: + - | + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + tas5805m: tas5805m@2c { + reg = <0x2c>; + compatible = "ti,tas5805m"; + status = "ok"; + + pvdd-supply = <&audiopwr>; + pdn-gpios = <&tlmm 160 0>; + + // Mono PBTL DSP configuration + ti,dsp-config = [ + 00 00 7f 00 03 00 00 00 7f 00 46 01 00 00 7f 00 + 03 02 00 00 7f 00 78 80 00 00 7f 00 61 0b 60 01 + 7d 11 7e ff 00 01 51 05 00 00 02 04 53 00 54 00 + 00 00 00 00 00 00 00 00 00 00 7f 00 66 87 7f 8c + 00 29 18 00 19 40 1a 26 1b e7 1c 00 1d 40 1e 26 + 1f e7 20 00 21 00 22 00 23 00 24 00 25 00 26 00 + 27 00 00 2a 24 00 25 80 26 00 27 00 28 00 29 80 + 2a 00 2b 00 30 00 31 71 32 94 33 9a 00 2c 0c 00 + 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 + 15 80 16 00 17 00 18 00 19 00 1a 00 1b 00 1c 00 + 1d 80 1e 00 1f 00 20 00 21 00 22 00 23 00 28 00 + 29 80 2a 00 2b 00 2c 00 2d 00 2e 00 2f 00 34 00 + 35 80 36 00 37 00 38 00 39 00 3a 00 3b 00 48 00 + 49 80 4a 00 4b 00 4c 00 4d 00 4e 00 4f 00 5c 00 + 5d 00 5e 57 5f 62 60 00 61 89 62 37 63 4c 64 08 + 65 13 66 85 67 62 68 40 69 00 6a 00 6b 00 6c 02 + 6d 66 6e c4 6f 1b 74 00 75 80 76 00 77 00 00 2d + 18 7d 19 99 1a 3b 1b e5 1c 00 1d 00 1e 57 1f 62 + 20 00 21 00 22 00 23 00 24 00 25 00 26 00 27 00 + 28 00 29 00 2a 00 2b 00 2c 00 2d 80 2e 00 2f 00 + 00 2e 24 11 25 3d 26 c3 27 1a 00 00 7f aa 00 24 + 18 08 19 00 1a 00 1b 00 1c 00 1d 00 1e 00 1f 00 + 20 00 21 00 22 00 23 00 24 00 25 00 26 00 27 00 + 28 00 29 00 2a 00 2b 00 2c 08 2d 00 2e 00 2f 00 + 30 00 31 00 32 00 33 00 34 00 35 00 36 00 37 00 + 38 00 39 00 3a 00 3b 00 3c 00 3d 00 3e 00 3f 00 + 40 08 41 00 42 00 43 00 44 00 45 00 46 00 47 00 + 48 00 49 00 4a 00 4b 00 4c 00 4d 00 4e 00 4f 00 + 50 00 51 00 52 00 53 00 54 08 55 00 56 00 57 00 + 58 00 59 00 5a 00 5b 00 5c 00 5d 00 5e 00 5f 00 + 60 00 61 00 62 00 63 00 64 00 65 00 66 00 67 00 + 68 08 69 00 6a 00 6b 00 6c 00 6d 00 6e 00 6f 00 + 70 00 71 00 72 00 73 00 74 00 75 00 76 00 77 00 + 78 00 79 00 7a 00 7b 00 7c 08 7d 00 7e 00 7f 00 + 00 25 08 00 09 00 0a 00 0b 00 0c 00 0d 00 0e 00 + 0f 00 10 00 11 00 12 00 13 00 14 00 15 00 16 00 + 17 00 18 08 19 00 1a 00 1b 00 1c 00 1d 00 1e 00 + 1f 00 20 00 21 00 22 00 23 00 24 00 25 00 26 00 + 27 00 28 00 29 00 2a 00 2b 00 2c 08 2d 00 2e 00 + 2f 00 30 00 31 00 32 00 33 00 34 00 35 00 36 00 + 37 00 38 00 39 00 3a 00 3b 00 3c 00 3d 00 3e 00 + 3f 00 40 08 41 00 42 00 43 00 44 00 45 00 46 00 + 47 00 48 00 49 00 4a 00 4b 00 4c 00 4d 00 4e 00 + 4f 00 50 00 51 00 52 00 53 00 54 08 55 00 56 00 + 57 00 58 00 59 00 5a 00 5b 00 5c 00 5d 00 5e 00 + 5f 00 60 00 61 00 62 00 63 00 64 00 65 00 66 00 + 67 00 68 08 69 00 6a 00 6b 00 6c 00 6d 00 6e 00 + 6f 00 70 00 71 00 72 00 73 00 74 00 75 00 76 00 + 77 00 78 00 79 00 7a 00 7b 00 7c 08 7d 00 7e 00 + 7f 00 00 26 08 00 09 00 0a 00 0b 00 0c 00 0d 00 + 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 15 00 + 16 00 17 00 18 08 19 00 1a 00 1b 00 1c 00 1d 00 + 1e 00 1f 00 20 00 21 00 22 00 23 00 24 00 25 00 + 26 00 27 00 28 00 29 00 2a 00 2b 00 2c 08 2d 00 + 2e 00 2f 00 30 00 31 00 32 00 33 00 34 00 35 00 + 36 00 37 00 38 00 39 00 3a 00 3b 00 3c 00 3d 00 + 3e 00 3f 00 40 08 41 00 42 00 43 00 44 00 45 00 + 46 00 47 00 48 00 49 00 4a 00 4b 00 4c 00 4d 00 + 4e 00 4f 00 50 00 51 00 52 00 53 00 54 08 55 00 + 56 00 57 00 58 00 59 00 5a 00 5b 00 5c 00 5d 00 + 5e 00 5f 00 60 00 61 00 62 00 63 00 64 00 65 00 + 66 00 67 00 68 08 69 00 6a 00 6b 00 6c 00 6d 00 + 6e 00 6f 00 70 00 71 00 72 00 73 00 74 00 75 00 + 76 00 77 00 78 00 79 00 7a 00 7b 00 7c 08 7d 00 + 7e 00 7f 00 00 27 08 00 09 00 0a 00 0b 00 0c 00 + 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 + 15 00 16 00 17 00 18 08 19 00 1a 00 1b 00 1c 00 + 1d 00 1e 00 1f 00 20 00 21 00 22 00 23 00 24 00 + 25 00 26 00 27 00 28 00 29 00 2a 00 2b 00 2c 08 + 2d 00 2e 00 2f 00 30 00 31 00 32 00 33 00 34 00 + 35 00 36 00 37 00 38 00 39 00 3a 00 3b 00 3c 00 + 3d 00 3e 00 3f 00 40 08 41 00 42 00 43 00 44 00 + 45 00 46 00 47 00 48 00 49 00 4a 00 4b 00 4c 00 + 4d 00 4e 00 4f 00 50 00 51 00 52 00 53 00 54 08 + 55 00 56 00 57 00 58 00 59 00 5a 00 5b 00 5c 00 + 5d 00 5e 00 5f 00 60 00 61 00 62 00 63 00 64 00 + 65 00 66 00 67 00 68 08 69 00 6a 00 6b 00 6c 00 + 6d 00 6e 00 6f 00 70 00 71 00 72 00 73 00 74 00 + 75 00 76 00 77 00 78 00 79 00 7a 00 7b 00 7c 08 + 7d 00 7e 00 7f 00 00 28 08 00 09 00 0a 00 0b 00 + 0c 00 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 + 14 00 15 00 16 00 17 00 18 08 19 00 1a 00 1b 00 + 1c 00 1d 00 1e 00 1f 00 20 00 21 00 22 00 23 00 + 24 00 25 00 26 00 27 00 28 00 29 00 2a 00 2b 00 + 2c 08 2d 00 2e 00 2f 00 30 00 31 00 32 00 33 00 + 34 00 35 00 36 00 37 00 38 00 39 00 3a 00 3b 00 + 3c 00 3d 00 3e 00 3f 00 40 08 41 00 42 00 43 00 + 44 00 45 00 46 00 47 00 48 00 49 00 4a 00 4b 00 + 4c 00 4d 00 4e 00 4f 00 50 00 51 00 52 00 53 00 + 54 08 55 00 56 00 57 00 58 00 59 00 5a 00 5b 00 + 5c 00 5d 00 5e 00 5f 00 60 00 61 00 62 00 63 00 + 64 00 65 00 66 00 67 00 68 08 69 00 6a 00 6b 00 + 6c 00 6d 00 6e 00 6f 00 70 00 71 00 72 00 73 00 + 74 00 75 00 76 00 77 00 78 00 79 00 7a 00 7b 00 + 7c 08 7d 00 7e 00 7f 00 00 29 08 00 09 00 0a 00 + 0b 00 0c 00 0d 00 0e 00 0f 00 10 00 11 00 12 00 + 13 00 14 00 15 00 16 00 17 00 00 2e 7c 08 7d 00 + 7e 00 7f 00 00 2f 08 00 09 00 0a 00 0b 00 0c 00 + 0d 00 0e 00 0f 00 10 00 11 00 12 00 13 00 14 00 + 15 00 16 00 17 00 1c 08 1d 00 1e 00 1f 00 20 00 + 21 00 22 00 23 00 24 00 25 00 26 00 27 00 28 00 + 29 00 2a 00 2b 00 2c 00 2d 00 2e 00 2f 00 00 2a + 48 00 49 01 4a 64 4b 0a 4c 00 4d 01 4e 64 4f 0a + 50 00 51 01 52 64 53 0a 54 7e 55 d0 56 b5 57 2d + 58 82 59 59 5a 05 5b 7b 00 00 7f 8c 00 2b 34 00 + 35 0d 36 a6 37 86 38 00 39 0d 3a a6 3b 86 3c 00 + 3d 06 3e d3 3f 72 40 00 41 00 42 00 43 00 44 00 + 45 00 46 00 47 00 48 ff 49 81 4a 47 4b ae 4c f9 + 4d 06 4e 21 4f a9 50 fe 51 01 52 c0 53 79 54 00 + 55 00 56 00 57 00 58 00 59 00 5a 00 5b 00 00 2d + 58 01 59 53 5a 8f 5b cc 5c 01 5d 53 5e 8f 5f cc + 60 00 61 22 62 1d 63 95 64 00 65 00 66 00 67 00 + 68 00 69 00 6a 00 6b 00 6c ff 6d 81 6e 47 6f ae + 70 f9 71 06 72 21 73 a9 74 fe 75 01 76 c0 77 79 + 78 00 79 00 7a 00 7b 00 7c 00 7d 00 7e 00 7f 00 + 00 00 7f aa 00 2e 40 01 41 d7 42 e8 43 0a 44 01 + 45 d7 46 e8 47 0a 48 01 49 d7 4a e8 4b 0a 4c 68 + 4d 82 4e f5 4f bf 50 a7 51 9a 52 74 53 5a 00 2b + 20 6a 21 5a 22 dd 23 c9 24 95 25 a5 26 22 27 37 + 28 6a 29 5a 2a dd 2b c9 2c 68 2d 82 2e f5 2f bf + 30 a7 31 9a 32 74 33 5a 0c 6a 0d 5a 0e dd 0f c9 + 10 95 11 a5 12 22 13 37 14 6a 15 5a 16 dd 17 c9 + 18 68 19 82 1a f5 1b bf 1c a7 1d 9a 1e 74 1f 5a + 00 2a 34 00 35 01 36 64 37 0a 38 00 39 01 3a 64 + 3b 0a 3c 00 3d 01 3e 64 3f 0a 40 7e 41 d0 42 b5 + 43 2d 44 82 45 59 46 05 47 7b 00 00 7f 8c 00 2d + 30 01 31 53 32 8f 33 cc 34 01 35 53 36 8f 37 cc + 38 00 39 03 3a 69 3b c5 3c 00 3d 00 3e 00 3f 00 + 40 00 41 00 42 00 43 00 44 ff 45 81 46 47 47 ae + 48 f9 49 06 4a 21 4b a9 4c fe 4d 01 4e c0 4f 79 + 50 00 51 00 52 00 53 00 54 00 55 00 56 00 57 00 + 00 00 7f aa 00 2a 5c 7e 5d d2 5e 19 5f 37 60 81 + 61 2d 62 e6 63 c9 64 7e 65 d2 66 19 67 37 68 7e + 69 d0 6a b5 6b 2d 6c 82 6d 59 6e 05 6f 7b 70 7e + 71 d2 72 19 73 37 74 81 75 2d 76 e6 77 c9 78 7e + 79 d2 7a 19 7b 37 7c 7e 7d d0 7e b5 7f 2d 00 2b + 08 82 09 59 0a 05 0b 7b 00 2e 54 01 55 d7 56 e8 + 57 0a 58 01 59 d7 5a e8 5b 0a 5c 01 5d d7 5e e8 + 5f 0a 60 68 61 82 62 f5 63 bf 64 a7 65 9a 66 74 + 67 5a 00 00 7f 8c 00 2e 10 00 11 80 12 00 13 00 + 0c 00 0d 80 0e 00 0f 00 08 00 09 80 0a 00 0b 00 + 18 00 19 80 1a 00 1b 00 1c 40 1d 00 1e 00 1f 00 + 20 40 21 00 22 00 23 00 00 00 7f 00 30 00 4c 30 + 03 03 00 00 7f 00 78 80 + ]; + }; + }; + +additionalProperties: true -- 2.30.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M. 2022-01-11 0:00 ` Daniel Beer @ 2022-01-13 16:29 ` Rob Herring -1 siblings, 0 replies; 13+ messages in thread From: Rob Herring @ 2022-01-13 16:29 UTC (permalink / raw) To: Daniel Beer Cc: devicetree, Mark Brown, Andy Liu, Rob Herring, Liam Girdwood, Derek Simkowiak, alsa-devel, linux-kernel On Tue, 11 Jan 2022 13:00:09 +1300, Daniel Beer wrote: > The TAS5805M is a class D speaker amplifier with integrated DSP. The > example here includes a tested flat configuration for mono (PBTL) > output. > > Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> > --- > .../devicetree/bindings/sound/tas5805m.yaml | 204 ++++++++++++++++++ > 1 file changed, 204 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/sound/tas5805m.example.dt.yaml: tas5805m@2c: status:0: 'ok' is not one of ['okay', 'disabled', 'reserved'] From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/dt-core.yaml doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1579511 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M. @ 2022-01-13 16:29 ` Rob Herring 0 siblings, 0 replies; 13+ messages in thread From: Rob Herring @ 2022-01-13 16:29 UTC (permalink / raw) To: Daniel Beer Cc: devicetree, alsa-devel, Liam Girdwood, Rob Herring, linux-kernel, Andy Liu, Mark Brown, Derek Simkowiak On Tue, 11 Jan 2022 13:00:09 +1300, Daniel Beer wrote: > The TAS5805M is a class D speaker amplifier with integrated DSP. The > example here includes a tested flat configuration for mono (PBTL) > output. > > Signed-off-by: Daniel Beer <daniel.beer@igorinstitute.com> > --- > .../devicetree/bindings/sound/tas5805m.yaml | 204 ++++++++++++++++++ > 1 file changed, 204 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/sound/tas5805m.example.dt.yaml: tas5805m@2c: status:0: 'ok' is not one of ['okay', 'disabled', 'reserved'] From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/dt-core.yaml doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1579511 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M. 2022-01-13 16:29 ` Rob Herring @ 2022-01-13 22:20 ` Daniel Beer -1 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-13 22:20 UTC (permalink / raw) To: Rob Herring Cc: devicetree, Mark Brown, Andy Liu, Rob Herring, Liam Girdwood, Derek Simkowiak, alsa-devel, linux-kernel On Thu, Jan 13, 2022 at 10:29:34AM -0600, Rob Herring wrote: > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/sound/tas5805m.example.dt.yaml: tas5805m@2c: status:0: 'ok' is not one of ['okay', 'disabled', 'reserved'] > From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/dt-core.yaml I ran dt_binding_check against the master branch of the alsa-devel tree and I'm not seeing this error. Obviously it's easy enough to fix, but is there another tree I should be testing against before resubmitting? Cheers, Daniel -- Daniel Beer Firmware Engineer at Igor Institute daniel.beer@igorinstitute.com or +64-27-420-8101 Offices in Seattle, San Francisco, and Vancouver BC or (206) 494-3312 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M. @ 2022-01-13 22:20 ` Daniel Beer 0 siblings, 0 replies; 13+ messages in thread From: Daniel Beer @ 2022-01-13 22:20 UTC (permalink / raw) To: Rob Herring Cc: devicetree, alsa-devel, Liam Girdwood, Rob Herring, linux-kernel, Andy Liu, Mark Brown, Derek Simkowiak On Thu, Jan 13, 2022 at 10:29:34AM -0600, Rob Herring wrote: > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/sound/tas5805m.example.dt.yaml: tas5805m@2c: status:0: 'ok' is not one of ['okay', 'disabled', 'reserved'] > From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/dt-core.yaml I ran dt_binding_check against the master branch of the alsa-devel tree and I'm not seeing this error. Obviously it's easy enough to fix, but is there another tree I should be testing against before resubmitting? Cheers, Daniel -- Daniel Beer Firmware Engineer at Igor Institute daniel.beer@igorinstitute.com or +64-27-420-8101 Offices in Seattle, San Francisco, and Vancouver BC or (206) 494-3312 ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-01-13 22:22 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-13 8:38 [PATCH v2 0/2] ASoC: add support for TAS5805M digital amplifier Daniel Beer 2022-01-13 8:38 ` Daniel Beer 2022-01-10 23:53 ` [PATCH v2 1/2] " Daniel Beer 2022-01-10 23:53 ` Daniel Beer 2022-01-13 9:18 ` Amadeusz Sławiński 2022-01-13 22:18 ` Daniel Beer 2022-01-13 22:18 ` Daniel Beer 2022-01-11 0:00 ` [PATCH v2 2/2] ASoC: dt-bindings: add bindings for TI TAS5805M Daniel Beer 2022-01-11 0:00 ` Daniel Beer 2022-01-13 16:29 ` Rob Herring 2022-01-13 16:29 ` Rob Herring 2022-01-13 22:20 ` Daniel Beer 2022-01-13 22:20 ` Daniel Beer
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.