From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F023D42B72D for ; Tue, 9 Jun 2026 16:23:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781022201; cv=none; b=UmgMJg3V7KVluP22iqGGkWiOpHH/D8g/c4EEgsIBqPsTSMIVpNZHJ1EdfTNmToWwWwt1WHyATBoXrXtyopwxKZobOLSoBRD869axiLkVxwDkoVG+ge86w8+BayXir6wQ28VzjS0tmZ8vSSgI2uqqf1leWhQRn3d3fi95eCQcNmQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781022201; c=relaxed/simple; bh=kWzw/voZgkZ9F987lwcQbashORT/zBgp+puHFaAHgP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CE1ZdWyRnjwr1U2H1T0lD4HCLanwIOY0ogpv8NQWPJfvMZSs3/Gqa3y0yvrzM9akWR0Lv3DJIqTAVPVZe+uD6q4X2QA4qaSB3EqXkUqoOTI/uUFAytJmuATKgHcHlw59Z5CPBze8iEdnxVjpVZNZtkQnxQRUlWzg56hIfUHYIBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=tAxk48Gn; arc=none smtp.client-ip=209.85.160.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tAxk48Gn" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-5176096116fso62898391cf.0 for ; Tue, 09 Jun 2026 09:23:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781022199; x=1781626999; darn=vger.kernel.org; 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=pPPYmlM0l3hrpJwW2jPS8aUg+kvVKXo2i1UV0uK9TUI=; b=tAxk48GnNWBcpEUsh7m+Y31kRIDbvz66MGku9F5Cx0tMsIRETDH3z9srBoK4d0hTyD h3pflhJ2hdaLQ1Wc8412lcaqUmyHlokV3a2A0cJpn82KHCSvumGpfAtG0y46cDxBEItJ ltmr5WlfM8qvYKKzL+xCfJjs3MTEl/fRZxz7uBmR56d88ltM3lfNBpr8tlN46+CjqCub X4l4kbJ+1oG9uZBYit8AkI6fQ3mMZTLnaeX/0HI8Hj/ZrQfTbUjsHu2Bsr0PqUveuZBS q8+yGjzZg4/1maEsQokGlJCHKfBYsDRPrx/LHusmFYCsQnwcJV2HePX4snnSK+r8vPg7 HVjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781022199; x=1781626999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pPPYmlM0l3hrpJwW2jPS8aUg+kvVKXo2i1UV0uK9TUI=; b=agb25UGYLLaseMKGjjz4LtOihlRfiIF1IDGLezetT915TtSkVqKI411jvItNnFhRkp Mc4sfqWk1gJOSM+w1IbMgeyWPw9PRfafVetxM8yAV/YCwqCgc3yWR8urYe7T0bMg8YiM E8J7MPQ2KM7ypCfcW4zFY34xtvP8UopHtXMvZC/V2MsaGGX5k+GVycq03UrpDkscczGr chMw4S/WG4iCtMIAx5B2G7VrRZWpoeuUaRScrYZcVKjiSLq0jfg+CpfKOypfl+tw9Y8/ uidbEeUNMq9U3/r5jeUS0BUL718w7eYowP4qs+PGx0k/twhxR1bGlNp13yNNbelHwZma M46w== X-Forwarded-Encrypted: i=1; AFNElJ9G5vrB1FbUuu0BFC17idWP+FEU6KsZsaGVNqP+lYOV/fVfCn4TnZEMUOzkqlRWfSrpR7KdP4yVYcGIJQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yw/MgCima027IBhaOVz9nfTeva1rJnNep747i7TLqiG0N9SXelz 5wFxpEx+zCxZYt6M8gpZQUYCW+tnBG5f2XmV5AFyN2SodWo52JgxCzln X-Gm-Gg: Acq92OGKbnVYdLyUMS/ZZn0S1cKaAqNoDwGTu+pdZ0k8VFzWCPVYTmKlzNagQIxd5lL ECBRW+ElH9hiPoWtNppCcLLOljHVxwhyW3tV9JcBJSmjAX2/Nhh9u/yscQdeyugdjovlkwovczF yulB/ZX6wjzWtexVnzxiaJjhk7pHyQ41sZG/Y1m3D5uGeRSQ3+MVlh1DFs9qU8HCiCoeGkC1cs0 BwItKBhPVxuZHrYVFN8lhVTjG5M1BJ3GsEdzatNpuxjmG44BsazMxFIpPFOvTifixgCg9kqmNQk p7GU2VOln76agijBqltLL9UETcp750kSkc+I1C/X5gznFiWjofpUIF92PcF6A3DPvMsUB3SIJGX SEbbf3WDtvfTA3Sje+FmlPgYz9rjMwZcpJekewvN1lOrC8iX3inT4TVMK0HFOr15WmMGGBvbwPC QN8qkgdhv1dNu9TIwAB9AujkOQlop5/ftV86JTEw== X-Received: by 2002:a05:622a:558a:b0:50e:a1aa:2cd9 with SMTP id d75a77b69052e-51795ae6d5cmr291655031cf.15.1781022199024; Tue, 09 Jun 2026 09:23:19 -0700 (PDT) Received: from localhost ([142.181.163.192]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51775dffb14sm195328071cf.28.2026.06.09.09.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 09:23:18 -0700 (PDT) From: Richard Acayan To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org Cc: Nickolay Goppen , Adam Skladowski , Vladimir Lypak , Dmitry Baryshkov , Mohammad Rafi Shaik , Johan Hovold , Kees Cook , Charles Keepax , Kuninori Morimoto , Richard Acayan Subject: [PATCH v5 13/15] ASoC: msm8916-wcd-analog: add pm8950 codec Date: Tue, 9 Jun 2026 12:22:53 -0400 Message-ID: <20260609162255.31074-14-mailingradian@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260609162255.31074-1-mailingradian@gmail.com> References: <20260609162255.31074-1-mailingradian@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Adam Skladowski Add regs overrides for PM8950 codec and implement matching reg overrides via compatible. Signed-off-by: Adam Skladowski Reviewed-by: Dmitry Baryshkov Signed-off-by: Richard Acayan --- sound/soc/codecs/msm8916-wcd-analog.c | 52 ++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 9ca381812975..13df60409857 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -232,6 +232,8 @@ #define RX_EAR_CTL_PA_SEL_MASK BIT(7) #define RX_EAR_CTL_PA_SEL BIT(7) +#define CDC_A_RX_EAR_STATUS (0xf1A1) + #define CDC_A_SPKR_DAC_CTL (0xf1B0) #define SPKR_DAC_CTL_DAC_RESET_MASK BIT(4) #define SPKR_DAC_CTL_DAC_RESET_NORMAL 0 @@ -250,6 +252,7 @@ SPKR_DRV_CAL_EN | SPKR_DRV_SETTLE_EN | \ SPKR_DRV_FW_EN | SPKR_DRV_BOOST_SET | \ SPKR_DRV_CMFB_SET | SPKR_DRV_GAIN_SET) +#define CDC_A_SPKR_ANA_BIAS_SET (0xf1B3) #define CDC_A_SPKR_OCP_CTL (0xf1B4) #define CDC_A_SPKR_PWRSTG_CTL (0xf1B5) #define SPKR_PWRSTG_CTL_DAC_EN_MASK BIT(0) @@ -264,6 +267,7 @@ #define CDC_A_SPKR_DRV_DBG (0xf1B7) #define CDC_A_CURRENT_LIMIT (0xf1C0) +#define CDC_A_BYPASS_MODE (0xf1C2) #define CDC_A_BOOST_EN_CTL (0xf1C3) #define CDC_A_SLOPE_COMP_IP_ZERO (0xf1C4) #define CDC_A_SEC_ACCESS (0xf1D0) @@ -286,6 +290,11 @@ static const char * const supply_names[] = { #define MBHC_MAX_BUTTONS (5) +struct wcd_reg_seq { + const struct reg_default *seq; + int seq_size; +}; + struct pm8916_wcd_analog_priv { u16 pmic_rev; u16 codec_version; @@ -715,9 +724,41 @@ static const struct reg_default wcd_reg_defaults_2_0[] = { {CDC_A_MASTER_BIAS_CTL, 0x30}, }; +static const struct wcd_reg_seq pm8916_data = { + .seq = wcd_reg_defaults_2_0, + .seq_size = ARRAY_SIZE(wcd_reg_defaults_2_0), +}; + +static const struct reg_default wcd_reg_defaults_pm8950[] = { + {CDC_A_RX_COM_OCP_CTL, 0xd1}, + {CDC_A_RX_COM_OCP_COUNT, 0xff}, + {CDC_D_SEC_ACCESS, 0xa5}, + {CDC_D_PERPH_RESET_CTL3, 0x0f}, + {CDC_A_TX_1_2_OPAMP_BIAS, 0x4c}, + {CDC_A_NCP_FBCTRL, 0xa8}, + {CDC_A_NCP_VCTRL, 0xa4}, + {CDC_A_SPKR_DRV_CTL, 0x69}, + {CDC_A_SPKR_DRV_DBG, 0x01}, + {CDC_A_SEC_ACCESS, 0xa5}, + {CDC_A_PERPH_RESET_CTL3, 0x0f}, + {CDC_A_CURRENT_LIMIT, 0x82}, + {CDC_A_SPKR_ANA_BIAS_SET, 0x41}, + {CDC_A_SPKR_DAC_CTL, 0x03}, + {CDC_A_SPKR_OCP_CTL, 0xe1}, + {CDC_A_RX_HPH_BIAS_PA, 0xfa}, + {CDC_A_MASTER_BIAS_CTL, 0x30}, + {CDC_A_MICB_1_INT_RBIAS, 0x00}, +}; + +static const struct wcd_reg_seq pm8950_data = { + .seq = wcd_reg_defaults_pm8950, + .seq_size = ARRAY_SIZE(wcd_reg_defaults_pm8950), +}; + static int pm8916_wcd_analog_probe(struct snd_soc_component *component) { struct pm8916_wcd_analog_priv *priv = dev_get_drvdata(component->dev); + const struct wcd_reg_seq *wcd_reg_init_data; int err, reg; err = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies); @@ -738,9 +779,11 @@ static int pm8916_wcd_analog_probe(struct snd_soc_component *component) snd_soc_component_write(component, CDC_D_PERPH_RESET_CTL4, 0x01); snd_soc_component_write(component, CDC_A_PERPH_RESET_CTL4, 0x01); - for (reg = 0; reg < ARRAY_SIZE(wcd_reg_defaults_2_0); reg++) - snd_soc_component_write(component, wcd_reg_defaults_2_0[reg].reg, - wcd_reg_defaults_2_0[reg].def); + wcd_reg_init_data = of_device_get_match_data(component->dev); + + for (reg = 0; reg < wcd_reg_init_data->seq_size; reg++) + snd_soc_component_write(component, wcd_reg_init_data->seq[reg].reg, + wcd_reg_init_data->seq[reg].def); priv->component = component; @@ -1259,7 +1302,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) } static const struct of_device_id pm8916_wcd_analog_spmi_match_table[] = { - { .compatible = "qcom,pm8916-wcd-analog-codec", }, + { .compatible = "qcom,pm8916-wcd-analog-codec", .data = &pm8916_data }, + { .compatible = "qcom,pm8950-wcd-analog-codec", .data = &pm8950_data }, { } }; -- 2.54.0