From patchwork Thu Aug 3 21:55:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 13340860 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 069A7C001DB for ; Thu, 3 Aug 2023 21:57:32 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6580320C; Thu, 3 Aug 2023 23:56:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6580320C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691099850; bh=2a5LrPvh06lZHnswdQzaZ4xmQdjzGQ7FCeGJr9aY3Tk=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=oJIDidvbdH+SDQuAHvleV8YTWfJhyOo1VjxinDbFUAZATgQA/26TKj5qetfILpLKT uJf7ELrlDA4CNmAKAqe3+9PLwtSx/CR42hQbCWeSLDOD52OcqLGfXwA3BzVtrC7lGG gg0hPJ+6dg1untmDa3d1tMQ/by84FbDH+fFd1hzQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id F39D9F80544; Thu, 3 Aug 2023 23:56:10 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 4D11EF80087; Thu, 3 Aug 2023 23:56:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F2179F80087; Thu, 3 Aug 2023 23:56:04 +0200 (CEST) Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1595AF80087 for ; Thu, 3 Aug 2023 23:55:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1595AF80087 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=eHBslHzu Received: by mail-oo1-xc2a.google.com with SMTP id 006d021491bc7-56c9237e0ffso227746eaf.0 for ; Thu, 03 Aug 2023 14:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691099754; x=1691704554; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KwJBy26yCQ/MHezd9s4R5qRHYs3iJG1/4Ao8pMVQ4Ow=; b=eHBslHzuArU+U8tPXhi5LtJhNVsrjM+cC5Zepdo8Hw+YE4fmqGaEbQgdIYaycpPkmS wInlrsiCWpn7gp1LkOaaWkdIQ8qLnC6S+pQGM4UtVZkwVORK/qRior3hEi7qLTGF777E UJEw+fll81r0lzgSBL1tkmoT9YqQTaV54U2pft1z050D3DqcwLAPWZqnHi88HcopiYKI N5bSVpS3AkUeTcpgQWUhP/CDxzgseEY1RKEx5RmHTymXeoTiZBT2ojEAcMlPgqXtKzaZ 1wpDjJzttdANWVwKqPpEK7lgonSlRjWMzfeYibpDejADxdmLT5rT6R/Nq2SYG+PiXHEZ jA6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691099754; x=1691704554; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KwJBy26yCQ/MHezd9s4R5qRHYs3iJG1/4Ao8pMVQ4Ow=; b=kbksqfS4NADWrwy8y6pb0ZEM/XRTyem6utT2PzbohpBJaLWU3dPoU0pwVNH9tAahcT W/3Xwdv1bfmpFed9URdQpwJmoMxR23vwKxyntqnqOSvaLbQJq9n4DqbmZQn2N23oR5ll QZlE+Z0e9OmCGxASUFVAgx2JnIw5fGKHjDPzdghixZn3sPEtSVTUjhAW8n4PYz9NeFg1 qSrWqI+6j53bkHgxoEb5LeP1ljxMEjt6nUAUgSJeBKOwLvo5OIe+8tUtjERnfi10/u6F su8YHVgqb9lLxuo1mACYl6cJG0LInchFXNcN8U5hVF0nhv7TRSEUTGofpbuT/xI7VFIS FFfw== X-Gm-Message-State: ABy/qLY2Plx70JErlPZ+9w0CLYPLFBx1aK2T3enP4I/QQ2mwAfDluHfa A11A6H1A4ZxuGcUv8sx1obQ= X-Google-Smtp-Source: APBJJlGMfMXcoawpm2ZKMRznLBMsULAqVn+LBFDlz565oYuOa85h5VDgPCjOLLgjylbhtxVL9sT4wA== X-Received: by 2002:a05:6820:2108:b0:56c:5e21:c72d with SMTP id cd8-20020a056820210800b0056c5e21c72dmr14882139oob.1.1691099754239; Thu, 03 Aug 2023 14:55:54 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:48ea:73bf:1876:eaf3]) by smtp.gmail.com with ESMTPSA id w15-20020a4aa98f000000b005660ed0becesm321978oom.39.2023.08.03.14.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 14:55:53 -0700 (PDT) From: Fabio Estevam To: broonie@kernel.org Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com, Fabio Estevam Subject: [PATCH 1/2] ASoC: dt-bindings: wlf,wm8960: Describe the power supplies Date: Thu, 3 Aug 2023 18:55:05 -0300 Message-Id: <20230803215506.142922-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Message-ID-Hash: V2S7CD6HSG45LKWIN34CD3LJF2HKDX2M X-Message-ID-Hash: V2S7CD6HSG45LKWIN34CD3LJF2HKDX2M X-MailFrom: festevam@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Fabio Estevam WM8960 has the following power supplies: - AVDD - DBVDD - DCVDD - SPKVDD1 - SPKVDD1 Add them to bindings to improve the hardware description. Signed-off-by: Fabio Estevam Acked-by: Charles Keepax Acked-by: Conor Dooley --- .../devicetree/bindings/sound/wlf,wm8960.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/wlf,wm8960.yaml b/Documentation/devicetree/bindings/sound/wlf,wm8960.yaml index ee8eba7f0104..82519f6720ef 100644 --- a/Documentation/devicetree/bindings/sound/wlf,wm8960.yaml +++ b/Documentation/devicetree/bindings/sound/wlf,wm8960.yaml @@ -26,6 +26,21 @@ properties: '#sound-dai-cells': const: 0 + AVDD-supply: + description: Analogue supply. + + DBVDD-supply: + description: Digital Buffer Supply. + + DCVDD-supply: + description: Digital Core Supply. + + SPKVDD1-supply: + description: Supply for speaker drivers 1. + + SPKVDD2-supply: + description: Supply for speaker drivers 2. + wlf,capless: type: boolean description: @@ -84,5 +99,10 @@ examples: wlf,hp-cfg = <3 2 3>; wlf,gpio-cfg = <1 3>; wlf,shared-lrclk; + DCVDD-supply = <®_audio>; + DBVDD-supply = <®_audio>; + AVDD-supply = <®_audio>; + SPKVDD1-supply = <®_audio>; + SPKVDD2-supply = <®_audio>; }; }; From patchwork Thu Aug 3 21:55:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 13340861 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41359C00528 for ; Thu, 3 Aug 2023 21:57:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 44F4682B; Thu, 3 Aug 2023 23:57:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 44F4682B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691099872; bh=WCfWs79Jnovl/9teMjna0/EditpRFlhVB9Jvl+c3Mbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=FQuMGzMMsUXJpvaXonWVxg3czshchYbO/U0e7tDgM6Sf+oiOLKS39uOEkYKzw26+b yhxL6Zfag81SwDM9d+LS3Cc9F1//t3JDBG72D7W0aXY4HbU3ITkdl+34GnfCSwXA0S p5ea5x40HJzm73jekO72FMld8ibDp6KowqwOFm2k= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BF4D9F8055C; Thu, 3 Aug 2023 23:56:14 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 22C5DF80552; Thu, 3 Aug 2023 23:56:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 019C6F801D5; Thu, 3 Aug 2023 23:56:09 +0200 (CEST) Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3D231F80149 for ; Thu, 3 Aug 2023 23:55:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3D231F80149 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=WNrHGWva Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-56d26137095so224180eaf.1 for ; Thu, 03 Aug 2023 14:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691099757; x=1691704557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F2UZl4QpAWyxcUJwZDlhPGc5WDh+5opBLbzbcmNoQ3A=; b=WNrHGWvajB9owXhq72vzLzjORCtYxgjEOKy3ToAroBO5cc2iVV/AOa2sGrWr0XC6OS F7OgtlIlUStnTLixmFI+RoRlt37gLqLiAAu1I4V/HyJUTRJXABtAv2jMTLzlNyWy8PNr YqGIeH8sk75ovTjISR7M3n3QbQV4vsc9WMoP8ov9sl0brrhIqHw2FVNscdzgitba0a7F hnfeRmxRL7gs0aA9qbFwvukrXFSyo1vgHimoSTJbPu7v+EZyPmzk0tkHeDLJF45U4ajs KFrY+ad2rWJwpsZPKyIm3cV5wzbAa+xL/2ocix9fblYTDcL03n5JJpRpnEHVnbS6k9Bs m4lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691099757; x=1691704557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F2UZl4QpAWyxcUJwZDlhPGc5WDh+5opBLbzbcmNoQ3A=; b=JvSufTG0lLkaBIaOules2TDZuhaiFLGBZV/kAi6Rg1+tPkPBReiFMZRJaApqU9NNQQ iofDybSe8aEA7XXpuDJZSJKopRvLWklcdfsazX9TinlN0wwG6wBtkiMxjNYLfn08jMMm Bu0tQB3eEZpdOkovVQlvCmLhu8MLzkasQwia4+pUyffNUYGQtLD7ehWqlszw+w39DZDR 6yGzyB385KOx5Ln9KFgMSm17bjEJvmv3iJOWgnLEffdr9vTVGkPZulnio6Scw/6YY0zM On3wiCQTWuyX5ja0b3u6MJAEgXlDlYauBGj+en/uLWLhvieYkjxTCz8jMbagsu5dcrzi MAXQ== X-Gm-Message-State: ABy/qLbYbYkixdCiZAilsmzAjWxKmH8sWT3SDH2+aCJ4ymeSzWwQvZPL 7+1Eg60G+Jk3+g48wC0d+6o= X-Google-Smtp-Source: APBJJlFHH3Qb47XCMYL9bftxfoCCIs5KfvjB0KLR6Ld/3K3C0v7ygbIViTI9b9JE7yUcKBTNwq8mUQ== X-Received: by 2002:a05:6820:2108:b0:56c:5e21:c72d with SMTP id cd8-20020a056820210800b0056c5e21c72dmr14882225oob.1.1691099757208; Thu, 03 Aug 2023 14:55:57 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:48ea:73bf:1876:eaf3]) by smtp.gmail.com with ESMTPSA id w15-20020a4aa98f000000b005660ed0becesm321978oom.39.2023.08.03.14.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 14:55:56 -0700 (PDT) From: Fabio Estevam To: broonie@kernel.org Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com, Fabio Estevam Subject: [PATCH 2/2] ASoC: wm8960: Add support for the power supplies Date: Thu, 3 Aug 2023 18:55:06 -0300 Message-Id: <20230803215506.142922-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230803215506.142922-1-festevam@gmail.com> References: <20230803215506.142922-1-festevam@gmail.com> MIME-Version: 1.0 Message-ID-Hash: 523ZY62YPINSYTY4L6JVPROHVE5GP4PI X-Message-ID-Hash: 523ZY62YPINSYTY4L6JVPROHVE5GP4PI X-MailFrom: festevam@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Fabio Estevam WM8960 has the following power supplies: - AVDD - DBVDD - DCVDD - SPKVDD1 - SPKVDD1 Add support for them. Signed-off-by: Fabio Estevam Acked-by: Charles Keepax --- Hi, I haven't tested this. The motivation for this patch is due to a schema warning on imx8m-evk.dts that says 'SPKVDD1-supply' is not a valid property. sound/soc/codecs/wm8960.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index d4bc97088354..0a50180750e8 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -120,6 +120,15 @@ static bool wm8960_volatile(struct device *dev, unsigned int reg) } } +#define WM8960_NUM_SUPPLIES 5 +static const char *wm8960_supply_names[WM8960_NUM_SUPPLIES] = { + "DCVDD", + "DBVDD", + "AVDD", + "SPKVDD1", + "SPKVDD2", +}; + struct wm8960_priv { struct clk *mclk; struct regmap *regmap; @@ -137,6 +146,7 @@ struct wm8960_priv { bool is_stream_in_use[2]; struct wm8960_data pdata; ktime_t dsch_start; + struct regulator_bulk_data supplies[WM8960_NUM_SUPPLIES]; }; #define wm8960_reset(c) regmap_write(c, WM8960_RESET, 0) @@ -1417,6 +1427,7 @@ static int wm8960_i2c_probe(struct i2c_client *i2c) { struct wm8960_data *pdata = dev_get_platdata(&i2c->dev); struct wm8960_priv *wm8960; + unsigned int i; int ret; u8 val; @@ -1439,6 +1450,23 @@ static int wm8960_i2c_probe(struct i2c_client *i2c) } } + for (i = 0; i < ARRAY_SIZE(wm8960->supplies); i++) + wm8960->supplies[i].supply = wm8960_supply_names[i]; + + ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8960->supplies), + wm8960->supplies); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret); + return ret; + } + + ret = regulator_bulk_enable(ARRAY_SIZE(wm8960->supplies), + wm8960->supplies); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret); + return ret; + } + wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap); if (IS_ERR(wm8960->regmap)) return PTR_ERR(wm8960->regmap); @@ -1505,7 +1533,11 @@ static int wm8960_i2c_probe(struct i2c_client *i2c) } static void wm8960_i2c_remove(struct i2c_client *client) -{} +{ + struct wm8960_priv *wm8960 = i2c_get_clientdata(client); + + regulator_bulk_disable(ARRAY_SIZE(wm8960->supplies), wm8960->supplies); +} static const struct i2c_device_id wm8960_i2c_id[] = { { "wm8960", 0 },