Received: by 10.223.185.111 with SMTP id b44csp1310402wrg; Sat, 10 Mar 2018 03:07:18 -0800 (PST) X-Google-Smtp-Source: AG47ELtW4VN/dYNty3quea5gg1S1nU165ZhE/K/cvdxkwOJVbajnT5KVlkEZsIE9AWfrv9njoS9C X-Received: by 10.99.152.10 with SMTP id q10mr1449021pgd.62.1520680037904; Sat, 10 Mar 2018 03:07:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520680037; cv=none; d=google.com; s=arc-20160816; b=ueOQGfhQdOQf8TgJD4h4WANYQ3goJmqOUEvy0CUqRs1zCwY6lgrc1rPZnBu0wPNUtr 8w2DWGi/fIsV6qeWHwHZtwmODYBjvLZOyg3swV7jrJQ9z8vr43jrHD5M0ZxiMiUCBvyL bYp/iLiZBqVh/Zzz12nin76nrf5aPflwkaLPCWpVhhE5xiY6yWHVjWymlspV7lWRAxuy ShOEFEXpi2x+K9a6z3TOY1t5uwUd41BsDuT0baB9ZWFI3BafQtGoPf0Z9F7t0RAvbf6J 2WKNhbibFjk1nYYaJxbzwZHtGdwRfzca3+uTNO3uG4lrg/a19CeBmuXngIo7Wq+IoEFM XWGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=NotiVpaizONWc02ppvNnC41VfwS9P4GGeCMABeySkFI=; b=MzsaLR6Efu7FXDwbdFK2ME7g5Zen3nf/mEoTManIFOIj7qBVRX/HEd1kZCZ7xx4/gB onz8l8mlyQZKIGYujZmAm+3bipTkQKONCLO6dGqPWFplXegl+yOLPcM6glUtq4FD6o++ lh9A+0f2dJRXusjzzcE5eiQ56LPvGcMqPRowO5AryzoHORDEFQus0CiLW6njRq81tbQt qWRNCxerGGaguhMayCh/BGJWO8RYmsAn+znQUNYyVgFwbIr9/z3SewF5tdQg9vvN0zGZ bNICG9w1fGuuzowBgbOwLM5M3/5YoQP1wSNzdz2qfs8rz5UT7CDhL6AYmVn/mNroWl3B sZxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=yVmHclKl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z4-v6si2614238plo.523.2018.03.10.03.07.03; Sat, 10 Mar 2018 03:07:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=yVmHclKl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752181AbeCJLFb (ORCPT + 99 others); Sat, 10 Mar 2018 06:05:31 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:45104 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974AbeCJLF0 (ORCPT ); Sat, 10 Mar 2018 06:05:26 -0500 Received: by mail-wr0-f196.google.com with SMTP id h2so3994775wre.12 for ; Sat, 10 Mar 2018 03:05:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NotiVpaizONWc02ppvNnC41VfwS9P4GGeCMABeySkFI=; b=yVmHclKlaejBc0CWghKlELhocndP5muId8Cy9MhtQo1t7bUNzTxzNBC2dbrR2BQU8/ 4RjoTjn4gVI8nfhXq6z6CaQcdgnSDAwgSL+4Ok05JXDtiNMXLEo6dGeMj4suJw5tKftO /ixW4FBlX3A7k/tpx7LOmYdsmjFwB5JjnVe20yPbanZ6wO5Q9HUUDoMyon9nSdErHwTQ +0HXyMGfjaP3u7b5qekFjvr17S7WdPr4uw4NsBjzFkES3VwRyWmsiQEeCwJJpddnlr0R pmQgbJF4PkZFYvfM6YZPD5J1Vtue3LysyyFCk0XLQGfCmHc/V9HWJyA/Xzkm3i9h3BJT Gtjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NotiVpaizONWc02ppvNnC41VfwS9P4GGeCMABeySkFI=; b=BEbmGKHsQ3Y1kwtwPcP5sa9EijiZtrK7998/9wKSqyXGaGThRUXqqRwNLIH/3NJPfT cGtz/Qil/n1eYC7p4LzeBcwMvgJOQeIIpJZzTH4sRMyjjb8FdKSyM4miw1+sXAkEEj8k a28UUXt0TI4raHZj+oyF7OaSY1PyLzy/qkdpUc3YyeVldUQCR5Zqii+kLv5IB5DPJh6Y mwO0mReYSKusA6OLMzJjkhju92ATBFTUPNJo2+I5j0JYTfVy/c7NAzI1p5VFHZlAvICZ 3JvFUhLpjYAsBzs+MQoXViaK4XyPuZIYLIWaQAFqiQiKuzCWr+7oc6E2eJzmGGI2sfe1 3Tgw== X-Gm-Message-State: AElRT7E3QWQlGS/gCIlyVtYb8iCAJhMkOAiP6vRHpvG5FrdAMUwGG1N4 VHk4S16g67zXULs/oe5lCM8VVA== X-Received: by 10.223.163.136 with SMTP id l8mr1413620wrb.270.1520679925349; Sat, 10 Mar 2018 03:05:25 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 41sm3234541wrc.33.2018.03.10.03.05.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 03:05:24 -0800 (PST) From: Neil Armstrong To: broonie@kernel.org Cc: Neil Armstrong , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 2/2] ASoC: max9759: Add Amplifier Driver Date: Sat, 10 Mar 2018 12:05:16 +0100 Message-Id: <1520679916-13517-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520679916-13517-1-git-send-email-narmstrong@baylibre.com> References: <1520679916-13517-1-git-send-email-narmstrong@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The max9759 is a gpio controlled amplifier. Tested on a Variscite Dart MX6 SoM based custom board. Signed-off-by: Neil Armstrong --- sound/soc/codecs/Kconfig | 5 ++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max9759.c | 207 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 sound/soc/codecs/max9759.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2b331f7..f9ea460 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -98,6 +98,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98373 if I2C select SND_SOC_MAX9850 if I2C select SND_SOC_MAX9860 if I2C + select SND_SOC_MAX9759 select SND_SOC_MAX9768 if I2C select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX @@ -1187,6 +1188,10 @@ config SND_SOC_ZX_AUD96P22 config SND_SOC_LM4857 tristate +config SND_SOC_MAX9759 + tristate "Maxim MAX9759 speaker Amplifier" + select GPIOLIB + config SND_SOC_MAX9768 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index da15713..af4238d 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -80,6 +80,7 @@ snd-soc-jz4740-codec-objs := jz4740.o snd-soc-l3-objs := l3.o snd-soc-lm4857-objs := lm4857.o snd-soc-lm49453-objs := lm49453.o +snd-soc-max9759-objs := max9759.o snd-soc-max9768-objs := max9768.o snd-soc-max98088-objs := max98088.o snd-soc-max98090-objs := max98090.o @@ -325,6 +326,7 @@ obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_LM4857) += snd-soc-lm4857.o obj-$(CONFIG_SND_SOC_LM49453) += snd-soc-lm49453.o +obj-$(CONFIG_SND_SOC_MAX9759) += snd-soc-max9759.o obj-$(CONFIG_SND_SOC_MAX9768) += snd-soc-max9768.o obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o obj-$(CONFIG_SND_SOC_MAX98090) += snd-soc-max98090.o diff --git a/sound/soc/codecs/max9759.c b/sound/soc/codecs/max9759.c new file mode 100644 index 0000000..ecfb4a8 --- /dev/null +++ b/sound/soc/codecs/max9759.c @@ -0,0 +1,207 @@ +// SPDX-Licence-Identifier: GPL-2.0 +/* + * MAX9759 Amplifier Driver + * + * Copyright (c) 2017 BayLibre, SAS. + * Author: Neil Armstrong + */ + +#include +#include +#include +#include +#include + +#define DRV_NAME "max9759" + +struct max9759 { + struct gpio_desc *gpiod_shutdown; + struct gpio_desc *gpiod_mute; + struct gpio_descs *gpiod_gain; + bool is_mute; + unsigned int gain; +}; + +static int pga_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *control, int event) +{ + struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + if (SND_SOC_DAPM_EVENT_ON(event)) + gpiod_set_value_cansleep(priv->gpiod_shutdown, 0); + else + gpiod_set_value_cansleep(priv->gpiod_shutdown, 1); + + return 0; +} + +/* From 6dB to 24dB in steps of 6dB */ +static const DECLARE_TLV_DB_SCALE(speaker_gain_tlv, 600, 600, 0); + +static int speaker_gain_control_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + ucontrol->value.integer.value[0] = priv->gain; + + return 0; +} + +static const bool speaker_gain_table[4][2] = { + /* G1, G2 */ + {true, true}, /* +6dB */ + {false, true}, /* +12dB */ + {true, false}, /* +18dB */ + {false, false}, /* +24dB */ +}; + +static int speaker_gain_control_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + if (ucontrol->value.integer.value[0] > 3) + return -EINVAL; + + priv->gain = ucontrol->value.integer.value[0]; + + /* G1 */ + gpiod_set_value_cansleep(priv->gpiod_gain->desc[0], + speaker_gain_table[priv->gain][0]); + /* G2 */ + gpiod_set_value_cansleep(priv->gpiod_gain->desc[1], + speaker_gain_table[priv->gain][1]); + + return 1; +} + +static int speaker_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + ucontrol->value.integer.value[0] = !priv->is_mute; + + return 0; +} + +static int speaker_mute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + priv->is_mute = !ucontrol->value.integer.value[0]; + + gpiod_set_value_cansleep(priv->gpiod_mute, priv->is_mute); + + return 1; +} + +static const struct snd_kcontrol_new max9759_dapm_controls[] = { + SOC_SINGLE_EXT_TLV("Speaker Gain Volume", 0, 0, 3, 0, + speaker_gain_control_get, speaker_gain_control_put, + speaker_gain_tlv), + SOC_SINGLE_BOOL_EXT("Playback Switch", 0, + speaker_mute_get, speaker_mute_put), +}; + +static const struct snd_soc_dapm_widget max9759_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("INL"), + SND_SOC_DAPM_INPUT("INR"), + SND_SOC_DAPM_PGA_E("PGA", SND_SOC_NOPM, 0, 0, NULL, 0, pga_event, + (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD)), + SND_SOC_DAPM_OUTPUT("OUTL"), + SND_SOC_DAPM_OUTPUT("OUTR"), +}; + +static const struct snd_soc_dapm_route max9759_dapm_routes[] = { + { "PGA", NULL, "INL" }, + { "PGA", NULL, "INR" }, + { "OUTL", NULL, "PGA" }, + { "OUTR", NULL, "PGA" }, +}; + +static const struct snd_soc_component_driver max9759_component_driver = { + .controls = max9759_dapm_controls, + .num_controls = ARRAY_SIZE(max9759_dapm_controls), + .dapm_widgets = max9759_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9759_dapm_widgets), + .dapm_routes = max9759_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(max9759_dapm_routes), +}; + +static int max9759_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct max9759 *priv; + int err; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + platform_set_drvdata(pdev, priv); + + priv->gpiod_shutdown = devm_gpiod_get(dev, "shutdown", GPIOD_OUT_HIGH); + if (IS_ERR(priv->gpiod_shutdown)) { + err = PTR_ERR(priv->gpiod_shutdown); + if (err != -EPROBE_DEFER) + dev_err(dev, "Failed to get 'shutdown' gpio: %d", err); + return err; + } + + priv->gpiod_mute = devm_gpiod_get(dev, "mute", GPIOD_OUT_HIGH); + if (IS_ERR(priv->gpiod_mute)) { + err = PTR_ERR(priv->gpiod_mute); + if (err != -EPROBE_DEFER) + dev_err(dev, "Failed to get 'mute' gpio: %d", err); + return err; + } + priv->is_mute = true; + + priv->gpiod_gain = devm_gpiod_get_array(dev, "gain", GPIOD_OUT_HIGH); + if (IS_ERR(priv->gpiod_gain)) { + err = PTR_ERR(priv->gpiod_gain); + if (err != -EPROBE_DEFER) + dev_err(dev, "Failed to get 'gain' gpios: %d", err); + return err; + } + priv->gain = 0; + + if (priv->gpiod_gain->ndescs != 2) { + dev_err(dev, "Invalid 'gain' gpios count: %d", + priv->gpiod_gain->ndescs); + return -EINVAL; + } + + return devm_snd_soc_register_component(dev, &max9759_component_driver, + NULL, 0); +} + +#ifdef CONFIG_OF +static const struct of_device_id max9759_ids[] = { + { .compatible = "maxim,max9759", }, + { } +}; +MODULE_DEVICE_TABLE(of, max9759_ids); +#endif + +static struct platform_driver max9759_driver = { + .driver = { + .name = DRV_NAME, + .of_match_table = of_match_ptr(max9759_ids), + }, + .probe = max9759_probe, +}; + +module_platform_driver(max9759_driver); + +MODULE_DESCRIPTION("ASoC MAX9759 amplifier driver"); +MODULE_AUTHOR("Neil Armstrong "); +MODULE_LICENSE("GPL"); -- 2.7.4