* [PATCH v3 0/2] Add support for AK5558 ADC @ 2018-02-05 17:01 Daniel Baluta 2018-02-05 17:01 ` [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver Daniel Baluta 2018-02-05 17:01 ` [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC Daniel Baluta 0 siblings, 2 replies; 11+ messages in thread From: Daniel Baluta @ 2018-02-05 17:01 UTC (permalink / raw) To: broonie, alsa-devel, devicetree Cc: robh, shengjiu.wang, linux-kernel, wakasugi.jb, fabio.estevam, andy.shevchenko, linux-imx, cosmin.samoila, daniel.baluta, mihai.serban We support normal mode, TDM mode and pm. Changes since v2: [addressed comments from Andy, Fabio and Rob] * sort include files * use probe_new * reword the binding document * use adc@10 instead of ak5558@10 * remove file name at the beginning of codec source code. * make i2c_probe and i2c_remove parameters naming consistent. Changes since v1: [addressed comments from Andy and Fabio] * fix GPIO polarity from active high to active low for correct documentation * fix license header by using SPDX identifier * remove debug prints at the beginning of functions. * only support auto clock switching (manual switching was dead code anyway) (in the future we could add a DT property to choose between manual and auto) * Use gpiod API * use GENMASK * introduce power_off/power_on One open question is the resume sequence which appears to need power_off/power_on. Just power_on alone isn't enough. With just power_on after resume aplay plays a song for 1 seconds and then the sound stops. Datasheet says, page 55" (1) The PDN pin should be held to “L” for more than 150 ns after AVDD and TVDD are powered up. Daniel Baluta (2): ASoC: codecs: Add support for AK5558 ADC driver ASoC: ak5558: Add bindings for AK5558 ADC Documentation/devicetree/bindings/sound/ak5558.txt | 22 + sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak5558.c | 618 +++++++++++++++++++++ sound/soc/codecs/ak5558.h | 52 ++ 5 files changed, 700 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt create mode 100644 sound/soc/codecs/ak5558.c create mode 100644 sound/soc/codecs/ak5558.h -- 2.7.4 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver 2018-02-05 17:01 [PATCH v3 0/2] Add support for AK5558 ADC Daniel Baluta @ 2018-02-05 17:01 ` Daniel Baluta 2018-02-05 20:27 ` Fabio Estevam ` (2 more replies) 2018-02-05 17:01 ` [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC Daniel Baluta 1 sibling, 3 replies; 11+ messages in thread From: Daniel Baluta @ 2018-02-05 17:01 UTC (permalink / raw) To: broonie, alsa-devel, devicetree Cc: robh, shengjiu.wang, linux-kernel, wakasugi.jb, fabio.estevam, andy.shevchenko, linux-imx, cosmin.samoila, Mihai Serban, daniel.baluta, mihai.serban AK5558 is a 32-bit, 768 kHZ sampling, differential input ADC for digital audio systems. Datasheet is available at: https://www.akm.com/akm/en/file/datasheet/AK5558VN.pdf Initial patch includes support for normal and TDM modes. Signed-off-by: Junichi Wakasugi <wakasugi.jb@om.asahi-kasei.co.jp> [initial coding for 3.18 kernel] Signed-off-by: Mihai Serban <mihai.serban@nxp.com> [cleanups and porting to 4.9 kernel] Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> [tdm support] Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> [pm support, cleanups and porting to latest kernel] --- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak5558.c | 618 ++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/ak5558.h | 52 ++++ 4 files changed, 678 insertions(+) create mode 100644 sound/soc/codecs/ak5558.c create mode 100644 sound/soc/codecs/ak5558.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2b331f7..c29728c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -42,6 +42,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_AK4642 if I2C select SND_SOC_AK4671 if I2C select SND_SOC_AK5386 + select SND_SOC_AK5558 if I2C select SND_SOC_ALC5623 if I2C select SND_SOC_ALC5632 if I2C select SND_SOC_BT_SCO @@ -398,6 +399,11 @@ config SND_SOC_AK4671 config SND_SOC_AK5386 tristate "AKM AK5638 CODEC" +config SND_SOC_AK5558 + tristate "AKM AK5558 CODEC" + depends on I2C + select REGMAP_I2C + config SND_SOC_ALC5623 tristate "Realtek ALC5623 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index da15713..3e71d40 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -34,6 +34,7 @@ snd-soc-ak4641-objs := ak4641.o snd-soc-ak4642-objs := ak4642.o snd-soc-ak4671-objs := ak4671.o snd-soc-ak5386-objs := ak5386.o +snd-soc-ak5558-objs := ak5558.o snd-soc-arizona-objs := arizona.o snd-soc-bt-sco-objs := bt-sco.o snd-soc-cq93vc-objs := cq93vc.o @@ -277,6 +278,7 @@ obj-$(CONFIG_SND_SOC_AK4641) += snd-soc-ak4641.o obj-$(CONFIG_SND_SOC_AK4642) += snd-soc-ak4642.o obj-$(CONFIG_SND_SOC_AK4671) += snd-soc-ak4671.o obj-$(CONFIG_SND_SOC_AK5386) += snd-soc-ak5386.o +obj-$(CONFIG_SND_SOC_AK5558) += snd-soc-ak5558.o obj-$(CONFIG_SND_SOC_ALC5623) += snd-soc-alc5623.o obj-$(CONFIG_SND_SOC_ALC5632) += snd-soc-alc5632.o obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o diff --git a/sound/soc/codecs/ak5558.c b/sound/soc/codecs/ak5558.c new file mode 100644 index 0000000..c1eed82 --- /dev/null +++ b/sound/soc/codecs/ak5558.c @@ -0,0 +1,618 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Audio driver for AK5558 ADC + * + * Copyright (C) 2015 Asahi Kasei Microdevices Corporation + * Copyright 2018 NXP + */ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/slab.h> + +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/tlv.h> + +#include "ak5558.h" + +/* AK5558 Codec Private Data */ +struct ak5558_priv { + struct snd_soc_codec codec; + struct regmap *regmap; + struct i2c_client *i2c; + int fs; /* Sampling Frequency */ + int rclk; /* Master Clock */ + struct gpio_desc *reset_gpiod; /* Reset & Power down GPIO */ + int slots; + int slot_width; +}; + +/* ak5558 register cache & default register settings */ +static const struct reg_default ak5558_reg[] = { + { 0x0, 0xFF }, /* 0x00 AK5558_00_POWER_MANAGEMENT1 */ + { 0x1, 0x01 }, /* 0x01 AK5558_01_POWER_MANAGEMENT2 */ + { 0x2, 0x01 }, /* 0x02 AK5558_02_CONTROL1 */ + { 0x3, 0x00 }, /* 0x03 AK5558_03_CONTROL2 */ + { 0x4, 0x00 }, /* 0x04 AK5558_04_CONTROL3 */ + { 0x5, 0x00 } /* 0x05 AK5558_05_DSD */ +}; + +static const char * const mono_texts[] = { + "8 Slot", "2 Slot", "4 Slot", "1 Slot", +}; + +static const struct soc_enum ak5558_mono_enum[] = { + SOC_ENUM_SINGLE(AK5558_01_POWER_MANAGEMENT2, 1, + ARRAY_SIZE(mono_texts), mono_texts) +}; + +static const char * const tdm_texts[] = { + "Off", "TDM128", "TDM256", "TDM512", +}; + +static const char * const digfil_texts[] = { + "Sharp Roll-Off", "Show Roll-Off", + "Short Delay Sharp Roll-Off", "Short Delay Show Roll-Off", +}; + +static const struct soc_enum ak5558_adcset_enum[] = { + SOC_ENUM_SINGLE(AK5558_03_CONTROL2, 5, + ARRAY_SIZE(tdm_texts), tdm_texts), + SOC_ENUM_SINGLE(AK5558_04_CONTROL3, 0, + ARRAY_SIZE(digfil_texts), digfil_texts), +}; + +static const char * const dsdon_texts[] = { + "PCM", "DSD", +}; + +static const char * const dsdsel_texts[] = { + "64fs", "128fs", "256fs" +}; + +static const char * const dckb_texts[] = { + "Falling", "Rising", +}; + +static const char * const dcks_texts[] = { + "512fs", "768fs", +}; + +static const struct soc_enum ak5558_dsdset_enum[] = { + SOC_ENUM_SINGLE(AK5558_04_CONTROL3, 7, + ARRAY_SIZE(dsdon_texts), dsdon_texts), + SOC_ENUM_SINGLE(AK5558_05_DSD, 0, + ARRAY_SIZE(dsdsel_texts), dsdsel_texts), + SOC_ENUM_SINGLE(AK5558_05_DSD, 2, ARRAY_SIZE(dckb_texts), dckb_texts), + SOC_ENUM_SINGLE(AK5558_05_DSD, 5, ARRAY_SIZE(dcks_texts), dcks_texts), +}; + +static const struct snd_kcontrol_new ak5558_snd_controls[] = { + SOC_ENUM("AK5558 Monaural Mode", ak5558_mono_enum[0]), + SOC_ENUM("AK5558 TDM mode", ak5558_adcset_enum[0]), + SOC_ENUM("AK5558 Digital Filter", ak5558_adcset_enum[1]), + + SOC_ENUM("AK5558 DSD Mode", ak5558_dsdset_enum[0]), + SOC_ENUM("AK5558 Frequency of DCLK", ak5558_dsdset_enum[1]), + SOC_ENUM("AK5558 Polarity of DCLK", ak5558_dsdset_enum[2]), + SOC_ENUM("AK5558 Master Clock Frequency at DSD Mode", + ak5558_dsdset_enum[3]), + + SOC_SINGLE("AK5558 DSD Phase Modulation", AK5558_05_DSD, 3, 1, 0), +}; + +static const char * const ak5558_channel_select_texts[] = {"Off", "On"}; + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel1_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel1_mux_control = + SOC_DAPM_ENUM("Ch1 Switch", ak5558_channel1_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel2_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel2_mux_control = + SOC_DAPM_ENUM("Ch2 Switch", ak5558_channel2_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel3_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel3_mux_control = + SOC_DAPM_ENUM("Ch3 Switch", ak5558_channel3_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel4_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel4_mux_control = + SOC_DAPM_ENUM("Ch4 Switch", ak5558_channel4_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel5_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel5_mux_control = + SOC_DAPM_ENUM("Ch5 Switch", ak5558_channel5_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel6_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel6_mux_control = + SOC_DAPM_ENUM("Ch6 Switch", ak5558_channel6_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel7_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel7_mux_control = + SOC_DAPM_ENUM("Ch7 Switch", ak5558_channel7_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel8_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel8_mux_control = + SOC_DAPM_ENUM("Ch8 Switch", ak5558_channel8_mux_enum); + +static const struct snd_soc_dapm_widget ak5558_dapm_widgets[] = { + /* Analog Input */ + SND_SOC_DAPM_INPUT("AIN1"), + SND_SOC_DAPM_INPUT("AIN2"), + SND_SOC_DAPM_INPUT("AIN3"), + SND_SOC_DAPM_INPUT("AIN4"), + SND_SOC_DAPM_INPUT("AIN5"), + SND_SOC_DAPM_INPUT("AIN6"), + SND_SOC_DAPM_INPUT("AIN7"), + SND_SOC_DAPM_INPUT("AIN8"), + + SND_SOC_DAPM_MUX("AK5558 Ch1 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel1_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch2 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel2_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch3 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel3_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch4 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel4_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch5 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel5_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch6 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel6_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch7 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel7_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch8 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel8_mux_control), + + SND_SOC_DAPM_ADC("ADC Ch1", NULL, AK5558_00_POWER_MANAGEMENT1, 0, 0), + SND_SOC_DAPM_ADC("ADC Ch2", NULL, AK5558_00_POWER_MANAGEMENT1, 1, 0), + SND_SOC_DAPM_ADC("ADC Ch3", NULL, AK5558_00_POWER_MANAGEMENT1, 2, 0), + SND_SOC_DAPM_ADC("ADC Ch4", NULL, AK5558_00_POWER_MANAGEMENT1, 3, 0), + SND_SOC_DAPM_ADC("ADC Ch5", NULL, AK5558_00_POWER_MANAGEMENT1, 4, 0), + SND_SOC_DAPM_ADC("ADC Ch6", NULL, AK5558_00_POWER_MANAGEMENT1, 5, 0), + SND_SOC_DAPM_ADC("ADC Ch7", NULL, AK5558_00_POWER_MANAGEMENT1, 6, 0), + SND_SOC_DAPM_ADC("ADC Ch8", NULL, AK5558_00_POWER_MANAGEMENT1, 7, 0), + + SND_SOC_DAPM_AIF_OUT("SDTO", "Capture", 0, SND_SOC_NOPM, 0, 0), +}; + +static const struct snd_soc_dapm_route ak5558_intercon[] = { + {"AK5558 Ch1 Enable", "On", "AIN1"}, + {"ADC Ch1", NULL, "AK5558 Ch1 Enable"}, + {"SDTO", NULL, "ADC Ch1"}, + + {"AK5558 Ch2 Enable", "On", "AIN2"}, + {"ADC Ch2", NULL, "AK5558 Ch2 Enable"}, + {"SDTO", NULL, "ADC Ch2"}, + + {"AK5558 Ch3 Enable", "On", "AIN3"}, + {"ADC Ch3", NULL, "AK5558 Ch3 Enable"}, + {"SDTO", NULL, "ADC Ch3"}, + + {"AK5558 Ch4 Enable", "On", "AIN4"}, + {"ADC Ch4", NULL, "AK5558 Ch4 Enable"}, + {"SDTO", NULL, "ADC Ch4"}, + + {"AK5558 Ch5 Enable", "On", "AIN5"}, + {"ADC Ch5", NULL, "AK5558 Ch5 Enable"}, + {"SDTO", NULL, "ADC Ch5"}, + + {"AK5558 Ch6 Enable", "On", "AIN6"}, + {"ADC Ch6", NULL, "AK5558 Ch6 Enable"}, + {"SDTO", NULL, "ADC Ch6"}, + + {"AK5558 Ch7 Enable", "On", "AIN7"}, + {"ADC Ch7", NULL, "AK5558 Ch7 Enable"}, + {"SDTO", NULL, "ADC Ch7"}, + + {"AK5558 Ch8 Enable", "On", "AIN8"}, + {"ADC Ch8", NULL, "AK5558 Ch8 Enable"}, + {"SDTO", NULL, "ADC Ch8"}, +}; + +static int ak5558_set_mcki(struct snd_soc_codec *codec, int fs, int rclk) +{ + u8 mode; + + mode = snd_soc_read(codec, AK5558_02_CONTROL1); + mode &= ~AK5558_CKS; + mode |= AK5558_CKS_AUTO; + + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, mode); + + return 0; +} + +static int ak5558_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + u8 bits; + int pcm_width = max(params_physical_width(params), ak5558->slot_width); + + /* set master/slave audio interface */ + bits = snd_soc_read(codec, AK5558_02_CONTROL1); + bits &= ~AK5558_BITS; + + switch (pcm_width) { + case 16: + bits |= AK5558_DIF_24BIT_MODE; + break; + case 32: + bits |= AK5558_DIF_32BIT_MODE; + break; + default: + return -EINVAL; + } + + ak5558->fs = params_rate(params); + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_BITS, bits); + + ak5558_set_mcki(codec, ak5558->fs, ak5558->rclk); + + return 0; +} + +static int ak5558_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + ak5558->rclk = freq; + ak5558_set_mcki(codec, ak5558->fs, ak5558->rclk); + + return 0; +} + +static int ak5558_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + struct snd_soc_codec *codec = dai->codec; + u8 format; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + break; + case SND_SOC_DAIFMT_CBM_CFM: + break; + case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBM_CFS: + default: + dev_err(dai->dev, "Clock mode unsupported"); + return -EINVAL; + } + + /* set master/slave audio interface */ + format = snd_soc_read(codec, AK5558_02_CONTROL1); + format &= ~AK5558_DIF; + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + format |= AK5558_DIF_I2S_MODE; + break; + case SND_SOC_DAIFMT_LEFT_J: + format |= AK5558_DIF_MSB_MODE; + break; + case SND_SOC_DAIFMT_DSP_B: + format |= AK5558_DIF_MSB_MODE; + break; + default: + return -EINVAL; + } + + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_DIF, format); + + return 0; +} + +static int ak5558_set_dai_mute(struct snd_soc_dai *dai, int mute) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + int ndt = 0; + + if (!mute) + return 0; + + if (ak5558->fs != 0) + ndt = 583000 / ak5558->fs; + + msleep(max(ndt, 5)); + + return 0; +} + +static int ak5558_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + switch (level) { + case SND_SOC_BIAS_ON: + case SND_SOC_BIAS_PREPARE: + case SND_SOC_BIAS_STANDBY: + break; + case SND_SOC_BIAS_OFF: + snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x00); + break; + } + return 0; +} + +static int ak5558_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, + unsigned int rx_mask, int slots, + int slot_width) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + int tdm_mode; + int reg; + + ak5558->slots = slots; + ak5558->slot_width = slot_width; + + switch (slots * slot_width) { + case 128: + tdm_mode = AK5558_MODE_TDM128; + break; + case 256: + tdm_mode = AK5558_MODE_TDM256; + break; + case 512: + tdm_mode = AK5558_MODE_TDM512; + break; + default: + tdm_mode = AK5558_MODE_NORMAL; + break; + } + + reg = snd_soc_read(codec, AK5558_03_CONTROL2); + reg &= ~AK5558_MODE_BITS; + reg |= tdm_mode; + snd_soc_write(codec, AK5558_03_CONTROL2, reg); + + return 0; +} + +#define AK5558_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ + SNDRV_PCM_FMTBIT_S24_LE |\ + SNDRV_PCM_FMTBIT_S32_LE) + +static const unsigned int ak5558_rates[] = { + 8000, 11025, 16000, 22050, + 32000, 44100, 48000, 88200, + 96000, 176400, 192000, 352800, + 384000, 705600, 768000, 1411200, + 2822400, +}; + +static const struct snd_pcm_hw_constraint_list ak5558_rate_constraints = { + .count = ARRAY_SIZE(ak5558_rates), + .list = ak5558_rates, +}; + +static int ak5558_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + return snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &ak5558_rate_constraints); +} + +static struct snd_soc_dai_ops ak5558_dai_ops = { + .startup = ak5558_startup, + .hw_params = ak5558_hw_params, + + .set_sysclk = ak5558_set_dai_sysclk, + .set_fmt = ak5558_set_dai_fmt, + .digital_mute = ak5558_set_dai_mute, + .set_tdm_slot = ak5558_set_tdm_slot, +}; + +static struct snd_soc_dai_driver ak5558_dai = { + .name = "ak5558-aif", + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 8, + .rates = SNDRV_PCM_RATE_KNOT, + .formats = AK5558_FORMATS, + }, + .ops = &ak5558_dai_ops, +}; + +static void ak5558_power_off(struct ak5558_priv *ak5558) +{ + if (!ak5558->reset_gpiod) + return; + + gpiod_set_value_cansleep(ak5558->reset_gpiod, 0); + usleep_range(1000, 2000); +} + +static void ak5558_power_on(struct ak5558_priv *ak5558) +{ + if (!ak5558->reset_gpiod) + return; + + gpiod_set_value_cansleep(ak5558->reset_gpiod, 1); + usleep_range(1000, 2000); +} + +static int ak5558_init_reg(struct snd_soc_codec *codec) +{ + int ret; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + usleep_range(10000, 11000); + + ak5558_power_off(ak5558); + ak5558_power_on(ak5558); + + ret = snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x0); + if (ret < 0) + return ret; + + return snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, + AK5558_CKS_AUTO); +} + +static int ak5558_probe(struct snd_soc_codec *codec) +{ + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + ak5558->fs = 48000; + ak5558->rclk = 0; + + return ak5558_init_reg(codec); +} + +static int ak5558_remove(struct snd_soc_codec *codec) +{ + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + ak5558_set_bias_level(codec, SND_SOC_BIAS_OFF); + ak5558_power_off(ak5558); + + return 0; +} + + +static int __maybe_unused ak5558_runtime_suspend(struct device *dev) +{ + struct ak5558_priv *ak5558 = dev_get_drvdata(dev); + + regcache_cache_only(ak5558->regmap, true); + ak5558_power_off(ak5558); + + return 0; +} + +static int __maybe_unused ak5558_runtime_resume(struct device *dev) +{ + struct ak5558_priv *ak5558 = dev_get_drvdata(dev); + + ak5558_power_off(ak5558); + ak5558_power_on(ak5558); + + regcache_cache_only(ak5558->regmap, false); + regcache_mark_dirty(ak5558->regmap); + + return regcache_sync(ak5558->regmap); +} + +const struct dev_pm_ops ak5558_pm = { + SET_RUNTIME_PM_OPS(ak5558_runtime_suspend, ak5558_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +}; + +struct snd_soc_codec_driver soc_codec_dev_ak5558 = { + .probe = ak5558_probe, + .remove = ak5558_remove, + .idle_bias_off = true, + .set_bias_level = ak5558_set_bias_level, + + .component_driver = { + .controls = ak5558_snd_controls, + .num_controls = ARRAY_SIZE(ak5558_snd_controls), + .dapm_widgets = ak5558_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ak5558_dapm_widgets), + .dapm_routes = ak5558_intercon, + .num_dapm_routes = ARRAY_SIZE(ak5558_intercon), + }, +}; + +static const struct regmap_config ak5558_regmap = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = AK5558_05_DSD, + .reg_defaults = ak5558_reg, + .num_reg_defaults = ARRAY_SIZE(ak5558_reg), + .cache_type = REGCACHE_RBTREE, +}; + +static int ak5558_i2c_probe(struct i2c_client *i2c) +{ + struct ak5558_priv *ak5558; + int ret = 0; + + ak5558 = devm_kzalloc(&i2c->dev, sizeof(*ak5558), GFP_KERNEL); + if (!ak5558) + return -ENOMEM; + + ak5558->regmap = devm_regmap_init_i2c(i2c, &ak5558_regmap); + if (IS_ERR(ak5558->regmap)) + return PTR_ERR(ak5558->regmap); + + i2c_set_clientdata(i2c, ak5558); + ak5558->i2c = i2c; + + ak5558->reset_gpiod = devm_gpiod_get_optional(&i2c->dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(ak5558->reset_gpiod)) + return PTR_ERR(ak5558->reset_gpiod); + + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak5558, + &ak5558_dai, 1); + if (ret) + return ret; + + pm_runtime_enable(&i2c->dev); + + return 0; +} + +static int ak5558_i2c_remove(struct i2c_client *i2c) +{ + snd_soc_unregister_codec(&i2c->dev); + pm_runtime_disable(&i2c->dev); + + return 0; +} + +static const struct of_device_id ak5558_i2c_dt_ids[] = { + { .compatible = "asahi-kasei,ak5558"}, + { } +}; + +static struct i2c_driver ak5558_i2c_driver = { + .driver = { + .name = "ak5558", + .of_match_table = of_match_ptr(ak5558_i2c_dt_ids), + .pm = &ak5558_pm, + }, + .probe_new = ak5558_i2c_probe, + .remove = ak5558_i2c_remove, +}; + +module_i2c_driver(ak5558_i2c_driver); + +MODULE_AUTHOR("Junichi Wakasugi <wakasugi.jb@om.asahi-kasei.co.jp>"); +MODULE_AUTHOR("Mihai Serban <mihai.serban@nxp.com>"); +MODULE_DESCRIPTION("ASoC AK5558 ADC driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/ak5558.h b/sound/soc/codecs/ak5558.h new file mode 100644 index 0000000..2ed4c7c --- /dev/null +++ b/sound/soc/codecs/ak5558.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Audio driver header for AK5558 + * + * Copyright (C) 2016 Asahi Kasei Microdevices Corporation + * Copyright 2018 NXP + */ + +#ifndef _AK5558_H +#define _AK5558_H + +#define AK5558_00_POWER_MANAGEMENT1 0x00 +#define AK5558_01_POWER_MANAGEMENT2 0x01 +#define AK5558_02_CONTROL1 0x02 +#define AK5558_03_CONTROL2 0x03 +#define AK5558_04_CONTROL3 0x04 +#define AK5558_05_DSD 0x05 + +/* AK5558_02_CONTROL1 fields */ +#define AK5558_DIF GENMASK(1, 1) +#define AK5558_DIF_MSB_MODE (0 << 1) +#define AK5558_DIF_I2S_MODE (1 << 1) + +#define AK5558_BITS GENMASK(2, 2) +#define AK5558_DIF_24BIT_MODE (0 << 2) +#define AK5558_DIF_32BIT_MODE (1 << 2) + +#define AK5558_CKS GENMASK(6, 3) +#define AK5558_CKS_128FS_192KHZ (0 << 3) +#define AK5558_CKS_192FS_192KHZ (1 << 3) +#define AK5558_CKS_256FS_48KHZ (2 << 3) +#define AK5558_CKS_256FS_96KHZ (3 << 3) +#define AK5558_CKS_384FS_96KHZ (4 << 3) +#define AK5558_CKS_384FS_48KHZ (5 << 3) +#define AK5558_CKS_512FS_48KHZ (6 << 3) +#define AK5558_CKS_768FS_48KHZ (7 << 3) +#define AK5558_CKS_64FS_384KHZ (8 << 3) +#define AK5558_CKS_32FS_768KHZ (9 << 3) +#define AK5558_CKS_96FS_384KHZ (10 << 3) +#define AK5558_CKS_48FS_768KHZ (11 << 3) +#define AK5558_CKS_64FS_768KHZ (12 << 3) +#define AK5558_CKS_1024FS_16KHZ (13 << 3) +#define AK5558_CKS_AUTO (15 << 3) + +/* AK5558_03_CONTROL2 fields */ +#define AK5558_MODE_BITS GENMASK(6, 5) +#define AK5558_MODE_NORMAL (0 << 5) +#define AK5558_MODE_TDM128 (1 << 5) +#define AK5558_MODE_TDM256 (2 << 5) +#define AK5558_MODE_TDM512 (3 << 5) + +#endif -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver 2018-02-05 17:01 ` [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver Daniel Baluta @ 2018-02-05 20:27 ` Fabio Estevam [not found] ` <1517850115-24340-2-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> 2018-02-12 12:02 ` Mark Brown 2 siblings, 0 replies; 11+ messages in thread From: Fabio Estevam @ 2018-02-05 20:27 UTC (permalink / raw) To: Daniel Baluta Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, alsa-devel, Rob Herring, shengjiu.wang, linux-kernel, wakasugi.jb, Fabio Estevam, Andy Shevchenko, Mark Brown, NXP Linux Team, cosmin.samoila, Mihai Serban, Mihai Serban On Mon, Feb 5, 2018 at 3:01 PM, Daniel Baluta <daniel.baluta@nxp.com> wrote: > AK5558 is a 32-bit, 768 kHZ sampling, differential input ADC > for digital audio systems. > > Datasheet is available at: > > https://www.akm.com/akm/en/file/datasheet/AK5558VN.pdf > > Initial patch includes support for normal and TDM modes. > > Signed-off-by: Junichi Wakasugi <wakasugi.jb@om.asahi-kasei.co.jp> > [initial coding for 3.18 kernel] > Signed-off-by: Mihai Serban <mihai.serban@nxp.com> > [cleanups and porting to 4.9 kernel] > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > [tdm support] > Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> > [pm support, cleanups and porting to latest kernel] Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <1517850115-24340-2-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org>]
* Re: [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver [not found] ` <1517850115-24340-2-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> @ 2018-02-06 14:12 ` Andy Shevchenko 0 siblings, 0 replies; 11+ messages in thread From: Andy Shevchenko @ 2018-02-06 14:12 UTC (permalink / raw) To: Daniel Baluta Cc: Mark Brown, ALSA Development Mailing List, devicetree, Linux Kernel Mailing List, wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8, S.j. Wang, Mihai Serban, Cosmin Samoila, dl-linux-imx, Fabio Estevam, Rob Herring, Mihai Serban On Mon, Feb 5, 2018 at 7:01 PM, Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> wrote: > AK5558 is a 32-bit, 768 kHZ sampling, differential input ADC > for digital audio systems. > > Datasheet is available at: > > https://www.akm.com/akm/en/file/datasheet/AK5558VN.pdf > > Initial patch includes support for normal and TDM modes. > > Signed-off-by: Junichi Wakasugi <wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8@public.gmane.org> > [initial coding for 3.18 kernel] > Signed-off-by: Mihai Serban <mihai.serban-3arQi8VN3Tc@public.gmane.org> > [cleanups and porting to 4.9 kernel] > Signed-off-by: Shengjiu Wang <shengjiu.wang-3arQi8VN3Tc@public.gmane.org> > [tdm support] > Signed-off-by: Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> > [pm support, cleanups and porting to latest kernel] Reviewed-by: Andy Shevchenko <andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > sound/soc/codecs/Kconfig | 6 + > sound/soc/codecs/Makefile | 2 + > sound/soc/codecs/ak5558.c | 618 ++++++++++++++++++++++++++++++++++++++++++++++ > sound/soc/codecs/ak5558.h | 52 ++++ > 4 files changed, 678 insertions(+) > create mode 100644 sound/soc/codecs/ak5558.c > create mode 100644 sound/soc/codecs/ak5558.h > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > index 2b331f7..c29728c 100644 > --- a/sound/soc/codecs/Kconfig > +++ b/sound/soc/codecs/Kconfig > @@ -42,6 +42,7 @@ config SND_SOC_ALL_CODECS > select SND_SOC_AK4642 if I2C > select SND_SOC_AK4671 if I2C > select SND_SOC_AK5386 > + select SND_SOC_AK5558 if I2C > select SND_SOC_ALC5623 if I2C > select SND_SOC_ALC5632 if I2C > select SND_SOC_BT_SCO > @@ -398,6 +399,11 @@ config SND_SOC_AK4671 > config SND_SOC_AK5386 > tristate "AKM AK5638 CODEC" > > +config SND_SOC_AK5558 > + tristate "AKM AK5558 CODEC" > + depends on I2C > + select REGMAP_I2C > + > config SND_SOC_ALC5623 > tristate "Realtek ALC5623 CODEC" > depends on I2C > diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile > index da15713..3e71d40 100644 > --- a/sound/soc/codecs/Makefile > +++ b/sound/soc/codecs/Makefile > @@ -34,6 +34,7 @@ snd-soc-ak4641-objs := ak4641.o > snd-soc-ak4642-objs := ak4642.o > snd-soc-ak4671-objs := ak4671.o > snd-soc-ak5386-objs := ak5386.o > +snd-soc-ak5558-objs := ak5558.o > snd-soc-arizona-objs := arizona.o > snd-soc-bt-sco-objs := bt-sco.o > snd-soc-cq93vc-objs := cq93vc.o > @@ -277,6 +278,7 @@ obj-$(CONFIG_SND_SOC_AK4641) += snd-soc-ak4641.o > obj-$(CONFIG_SND_SOC_AK4642) += snd-soc-ak4642.o > obj-$(CONFIG_SND_SOC_AK4671) += snd-soc-ak4671.o > obj-$(CONFIG_SND_SOC_AK5386) += snd-soc-ak5386.o > +obj-$(CONFIG_SND_SOC_AK5558) += snd-soc-ak5558.o > obj-$(CONFIG_SND_SOC_ALC5623) += snd-soc-alc5623.o > obj-$(CONFIG_SND_SOC_ALC5632) += snd-soc-alc5632.o > obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o > diff --git a/sound/soc/codecs/ak5558.c b/sound/soc/codecs/ak5558.c > new file mode 100644 > index 0000000..c1eed82 > --- /dev/null > +++ b/sound/soc/codecs/ak5558.c > @@ -0,0 +1,618 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Audio driver for AK5558 ADC > + * > + * Copyright (C) 2015 Asahi Kasei Microdevices Corporation > + * Copyright 2018 NXP > + */ > + > +#include <linux/delay.h> > +#include <linux/gpio/consumer.h> > +#include <linux/i2c.h> > +#include <linux/module.h> > +#include <linux/pm_runtime.h> > +#include <linux/regmap.h> > +#include <linux/slab.h> > + > +#include <sound/initval.h> > +#include <sound/pcm.h> > +#include <sound/pcm_params.h> > +#include <sound/soc.h> > +#include <sound/soc-dapm.h> > +#include <sound/tlv.h> > + > +#include "ak5558.h" > + > +/* AK5558 Codec Private Data */ > +struct ak5558_priv { > + struct snd_soc_codec codec; > + struct regmap *regmap; > + struct i2c_client *i2c; > + int fs; /* Sampling Frequency */ > + int rclk; /* Master Clock */ > + struct gpio_desc *reset_gpiod; /* Reset & Power down GPIO */ > + int slots; > + int slot_width; > +}; > + > +/* ak5558 register cache & default register settings */ > +static const struct reg_default ak5558_reg[] = { > + { 0x0, 0xFF }, /* 0x00 AK5558_00_POWER_MANAGEMENT1 */ > + { 0x1, 0x01 }, /* 0x01 AK5558_01_POWER_MANAGEMENT2 */ > + { 0x2, 0x01 }, /* 0x02 AK5558_02_CONTROL1 */ > + { 0x3, 0x00 }, /* 0x03 AK5558_03_CONTROL2 */ > + { 0x4, 0x00 }, /* 0x04 AK5558_04_CONTROL3 */ > + { 0x5, 0x00 } /* 0x05 AK5558_05_DSD */ > +}; > + > +static const char * const mono_texts[] = { > + "8 Slot", "2 Slot", "4 Slot", "1 Slot", > +}; > + > +static const struct soc_enum ak5558_mono_enum[] = { > + SOC_ENUM_SINGLE(AK5558_01_POWER_MANAGEMENT2, 1, > + ARRAY_SIZE(mono_texts), mono_texts) > +}; > + > +static const char * const tdm_texts[] = { > + "Off", "TDM128", "TDM256", "TDM512", > +}; > + > +static const char * const digfil_texts[] = { > + "Sharp Roll-Off", "Show Roll-Off", > + "Short Delay Sharp Roll-Off", "Short Delay Show Roll-Off", > +}; > + > +static const struct soc_enum ak5558_adcset_enum[] = { > + SOC_ENUM_SINGLE(AK5558_03_CONTROL2, 5, > + ARRAY_SIZE(tdm_texts), tdm_texts), > + SOC_ENUM_SINGLE(AK5558_04_CONTROL3, 0, > + ARRAY_SIZE(digfil_texts), digfil_texts), > +}; > + > +static const char * const dsdon_texts[] = { > + "PCM", "DSD", > +}; > + > +static const char * const dsdsel_texts[] = { > + "64fs", "128fs", "256fs" > +}; > + > +static const char * const dckb_texts[] = { > + "Falling", "Rising", > +}; > + > +static const char * const dcks_texts[] = { > + "512fs", "768fs", > +}; > + > +static const struct soc_enum ak5558_dsdset_enum[] = { > + SOC_ENUM_SINGLE(AK5558_04_CONTROL3, 7, > + ARRAY_SIZE(dsdon_texts), dsdon_texts), > + SOC_ENUM_SINGLE(AK5558_05_DSD, 0, > + ARRAY_SIZE(dsdsel_texts), dsdsel_texts), > + SOC_ENUM_SINGLE(AK5558_05_DSD, 2, ARRAY_SIZE(dckb_texts), dckb_texts), > + SOC_ENUM_SINGLE(AK5558_05_DSD, 5, ARRAY_SIZE(dcks_texts), dcks_texts), > +}; > + > +static const struct snd_kcontrol_new ak5558_snd_controls[] = { > + SOC_ENUM("AK5558 Monaural Mode", ak5558_mono_enum[0]), > + SOC_ENUM("AK5558 TDM mode", ak5558_adcset_enum[0]), > + SOC_ENUM("AK5558 Digital Filter", ak5558_adcset_enum[1]), > + > + SOC_ENUM("AK5558 DSD Mode", ak5558_dsdset_enum[0]), > + SOC_ENUM("AK5558 Frequency of DCLK", ak5558_dsdset_enum[1]), > + SOC_ENUM("AK5558 Polarity of DCLK", ak5558_dsdset_enum[2]), > + SOC_ENUM("AK5558 Master Clock Frequency at DSD Mode", > + ak5558_dsdset_enum[3]), > + > + SOC_SINGLE("AK5558 DSD Phase Modulation", AK5558_05_DSD, 3, 1, 0), > +}; > + > +static const char * const ak5558_channel_select_texts[] = {"Off", "On"}; > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel1_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel1_mux_control = > + SOC_DAPM_ENUM("Ch1 Switch", ak5558_channel1_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel2_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel2_mux_control = > + SOC_DAPM_ENUM("Ch2 Switch", ak5558_channel2_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel3_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel3_mux_control = > + SOC_DAPM_ENUM("Ch3 Switch", ak5558_channel3_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel4_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel4_mux_control = > + SOC_DAPM_ENUM("Ch4 Switch", ak5558_channel4_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel5_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel5_mux_control = > + SOC_DAPM_ENUM("Ch5 Switch", ak5558_channel5_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel6_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel6_mux_control = > + SOC_DAPM_ENUM("Ch6 Switch", ak5558_channel6_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel7_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel7_mux_control = > + SOC_DAPM_ENUM("Ch7 Switch", ak5558_channel7_mux_enum); > + > +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel8_mux_enum, > + ak5558_channel_select_texts); > + > +static const struct snd_kcontrol_new ak5558_channel8_mux_control = > + SOC_DAPM_ENUM("Ch8 Switch", ak5558_channel8_mux_enum); > + > +static const struct snd_soc_dapm_widget ak5558_dapm_widgets[] = { > + /* Analog Input */ > + SND_SOC_DAPM_INPUT("AIN1"), > + SND_SOC_DAPM_INPUT("AIN2"), > + SND_SOC_DAPM_INPUT("AIN3"), > + SND_SOC_DAPM_INPUT("AIN4"), > + SND_SOC_DAPM_INPUT("AIN5"), > + SND_SOC_DAPM_INPUT("AIN6"), > + SND_SOC_DAPM_INPUT("AIN7"), > + SND_SOC_DAPM_INPUT("AIN8"), > + > + SND_SOC_DAPM_MUX("AK5558 Ch1 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel1_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch2 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel2_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch3 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel3_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch4 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel4_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch5 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel5_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch6 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel6_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch7 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel7_mux_control), > + SND_SOC_DAPM_MUX("AK5558 Ch8 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel8_mux_control), > + > + SND_SOC_DAPM_ADC("ADC Ch1", NULL, AK5558_00_POWER_MANAGEMENT1, 0, 0), > + SND_SOC_DAPM_ADC("ADC Ch2", NULL, AK5558_00_POWER_MANAGEMENT1, 1, 0), > + SND_SOC_DAPM_ADC("ADC Ch3", NULL, AK5558_00_POWER_MANAGEMENT1, 2, 0), > + SND_SOC_DAPM_ADC("ADC Ch4", NULL, AK5558_00_POWER_MANAGEMENT1, 3, 0), > + SND_SOC_DAPM_ADC("ADC Ch5", NULL, AK5558_00_POWER_MANAGEMENT1, 4, 0), > + SND_SOC_DAPM_ADC("ADC Ch6", NULL, AK5558_00_POWER_MANAGEMENT1, 5, 0), > + SND_SOC_DAPM_ADC("ADC Ch7", NULL, AK5558_00_POWER_MANAGEMENT1, 6, 0), > + SND_SOC_DAPM_ADC("ADC Ch8", NULL, AK5558_00_POWER_MANAGEMENT1, 7, 0), > + > + SND_SOC_DAPM_AIF_OUT("SDTO", "Capture", 0, SND_SOC_NOPM, 0, 0), > +}; > + > +static const struct snd_soc_dapm_route ak5558_intercon[] = { > + {"AK5558 Ch1 Enable", "On", "AIN1"}, > + {"ADC Ch1", NULL, "AK5558 Ch1 Enable"}, > + {"SDTO", NULL, "ADC Ch1"}, > + > + {"AK5558 Ch2 Enable", "On", "AIN2"}, > + {"ADC Ch2", NULL, "AK5558 Ch2 Enable"}, > + {"SDTO", NULL, "ADC Ch2"}, > + > + {"AK5558 Ch3 Enable", "On", "AIN3"}, > + {"ADC Ch3", NULL, "AK5558 Ch3 Enable"}, > + {"SDTO", NULL, "ADC Ch3"}, > + > + {"AK5558 Ch4 Enable", "On", "AIN4"}, > + {"ADC Ch4", NULL, "AK5558 Ch4 Enable"}, > + {"SDTO", NULL, "ADC Ch4"}, > + > + {"AK5558 Ch5 Enable", "On", "AIN5"}, > + {"ADC Ch5", NULL, "AK5558 Ch5 Enable"}, > + {"SDTO", NULL, "ADC Ch5"}, > + > + {"AK5558 Ch6 Enable", "On", "AIN6"}, > + {"ADC Ch6", NULL, "AK5558 Ch6 Enable"}, > + {"SDTO", NULL, "ADC Ch6"}, > + > + {"AK5558 Ch7 Enable", "On", "AIN7"}, > + {"ADC Ch7", NULL, "AK5558 Ch7 Enable"}, > + {"SDTO", NULL, "ADC Ch7"}, > + > + {"AK5558 Ch8 Enable", "On", "AIN8"}, > + {"ADC Ch8", NULL, "AK5558 Ch8 Enable"}, > + {"SDTO", NULL, "ADC Ch8"}, > +}; > + > +static int ak5558_set_mcki(struct snd_soc_codec *codec, int fs, int rclk) > +{ > + u8 mode; > + > + mode = snd_soc_read(codec, AK5558_02_CONTROL1); > + mode &= ~AK5558_CKS; > + mode |= AK5558_CKS_AUTO; > + > + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, mode); > + > + return 0; > +} > + > +static int ak5558_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params, > + struct snd_soc_dai *dai) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + u8 bits; > + int pcm_width = max(params_physical_width(params), ak5558->slot_width); > + > + /* set master/slave audio interface */ > + bits = snd_soc_read(codec, AK5558_02_CONTROL1); > + bits &= ~AK5558_BITS; > + > + switch (pcm_width) { > + case 16: > + bits |= AK5558_DIF_24BIT_MODE; > + break; > + case 32: > + bits |= AK5558_DIF_32BIT_MODE; > + break; > + default: > + return -EINVAL; > + } > + > + ak5558->fs = params_rate(params); > + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_BITS, bits); > + > + ak5558_set_mcki(codec, ak5558->fs, ak5558->rclk); > + > + return 0; > +} > + > +static int ak5558_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, > + unsigned int freq, int dir) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + > + ak5558->rclk = freq; > + ak5558_set_mcki(codec, ak5558->fs, ak5558->rclk); > + > + return 0; > +} > + > +static int ak5558_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) > +{ > + struct snd_soc_codec *codec = dai->codec; > + u8 format; > + > + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { > + case SND_SOC_DAIFMT_CBS_CFS: > + break; > + case SND_SOC_DAIFMT_CBM_CFM: > + break; > + case SND_SOC_DAIFMT_CBS_CFM: > + case SND_SOC_DAIFMT_CBM_CFS: > + default: > + dev_err(dai->dev, "Clock mode unsupported"); > + return -EINVAL; > + } > + > + /* set master/slave audio interface */ > + format = snd_soc_read(codec, AK5558_02_CONTROL1); > + format &= ~AK5558_DIF; > + > + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { > + case SND_SOC_DAIFMT_I2S: > + format |= AK5558_DIF_I2S_MODE; > + break; > + case SND_SOC_DAIFMT_LEFT_J: > + format |= AK5558_DIF_MSB_MODE; > + break; > + case SND_SOC_DAIFMT_DSP_B: > + format |= AK5558_DIF_MSB_MODE; > + break; > + default: > + return -EINVAL; > + } > + > + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_DIF, format); > + > + return 0; > +} > + > +static int ak5558_set_dai_mute(struct snd_soc_dai *dai, int mute) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + int ndt = 0; > + > + if (!mute) > + return 0; > + > + if (ak5558->fs != 0) > + ndt = 583000 / ak5558->fs; > + > + msleep(max(ndt, 5)); > + > + return 0; > +} > + > +static int ak5558_set_bias_level(struct snd_soc_codec *codec, > + enum snd_soc_bias_level level) > +{ > + switch (level) { > + case SND_SOC_BIAS_ON: > + case SND_SOC_BIAS_PREPARE: > + case SND_SOC_BIAS_STANDBY: > + break; > + case SND_SOC_BIAS_OFF: > + snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x00); > + break; > + } > + return 0; > +} > + > +static int ak5558_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, > + unsigned int rx_mask, int slots, > + int slot_width) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + int tdm_mode; > + int reg; > + > + ak5558->slots = slots; > + ak5558->slot_width = slot_width; > + > + switch (slots * slot_width) { > + case 128: > + tdm_mode = AK5558_MODE_TDM128; > + break; > + case 256: > + tdm_mode = AK5558_MODE_TDM256; > + break; > + case 512: > + tdm_mode = AK5558_MODE_TDM512; > + break; > + default: > + tdm_mode = AK5558_MODE_NORMAL; > + break; > + } > + > + reg = snd_soc_read(codec, AK5558_03_CONTROL2); > + reg &= ~AK5558_MODE_BITS; > + reg |= tdm_mode; > + snd_soc_write(codec, AK5558_03_CONTROL2, reg); > + > + return 0; > +} > + > +#define AK5558_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ > + SNDRV_PCM_FMTBIT_S24_LE |\ > + SNDRV_PCM_FMTBIT_S32_LE) > + > +static const unsigned int ak5558_rates[] = { > + 8000, 11025, 16000, 22050, > + 32000, 44100, 48000, 88200, > + 96000, 176400, 192000, 352800, > + 384000, 705600, 768000, 1411200, > + 2822400, > +}; > + > +static const struct snd_pcm_hw_constraint_list ak5558_rate_constraints = { > + .count = ARRAY_SIZE(ak5558_rates), > + .list = ak5558_rates, > +}; > + > +static int ak5558_startup(struct snd_pcm_substream *substream, > + struct snd_soc_dai *dai) > +{ > + return snd_pcm_hw_constraint_list(substream->runtime, 0, > + SNDRV_PCM_HW_PARAM_RATE, > + &ak5558_rate_constraints); > +} > + > +static struct snd_soc_dai_ops ak5558_dai_ops = { > + .startup = ak5558_startup, > + .hw_params = ak5558_hw_params, > + > + .set_sysclk = ak5558_set_dai_sysclk, > + .set_fmt = ak5558_set_dai_fmt, > + .digital_mute = ak5558_set_dai_mute, > + .set_tdm_slot = ak5558_set_tdm_slot, > +}; > + > +static struct snd_soc_dai_driver ak5558_dai = { > + .name = "ak5558-aif", > + .capture = { > + .stream_name = "Capture", > + .channels_min = 1, > + .channels_max = 8, > + .rates = SNDRV_PCM_RATE_KNOT, > + .formats = AK5558_FORMATS, > + }, > + .ops = &ak5558_dai_ops, > +}; > + > +static void ak5558_power_off(struct ak5558_priv *ak5558) > +{ > + if (!ak5558->reset_gpiod) > + return; > + > + gpiod_set_value_cansleep(ak5558->reset_gpiod, 0); > + usleep_range(1000, 2000); > +} > + > +static void ak5558_power_on(struct ak5558_priv *ak5558) > +{ > + if (!ak5558->reset_gpiod) > + return; > + > + gpiod_set_value_cansleep(ak5558->reset_gpiod, 1); > + usleep_range(1000, 2000); > +} > + > +static int ak5558_init_reg(struct snd_soc_codec *codec) > +{ > + int ret; > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + > + usleep_range(10000, 11000); > + > + ak5558_power_off(ak5558); > + ak5558_power_on(ak5558); > + > + ret = snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x0); > + if (ret < 0) > + return ret; > + > + return snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, > + AK5558_CKS_AUTO); > +} > + > +static int ak5558_probe(struct snd_soc_codec *codec) > +{ > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + > + ak5558->fs = 48000; > + ak5558->rclk = 0; > + > + return ak5558_init_reg(codec); > +} > + > +static int ak5558_remove(struct snd_soc_codec *codec) > +{ > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + > + ak5558_set_bias_level(codec, SND_SOC_BIAS_OFF); > + ak5558_power_off(ak5558); > + > + return 0; > +} > + > + > +static int __maybe_unused ak5558_runtime_suspend(struct device *dev) > +{ > + struct ak5558_priv *ak5558 = dev_get_drvdata(dev); > + > + regcache_cache_only(ak5558->regmap, true); > + ak5558_power_off(ak5558); > + > + return 0; > +} > + > +static int __maybe_unused ak5558_runtime_resume(struct device *dev) > +{ > + struct ak5558_priv *ak5558 = dev_get_drvdata(dev); > + > + ak5558_power_off(ak5558); > + ak5558_power_on(ak5558); > + > + regcache_cache_only(ak5558->regmap, false); > + regcache_mark_dirty(ak5558->regmap); > + > + return regcache_sync(ak5558->regmap); > +} > + > +const struct dev_pm_ops ak5558_pm = { > + SET_RUNTIME_PM_OPS(ak5558_runtime_suspend, ak5558_runtime_resume, NULL) > + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, > + pm_runtime_force_resume) > +}; > + > +struct snd_soc_codec_driver soc_codec_dev_ak5558 = { > + .probe = ak5558_probe, > + .remove = ak5558_remove, > + .idle_bias_off = true, > + .set_bias_level = ak5558_set_bias_level, > + > + .component_driver = { > + .controls = ak5558_snd_controls, > + .num_controls = ARRAY_SIZE(ak5558_snd_controls), > + .dapm_widgets = ak5558_dapm_widgets, > + .num_dapm_widgets = ARRAY_SIZE(ak5558_dapm_widgets), > + .dapm_routes = ak5558_intercon, > + .num_dapm_routes = ARRAY_SIZE(ak5558_intercon), > + }, > +}; > + > +static const struct regmap_config ak5558_regmap = { > + .reg_bits = 8, > + .val_bits = 8, > + > + .max_register = AK5558_05_DSD, > + .reg_defaults = ak5558_reg, > + .num_reg_defaults = ARRAY_SIZE(ak5558_reg), > + .cache_type = REGCACHE_RBTREE, > +}; > + > +static int ak5558_i2c_probe(struct i2c_client *i2c) > +{ > + struct ak5558_priv *ak5558; > + int ret = 0; > + > + ak5558 = devm_kzalloc(&i2c->dev, sizeof(*ak5558), GFP_KERNEL); > + if (!ak5558) > + return -ENOMEM; > + > + ak5558->regmap = devm_regmap_init_i2c(i2c, &ak5558_regmap); > + if (IS_ERR(ak5558->regmap)) > + return PTR_ERR(ak5558->regmap); > + > + i2c_set_clientdata(i2c, ak5558); > + ak5558->i2c = i2c; > + > + ak5558->reset_gpiod = devm_gpiod_get_optional(&i2c->dev, "reset", > + GPIOD_OUT_LOW); > + if (IS_ERR(ak5558->reset_gpiod)) > + return PTR_ERR(ak5558->reset_gpiod); > + > + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak5558, > + &ak5558_dai, 1); > + if (ret) > + return ret; > + > + pm_runtime_enable(&i2c->dev); > + > + return 0; > +} > + > +static int ak5558_i2c_remove(struct i2c_client *i2c) > +{ > + snd_soc_unregister_codec(&i2c->dev); > + pm_runtime_disable(&i2c->dev); > + > + return 0; > +} > + > +static const struct of_device_id ak5558_i2c_dt_ids[] = { > + { .compatible = "asahi-kasei,ak5558"}, > + { } > +}; > + > +static struct i2c_driver ak5558_i2c_driver = { > + .driver = { > + .name = "ak5558", > + .of_match_table = of_match_ptr(ak5558_i2c_dt_ids), > + .pm = &ak5558_pm, > + }, > + .probe_new = ak5558_i2c_probe, > + .remove = ak5558_i2c_remove, > +}; > + > +module_i2c_driver(ak5558_i2c_driver); > + > +MODULE_AUTHOR("Junichi Wakasugi <wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8@public.gmane.org>"); > +MODULE_AUTHOR("Mihai Serban <mihai.serban-3arQi8VN3Tc@public.gmane.org>"); > +MODULE_DESCRIPTION("ASoC AK5558 ADC driver"); > +MODULE_LICENSE("GPL v2"); > diff --git a/sound/soc/codecs/ak5558.h b/sound/soc/codecs/ak5558.h > new file mode 100644 > index 0000000..2ed4c7c > --- /dev/null > +++ b/sound/soc/codecs/ak5558.h > @@ -0,0 +1,52 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Audio driver header for AK5558 > + * > + * Copyright (C) 2016 Asahi Kasei Microdevices Corporation > + * Copyright 2018 NXP > + */ > + > +#ifndef _AK5558_H > +#define _AK5558_H > + > +#define AK5558_00_POWER_MANAGEMENT1 0x00 > +#define AK5558_01_POWER_MANAGEMENT2 0x01 > +#define AK5558_02_CONTROL1 0x02 > +#define AK5558_03_CONTROL2 0x03 > +#define AK5558_04_CONTROL3 0x04 > +#define AK5558_05_DSD 0x05 > + > +/* AK5558_02_CONTROL1 fields */ > +#define AK5558_DIF GENMASK(1, 1) > +#define AK5558_DIF_MSB_MODE (0 << 1) > +#define AK5558_DIF_I2S_MODE (1 << 1) > + > +#define AK5558_BITS GENMASK(2, 2) > +#define AK5558_DIF_24BIT_MODE (0 << 2) > +#define AK5558_DIF_32BIT_MODE (1 << 2) > + > +#define AK5558_CKS GENMASK(6, 3) > +#define AK5558_CKS_128FS_192KHZ (0 << 3) > +#define AK5558_CKS_192FS_192KHZ (1 << 3) > +#define AK5558_CKS_256FS_48KHZ (2 << 3) > +#define AK5558_CKS_256FS_96KHZ (3 << 3) > +#define AK5558_CKS_384FS_96KHZ (4 << 3) > +#define AK5558_CKS_384FS_48KHZ (5 << 3) > +#define AK5558_CKS_512FS_48KHZ (6 << 3) > +#define AK5558_CKS_768FS_48KHZ (7 << 3) > +#define AK5558_CKS_64FS_384KHZ (8 << 3) > +#define AK5558_CKS_32FS_768KHZ (9 << 3) > +#define AK5558_CKS_96FS_384KHZ (10 << 3) > +#define AK5558_CKS_48FS_768KHZ (11 << 3) > +#define AK5558_CKS_64FS_768KHZ (12 << 3) > +#define AK5558_CKS_1024FS_16KHZ (13 << 3) > +#define AK5558_CKS_AUTO (15 << 3) > + > +/* AK5558_03_CONTROL2 fields */ > +#define AK5558_MODE_BITS GENMASK(6, 5) > +#define AK5558_MODE_NORMAL (0 << 5) > +#define AK5558_MODE_TDM128 (1 << 5) > +#define AK5558_MODE_TDM256 (2 << 5) > +#define AK5558_MODE_TDM512 (3 << 5) > + > +#endif > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver 2018-02-05 17:01 ` [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver Daniel Baluta 2018-02-05 20:27 ` Fabio Estevam [not found] ` <1517850115-24340-2-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> @ 2018-02-12 12:02 ` Mark Brown [not found] ` <20180212120213.GB12976-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2 siblings, 1 reply; 11+ messages in thread From: Mark Brown @ 2018-02-12 12:02 UTC (permalink / raw) To: Daniel Baluta Cc: alsa-devel, devicetree, linux-kernel, wakasugi.jb, shengjiu.wang, mihai.serban, cosmin.samoila, linux-imx, fabio.estevam, robh, andy.shevchenko, Mihai Serban [-- Attachment #1: Type: text/plain, Size: 2450 bytes --] On Mon, Feb 05, 2018 at 07:01:54PM +0200, Daniel Baluta wrote: > AK5558 is a 32-bit, 768 kHZ sampling, differential input ADC > for digital audio systems. > --- /dev/null > +++ b/sound/soc/codecs/ak5558.c > @@ -0,0 +1,618 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Audio driver for AK5558 ADC Please don't mix C++ and C style comments - just make the entire comment C++. > +static const char * const tdm_texts[] = { > + "Off", "TDM128", "TDM256", "TDM512", > +}; This looks like it should be a set_tdm_slot() operation, and indeed set_tdm_slot() appears to be implemented and duplicate this. > +static const char * const dsdon_texts[] = { > + "PCM", "DSD", > +}; This looks like it's setting the DAI format? > + SND_SOC_DAPM_MUX("AK5558 Ch1 Enable", SND_SOC_NOPM, 0, 0, > + &ak5558_channel1_mux_control), On/off controls should be switches not muxes, though if this is just selecting which channels are active (rather than a mute) I'd not expect it to be a control at all - the board can say if inputs are disabled. > +static int ak5558_set_mcki(struct snd_soc_codec *codec, int fs, int rclk) > +{ > + u8 mode; > + > + mode = snd_soc_read(codec, AK5558_02_CONTROL1); > + mode &= ~AK5558_CKS; > + mode |= AK5558_CKS_AUTO; > + > + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, mode); > + > + return 0; > +} This appears to just ignore the parameters? > +static int ak5558_set_dai_mute(struct snd_soc_dai *dai, int mute) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); > + int ndt = 0; > + > + if (!mute) > + return 0; > + > + if (ak5558->fs != 0) > + ndt = 583000 / ak5558->fs; > + > + msleep(max(ndt, 5)); > + > + return 0; > +} This doesn't appear to interact with the device at all. > +static int ak5558_set_bias_level(struct snd_soc_codec *codec, > + enum snd_soc_bias_level level) > +{ > + switch (level) { > + case SND_SOC_BIAS_ON: > + case SND_SOC_BIAS_PREPARE: > + case SND_SOC_BIAS_STANDBY: > + break; > + case SND_SOC_BIAS_OFF: > + snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x00); > + break; > + } I'd expect there to be symmetry here - if we disable things when transitioning to _OFF we should enable them when transitioning out. > + reg = snd_soc_read(codec, AK5558_03_CONTROL2); > + reg &= ~AK5558_MODE_BITS; > + reg |= tdm_mode; > + snd_soc_write(codec, AK5558_03_CONTROL2, reg); snd_soc_update_bits(). [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20180212120213.GB12976-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>]
* Re: [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver [not found] ` <20180212120213.GB12976-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> @ 2018-02-13 12:15 ` Daniel Baluta 0 siblings, 0 replies; 11+ messages in thread From: Daniel Baluta @ 2018-02-13 12:15 UTC (permalink / raw) To: broonie-DgEjT+Ai2ygdnm+yROfE0A Cc: dl-linux-imx, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Cosmin Samoila, devicetree-u79uwXL29TY76Z2rM5mHXA, wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8, Fabio Estevam, andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w, mihai.serban-Re5JQEeQqe8AvxtiuMwx3w, robh-DgEjT+Ai2ygdnm+yROfE0A, S.j. Wang, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, mihai.serban-3arQi8VN3Tc On Lu, 2018-02-12 at 12:02 +0000, Mark Brown wrote: > On Mon, Feb 05, 2018 at 07:01:54PM +0200, Daniel Baluta wrote: > > > > AK5558 is a 32-bit, 768 kHZ sampling, differential input ADC > > for digital audio systems. > > > > --- /dev/null > > +++ b/sound/soc/codecs/ak5558.c > > @@ -0,0 +1,618 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +/* > > + * Audio driver for AK5558 ADC > Please don't mix C++ and C style comments - just make the entire comment > C++. > Sure. Will use: // SPDX-License-Identifier: GPL-2.0 > > > > +static const char * const tdm_texts[] = { > > + "Off", "TDM128", "TDM256", "TDM512", > > +}; > This looks like it should be a set_tdm_slot() operation, and indeed > set_tdm_slot() appears to be implemented and duplicate this. > Yup, will remove this. At first there was no set_tdm_slot. > > > > +static const char * const dsdon_texts[] = { > > + "PCM", "DSD", > > +}; > This looks like it's setting the DAI format? Ditto. Will remove. > > > > > + SND_SOC_DAPM_MUX("AK5558 Ch1 Enable", SND_SOC_NOPM, 0, 0, > > + &ak5558_channel1_mux_control), > On/off controls should be switches not muxes, though if this is just > selecting which channels are active (rather than a mute) I'd not expect > it to be a control at all - the board can say if inputs are disabled. OK, agree that if we want to have a way to select which channels are active we should use a switch. Will remove this control for now. > > > > > +static int ak5558_set_mcki(struct snd_soc_codec *codec, int fs, int rclk) > > +{ > > + u8 mode; > > + > > + mode = snd_soc_read(codec, AK5558_02_CONTROL1); > > + mode &= ~AK5558_CKS; > > + mode |= AK5558_CKS_AUTO; > > + > > + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, mode); > > + > > + return 0; > > +} > This appears to just ignore the parameters? These are left overs from a v1 cleanup. Will fix. thanks Mark! Will send v4 asap. thanks, Daniel. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC 2018-02-05 17:01 [PATCH v3 0/2] Add support for AK5558 ADC Daniel Baluta 2018-02-05 17:01 ` [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver Daniel Baluta @ 2018-02-05 17:01 ` Daniel Baluta [not found] ` <1517850115-24340-3-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> 1 sibling, 1 reply; 11+ messages in thread From: Daniel Baluta @ 2018-02-05 17:01 UTC (permalink / raw) To: broonie, alsa-devel, devicetree Cc: robh, shengjiu.wang, linux-kernel, wakasugi.jb, fabio.estevam, andy.shevchenko, linux-imx, cosmin.samoila, daniel.baluta, mihai.serban Document the bindings for AK5558 ADC. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- Documentation/devicetree/bindings/sound/ak5558.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt diff --git a/Documentation/devicetree/bindings/sound/ak5558.txt b/Documentation/devicetree/bindings/sound/ak5558.txt new file mode 100644 index 0000000..7d67ca6 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ak5558.txt @@ -0,0 +1,22 @@ +AK5558 8 channel differential 32-bit delta-sigma ADC + +This device supports I2C mode only. + +Required properties: + +- compatible : "asahi-kasei,ak5558" +- reg : The I2C address of the device. + +Optional properties: + +- reset-gpios: A GPIO specifier for the power down & reset pin. + +Example: + +&i2c { + ak5558: adc@10 { + compatible = "asahi-kasei,ak5558"; + reg = <0x10>; + reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; +}; -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
[parent not found: <1517850115-24340-3-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org>]
* Re: [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC [not found] ` <1517850115-24340-3-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> @ 2018-02-05 20:26 ` Fabio Estevam [not found] ` <CAOMZO5D_5E9H6dJw8ivOgvOqxNvAZ72qhADCoG7VAZ7QwiOcUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2018-02-09 2:46 ` Rob Herring 2018-02-16 12:16 ` Applied "ASoC: ak5558: Add bindings for AK5558 ADC" to the asoc tree Mark Brown 2 siblings, 1 reply; 11+ messages in thread From: Fabio Estevam @ 2018-02-05 20:26 UTC (permalink / raw) To: Daniel Baluta Cc: Mark Brown, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, linux-kernel, wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8, shengjiu.wang-3arQi8VN3Tc, Mihai Serban, cosmin.samoila-3arQi8VN3Tc, NXP Linux Team, Fabio Estevam, Rob Herring, Andy Shevchenko On Mon, Feb 5, 2018 at 3:01 PM, Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> wrote: > Document the bindings for AK5558 ADC. > > Signed-off-by: Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> > --- > Documentation/devicetree/bindings/sound/ak5558.txt | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt > > diff --git a/Documentation/devicetree/bindings/sound/ak5558.txt b/Documentation/devicetree/bindings/sound/ak5558.txt > new file mode 100644 > index 0000000..7d67ca6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/ak5558.txt > @@ -0,0 +1,22 @@ > +AK5558 8 channel differential 32-bit delta-sigma ADC > + > +This device supports I2C mode only. > + > +Required properties: > + > +- compatible : "asahi-kasei,ak5558" > +- reg : The I2C address of the device. > + > +Optional properties: > + > +- reset-gpios: A GPIO specifier for the power down & reset pin. > + > +Example: > + > +&i2c { > + ak5558: adc@10 { If I understood well Rob's suggestion was to make it only: adc@10 { Other than that: Reviewed-by: Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <CAOMZO5D_5E9H6dJw8ivOgvOqxNvAZ72qhADCoG7VAZ7QwiOcUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC [not found] ` <CAOMZO5D_5E9H6dJw8ivOgvOqxNvAZ72qhADCoG7VAZ7QwiOcUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2018-02-06 2:16 ` Fabio Estevam 0 siblings, 0 replies; 11+ messages in thread From: Fabio Estevam @ 2018-02-06 2:16 UTC (permalink / raw) To: Daniel Baluta Cc: Mark Brown, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, linux-kernel, wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8, shengjiu.wang-3arQi8VN3Tc, Mihai Serban, cosmin.samoila-3arQi8VN3Tc, NXP Linux Team, Fabio Estevam, Rob Herring, Andy Shevchenko On Mon, Feb 5, 2018 at 6:26 PM, Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: >> +Example: >> + >> +&i2c { >> + ak5558: adc@10 { > > If I understood well Rob's suggestion was to make it only: > > adc@10 { Ops, you did it correctly :-) Thanks -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC [not found] ` <1517850115-24340-3-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> 2018-02-05 20:26 ` Fabio Estevam @ 2018-02-09 2:46 ` Rob Herring 2018-02-16 12:16 ` Applied "ASoC: ak5558: Add bindings for AK5558 ADC" to the asoc tree Mark Brown 2 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2018-02-09 2:46 UTC (permalink / raw) To: Daniel Baluta Cc: broonie-DgEjT+Ai2ygdnm+yROfE0A, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, wakasugi.jb-r6lgfPJHJciWyREYz5tgSuqrae++aQT8, shengjiu.wang-3arQi8VN3Tc, mihai.serban-Re5JQEeQqe8AvxtiuMwx3w, cosmin.samoila-3arQi8VN3Tc, linux-imx-3arQi8VN3Tc, fabio.estevam-3arQi8VN3Tc, andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w On Mon, Feb 05, 2018 at 07:01:55PM +0200, Daniel Baluta wrote: > Document the bindings for AK5558 ADC. > > Signed-off-by: Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> > --- > Documentation/devicetree/bindings/sound/ak5558.txt | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt Reviewed-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* Applied "ASoC: ak5558: Add bindings for AK5558 ADC" to the asoc tree [not found] ` <1517850115-24340-3-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org> 2018-02-05 20:26 ` Fabio Estevam 2018-02-09 2:46 ` Rob Herring @ 2018-02-16 12:16 ` Mark Brown 2 siblings, 0 replies; 11+ messages in thread From: Mark Brown @ 2018-02-16 12:16 UTC (permalink / raw) Cc: Mark Brown The patch ASoC: ak5558: Add bindings for AK5558 ADC has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From af0424e44c180d66c2ddfb0a99c52382de8f69f8 Mon Sep 17 00:00:00 2001 From: Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> Date: Tue, 13 Feb 2018 16:29:34 +0200 Subject: [PATCH] ASoC: ak5558: Add bindings for AK5558 ADC Document the bindings for AK5558 ADC. Reviewed-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Signed-off-by: Daniel Baluta <daniel.baluta-3arQi8VN3Tc@public.gmane.org> Signed-off-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> --- Documentation/devicetree/bindings/sound/ak5558.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt diff --git a/Documentation/devicetree/bindings/sound/ak5558.txt b/Documentation/devicetree/bindings/sound/ak5558.txt new file mode 100644 index 000000000000..7d67ca6ced80 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ak5558.txt @@ -0,0 +1,22 @@ +AK5558 8 channel differential 32-bit delta-sigma ADC + +This device supports I2C mode only. + +Required properties: + +- compatible : "asahi-kasei,ak5558" +- reg : The I2C address of the device. + +Optional properties: + +- reset-gpios: A GPIO specifier for the power down & reset pin. + +Example: + +&i2c { + ak5558: adc@10 { + compatible = "asahi-kasei,ak5558"; + reg = <0x10>; + reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; +}; -- 2.16.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-02-16 12:16 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-05 17:01 [PATCH v3 0/2] Add support for AK5558 ADC Daniel Baluta
2018-02-05 17:01 ` [PATCH v3 1/2] ASoC: codecs: Add support for AK5558 ADC driver Daniel Baluta
2018-02-05 20:27 ` Fabio Estevam
[not found] ` <1517850115-24340-2-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org>
2018-02-06 14:12 ` Andy Shevchenko
2018-02-12 12:02 ` Mark Brown
[not found] ` <20180212120213.GB12976-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2018-02-13 12:15 ` Daniel Baluta
2018-02-05 17:01 ` [PATCH v3 2/2] ASoC: ak5558: Add bindings for AK5558 ADC Daniel Baluta
[not found] ` <1517850115-24340-3-git-send-email-daniel.baluta-3arQi8VN3Tc@public.gmane.org>
2018-02-05 20:26 ` Fabio Estevam
[not found] ` <CAOMZO5D_5E9H6dJw8ivOgvOqxNvAZ72qhADCoG7VAZ7QwiOcUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-06 2:16 ` Fabio Estevam
2018-02-09 2:46 ` Rob Herring
2018-02-16 12:16 ` Applied "ASoC: ak5558: Add bindings for AK5558 ADC" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).