From nobody Sat Sep 13 10:59:12 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1267C61DA4 for ; Fri, 3 Feb 2023 11:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232585AbjBCLOy (ORCPT ); Fri, 3 Feb 2023 06:14:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbjBCLOk (ORCPT ); Fri, 3 Feb 2023 06:14:40 -0500 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::225]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 824CC79639; Fri, 3 Feb 2023 03:14:38 -0800 (PST) Received: (Authenticated sender: herve.codina@bootlin.com) by mail.gandi.net (Postfix) with ESMTPA id ECB891C0018; Fri, 3 Feb 2023 11:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1675422877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/B138WsRSYzV/E8WT0lEWOcdHSuB7G8fsLebv6AbPjI=; b=bJXqoxVtEdLVSsEfkNhCZgLZ2isvARJIOyyihsuwupTJ6KB+aEkxJIxjIGI2QrfAw9DWmE KP5g+KD2tOqoSA3apz5T9Bb4Fi5T0wWyKC4S5DJJS2rqWX2WvpIirFm0YqFSbZPJ4gUfkF DkM1K9t5nj3fbRBSFEMyKrVcL0XPtjJUWur6IuwtPd1PqEJM4G1fd3D2BWK4LSjxmVE+av BpoNUR3T+WFUuODVlZezKdb4MyYe53z2RHB3Dt1cuHmQeqg+CqDvWAHURxe+jRehMJ1rOr SVaLddTP83RMblqrMdu/NtKhTo9qqy9EBt/PCOLUDnrg6+DnMfuvIEBaMNSuOQ== From: Herve Codina To: Herve Codina , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Christophe Leroy , Thomas Petazzoni Subject: [PATCH 2/3] ASoC: codecs: Add support for the Renesas X9250 potentiometers Date: Fri, 3 Feb 2023 12:14:21 +0100 Message-Id: <20230203111422.142479-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230203111422.142479-1-herve.codina@bootlin.com> References: <20230203111422.142479-1-herve.codina@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Renesas X9250 is a quad digitally controlled potentiometers. Signed-off-by: Herve Codina --- sound/soc/codecs/Kconfig | 11 ++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/x9250.c | 276 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+) create mode 100644 sound/soc/codecs/x9250.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 5531bf8d4b3f..19afa0067305 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -314,6 +314,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_WM9713 imply SND_SOC_WSA881X imply SND_SOC_WSA883X + imply SND_SOC_X9250 imply SND_SOC_ZL38060 help Normally ASoC codec drivers are only built if a machine driver which @@ -2053,6 +2054,16 @@ config SND_SOC_WSA883X This enables support for Qualcomm WSA8830/WSA8835 Class-D Smart Speaker Amplifier. =20 +config SND_SOC_X9250 + tristate "Renesas X9250 quad controlled potentiometers" + depends on SPI + help + Enable support for the Renesas X9250 quad controlled + potentiometers. + + To compile this driver as a module, choose M here: the module + will be called snd-soc-x9250. + config SND_SOC_ZL38060 tristate "Microsemi ZL38060 Connected Home Audio Processor" depends on SPI_MASTER diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index bcf95de654fd..a1d6de6a18f6 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -346,6 +346,7 @@ snd-soc-wm9713-objs :=3D wm9713.o snd-soc-wm-hubs-objs :=3D wm_hubs.o snd-soc-wsa881x-objs :=3D wsa881x.o snd-soc-wsa883x-objs :=3D wsa883x.o +snd-soc-x9250-objs :=3D x9250.o snd-soc-zl38060-objs :=3D zl38060.o # Amp snd-soc-max9877-objs :=3D max9877.o @@ -708,6 +709,7 @@ obj-$(CONFIG_SND_SOC_WM_ADSP) +=3D snd-soc-wm-adsp.o obj-$(CONFIG_SND_SOC_WM_HUBS) +=3D snd-soc-wm-hubs.o obj-$(CONFIG_SND_SOC_WSA881X) +=3D snd-soc-wsa881x.o obj-$(CONFIG_SND_SOC_WSA883X) +=3D snd-soc-wsa883x.o +obj-$(CONFIG_SND_SOC_X9250) +=3D snd-soc-x9250.o obj-$(CONFIG_SND_SOC_ZL38060) +=3D snd-soc-zl38060.o =20 # Amp diff --git a/sound/soc/codecs/x9250.c b/sound/soc/codecs/x9250.c new file mode 100644 index 000000000000..14f80009f085 --- /dev/null +++ b/sound/soc/codecs/x9250.c @@ -0,0 +1,276 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// x9250.c -- Renesas X9250 ALSA SoC driver +// +// Copyright 2023 CS GROUP France +// +// Author: Herve Codina + +#include +#include +#include +#include +#include + +#define X9250_NB_CHANNEL 4 + +struct x9250 { + struct spi_device *spi; + u8 spi_tx_buf[3]; /* Cannot use stack area for SPI (dma-safe memory) */ + u8 spi_rx_buf[3]; /* Cannot use stack area for SPI (dma-safe memory) */ + int cmd_inv; +}; + +#define X9250_CMD_RD_WCR(_p) (0x90 | (_p)) +#define X9250_CMD_WR_WCR(_p) (0xa0 | (_p)) + +static int x9250_write8(struct x9250 *x9250, u8 cmd, u8 val) +{ + struct spi_transfer xfer =3D { + .tx_buf =3D &x9250->spi_tx_buf, + .len =3D 3, + }; + + BUILD_BUG_ON(sizeof(x9250->spi_tx_buf) < 3); + + x9250->spi_tx_buf[0] =3D 0x50; + x9250->spi_tx_buf[1] =3D cmd; + x9250->spi_tx_buf[2] =3D val; + + return spi_sync_transfer(x9250->spi, &xfer, 1); +} + +static int x9250_read8(struct x9250 *x9250, u8 cmd, u8 *val) +{ + struct spi_transfer xfer =3D { + .tx_buf =3D &x9250->spi_tx_buf, + .rx_buf =3D &x9250->spi_rx_buf, + .len =3D 3, + }; + int ret; + + BUILD_BUG_ON(sizeof(x9250->spi_tx_buf) < 3); + BUILD_BUG_ON(sizeof(x9250->spi_rx_buf) < 3); + + x9250->spi_tx_buf[0] =3D 0x50; + x9250->spi_tx_buf[1] =3D cmd; + + ret =3D spi_sync_transfer(x9250->spi, &xfer, 1); + if (ret) + return ret; + + *val =3D x9250->spi_rx_buf[2]; + return 0; +} + +static const struct snd_soc_dapm_widget x9250_dapm_widgets[] =3D { + SND_SOC_DAPM_INPUT("IN0"), + SND_SOC_DAPM_INPUT("IN1"), + SND_SOC_DAPM_INPUT("IN2"), + SND_SOC_DAPM_INPUT("IN3"), + + SND_SOC_DAPM_PGA("CH0 PGA", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_PGA("CH1 PGA", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_PGA("CH2 PGA", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_PGA("CH3 PGA", SND_SOC_NOPM, 0, 0, NULL, 0), + + SND_SOC_DAPM_OUTPUT("OUT0"), + SND_SOC_DAPM_OUTPUT("OUT1"), + SND_SOC_DAPM_OUTPUT("OUT2"), + SND_SOC_DAPM_OUTPUT("OUT3"), +}; + +static const struct snd_soc_dapm_route x9250_dapm_routes[] =3D { + { "CH0 PGA", NULL, "IN0" }, + { "CH1 PGA", NULL, "IN1" }, + { "CH2 PGA", NULL, "IN2" }, + { "CH3 PGA", NULL, "IN3" }, + + { "OUT0", NULL, "CH0 PGA" }, + { "OUT1", NULL, "CH1 PGA" }, + { "OUT2", NULL, "CH2 PGA" }, + { "OUT3", NULL, "CH3 PGA" }, +}; + +static int x8250_kctrl_cmd_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct soc_mixer_control *mc =3D (struct soc_mixer_control *)kcontrol->pr= ivate_value; + struct snd_soc_component *component =3D snd_soc_kcontrol_component(kcontr= ol); + struct x9250 *x9250 =3D snd_soc_component_get_drvdata(component); + int min =3D mc->min; + int max =3D mc->max; + unsigned int mask =3D (1 << fls(max)) - 1; + unsigned int invert =3D mc->invert; + int ret; + u8 val; + u8 wcr; + + wcr =3D mc->reg; + if (wcr > 4) + return -EINVAL; + + ret =3D x9250_read8(x9250, X9250_CMD_RD_WCR(wcr), &val); + if (ret) + return ret; + + ucontrol->value.integer.value[0] =3D (val & mask) - min; + if (invert) + ucontrol->value.integer.value[0] =3D max - ucontrol->value.integer.value= [0]; + + return 0; +} + +static int x8250_kctrl_cmd_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct soc_mixer_control *mc =3D (struct soc_mixer_control *)kcontrol->pr= ivate_value; + struct snd_soc_component *component =3D snd_soc_kcontrol_component(kcontr= ol); + struct x9250 *x9250 =3D snd_soc_component_get_drvdata(component); + int min =3D mc->min; + int max =3D mc->max; + unsigned int mask =3D (1 << fls(max)) - 1; + unsigned int invert =3D mc->invert; + unsigned int val; + int ret; + u8 wcr; + u8 tmp; + + wcr =3D mc->reg; + if (wcr > 4) + return -EINVAL; + + val =3D ucontrol->value.integer.value[0]; + if (val < 0) + return -EINVAL; + if (val > max - min) + return -EINVAL; + + val =3D (val + min) & mask; + if (invert) + val =3D max - val; + + ret =3D x9250_read8(x9250, X9250_CMD_RD_WCR(wcr), &tmp); + if (ret) + return ret; + + if (tmp =3D=3D val) + return 0; + + ret =3D x9250_write8(x9250, X9250_CMD_WR_WCR(wcr), val); + if (ret) + return ret; + + return 1; /* The value changed */ +} + +static const struct snd_kcontrol_new x9250_controls_std[] =3D { + SOC_SINGLE_EXT("CMD0", 0, 0, 255, 0, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), + SOC_SINGLE_EXT("CMD1", 1, 0, 255, 0, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), + SOC_SINGLE_EXT("CMD2", 2, 0, 255, 0, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), + SOC_SINGLE_EXT("CMD3", 3, 0, 255, 0, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), +}; + +static const struct snd_kcontrol_new x9250_controls_inv[] =3D { + SOC_SINGLE_EXT("CMD0", 0, 0, 255, 1, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), + SOC_SINGLE_EXT("CMD1", 1, 0, 255, 1, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), + SOC_SINGLE_EXT("CMD2", 2, 0, 255, 1, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), + SOC_SINGLE_EXT("CMD3", 3, 0, 255, 1, x8250_kctrl_cmd_get, x8250_kctrl_cmd= _put), +}; + +static int x9250_component_probe(struct snd_soc_component *component) +{ + struct x9250 *x9250 =3D snd_soc_component_get_drvdata(component); + struct snd_kcontrol_new control[X9250_NB_CHANNEL]; + int ret; + u8 wcr; + int i; + + /* Check arrays compatibility */ + BUILD_BUG_ON(ARRAY_SIZE(x9250_controls_std) !=3D X9250_NB_CHANNEL); + BUILD_BUG_ON(ARRAY_SIZE(x9250_controls_inv) !=3D X9250_NB_CHANNEL); + BUILD_BUG_ON(sizeof(control[0]) !=3D sizeof(x9250_controls_std[0])); + BUILD_BUG_ON(sizeof(control[0]) !=3D sizeof(x9250_controls_inv[0])); + + for (i =3D 0; i < X9250_NB_CHANNEL; i++) { + if (x9250->cmd_inv & (1 << i)) { + wcr =3D 0xff; + memcpy(&control[i], &x9250_controls_inv[i], sizeof(control[i])); + } else { + wcr =3D 0x00; + memcpy(&control[i], &x9250_controls_std[i], sizeof(control[i])); + } + ret =3D x9250_write8(x9250, X9250_CMD_WR_WCR(i), wcr); + if (ret) + return ret; + } + + return snd_soc_add_component_controls(component, control, ARRAY_SIZE(cont= rol)); +} + +static const struct snd_soc_component_driver x9250_component_driver =3D { + .probe =3D x9250_component_probe, + .dapm_widgets =3D x9250_dapm_widgets, + .num_dapm_widgets =3D ARRAY_SIZE(x9250_dapm_widgets), + .dapm_routes =3D x9250_dapm_routes, + .num_dapm_routes =3D ARRAY_SIZE(x9250_dapm_routes), +}; + +static int x9250_spi_probe(struct spi_device *spi) +{ + struct x9250 *x9250; + int ret; + + spi->bits_per_word =3D 8; + ret =3D spi_setup(spi); + if (ret < 0) + return ret; + + x9250 =3D devm_kzalloc(&spi->dev, sizeof(*x9250), GFP_KERNEL); + if (x9250 =3D=3D NULL) + return -ENOMEM; + + x9250->spi =3D spi; + + x9250->cmd_inv =3D 0; + if (of_property_read_bool(spi->dev.of_node, "renesas,cmd0-invert")) + x9250->cmd_inv |=3D (1 << 0); + if (of_property_read_bool(spi->dev.of_node, "renesas,cmd1-invert")) + x9250->cmd_inv |=3D (1 << 1); + if (of_property_read_bool(spi->dev.of_node, "renesas,cmd2-invert")) + x9250->cmd_inv |=3D (1 << 2); + if (of_property_read_bool(spi->dev.of_node, "renesas,cmd3-invert")) + x9250->cmd_inv |=3D (1 << 3); + + spi_set_drvdata(spi, x9250); + + return devm_snd_soc_register_component(&spi->dev, &x9250_component_driver, + NULL, 0); +} + +static const struct of_device_id x9250_of_match[] =3D { + { .compatible =3D "renesas,x9250", }, + { } +}; +MODULE_DEVICE_TABLE(of, x9250_of_match); + +static const struct spi_device_id x9250_id_table[] =3D { + { "x9250", 0 }, + { } +}; +MODULE_DEVICE_TABLE(spi, x9250_id_table); + +static struct spi_driver x9250_spi_driver =3D { + .driver =3D { + .name =3D "x9250", + .of_match_table =3D x9250_of_match, + }, + .id_table =3D x9250_id_table, + .probe =3D x9250_spi_probe, +}; + +module_spi_driver(x9250_spi_driver); + +MODULE_AUTHOR("Herve Codina "); +MODULE_DESCRIPTION("X9250 ALSA SoC driver"); +MODULE_LICENSE("GPL"); --=20 2.39.0