[PATCH 1/4] ASoC: arizona: convert audio pdata parsing to generic device properties

From: Dmitry Torokhov

Date: Fri Nov 06 2026 - 00:40:12 EST


Switch audio platform data parsing in the shared Arizona ASoC helper
from OF-only property APIs to generic device property APIs so audio
parameters can be provided via software nodes or ACPI in addition to
Device Tree.

Align the audio configuration array types in struct arizona_pdata with
generic property types so properties can be read directly into platform
data, using boolean storage for out-mono flags and bounded array reads
that preserve unspecified trailing elements. Drop the CONFIG_OF guards
and obsolete error checks around the audio property parsing calls in all
Arizona codec drivers.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
---
include/linux/mfd/arizona/pdata.h | 15 ++---
sound/soc/codecs/arizona.c | 121 +++++++++++++++++++-------------------
sound/soc/codecs/arizona.h | 2 +-
sound/soc/codecs/cs47l24.c | 9 +--
sound/soc/codecs/wm5102.c | 9 +--
sound/soc/codecs/wm5110.c | 9 +--
sound/soc/codecs/wm8997.c | 9 +--
sound/soc/codecs/wm8998.c | 9 +--
8 files changed, 79 insertions(+), 104 deletions(-)

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index d465dcd8c90a..984b2edfec07 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -11,6 +11,7 @@
#include <dt-bindings/mfd/arizona.h>
#include <linux/regulator/arizona-ldo1.h>
#include <linux/regulator/arizona-micsupp.h>
+#include <linux/types.h>

#define ARIZONA_GPN_DIR_MASK 0x8000 /* GPN_DIR */
#define ARIZONA_GPN_DIR_SHIFT 15 /* GPN_DIR */
@@ -100,7 +101,7 @@ struct arizona_pdata {
* useful for systems where and I2S bus with multiple data
* lines is mastered.
*/
- unsigned int max_channels_clocked[ARIZONA_MAX_AIF];
+ u32 max_channels_clocked[ARIZONA_MAX_AIF];

/** GPIO5 is used for jack detection */
bool jd_gpio5;
@@ -150,7 +151,7 @@ struct arizona_pdata {
int num_micd_configs;

/** Reference voltage for DMIC inputs */
- int dmic_ref[ARIZONA_MAX_INPUT];
+ u32 dmic_ref[ARIZONA_MAX_INPUT];

/** MICBIAS configurations */
struct arizona_micbias micbias[ARIZONA_MAX_MICBIAS];
@@ -161,19 +162,19 @@ struct arizona_pdata {
* wm5102/wm5110/wm8280/wm8997: [0]=IN1 [1]=IN2 [2]=IN3 [3]=IN4
* wm8998: [0]=IN1A [1]=IN2A [2]=IN1B [3]=IN2B
*/
- int inmode[ARIZONA_MAX_INPUT];
+ u32 inmode[ARIZONA_MAX_INPUT];

/** Mode for outputs */
- int out_mono[ARIZONA_MAX_OUTPUT];
+ bool out_mono[ARIZONA_MAX_OUTPUT];

/** Limit output volumes */
- unsigned int out_vol_limit[2 * ARIZONA_MAX_OUTPUT];
+ u32 out_vol_limit[2 * ARIZONA_MAX_OUTPUT];

/** PDM speaker mute setting */
- unsigned int spk_mute[ARIZONA_MAX_PDM_SPK];
+ u32 spk_mute[ARIZONA_MAX_PDM_SPK];

/** PDM speaker format */
- unsigned int spk_fmt[ARIZONA_MAX_PDM_SPK];
+ u32 spk_fmt[ARIZONA_MAX_PDM_SPK];

/** Haptic actuator type */
unsigned int hap_act;
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 7c296c5b24f7..46e2ca48e70f 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -11,8 +11,8 @@
#include <linux/delay.h>
#include <linux/gcd.h>
#include <linux/module.h>
-#include <linux/of.h>
#include <linux/pm_runtime.h>
+#include <linux/property.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/tlv.h>
@@ -2799,77 +2799,76 @@ int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
}
EXPORT_SYMBOL_GPL(arizona_lhpf_coeff_put);

-int arizona_of_get_audio_pdata(struct arizona *arizona)
+static int arizona_get_variable_u32_array(struct device *dev,
+ const char *propname,
+ u32 *dest, size_t n_max)
{
- struct arizona_pdata *pdata = &arizona->pdata;
- struct device_node *np = arizona->dev->of_node;
- u32 val;
- u32 pdm_val[ARIZONA_MAX_PDM_SPK];
- int ret;
- int count = 0;
-
- count = 0;
- of_property_for_each_u32(np, "wlf,inmode", val) {
- if (count == ARRAY_SIZE(pdata->inmode))
- break;
-
- pdata->inmode[count] = val;
- count++;
- }
+ int n, ret;

- count = 0;
- of_property_for_each_u32(np, "wlf,dmic-ref", val) {
- if (count == ARRAY_SIZE(pdata->dmic_ref))
- break;
-
- pdata->dmic_ref[count] = val;
- count++;
- }
+ n = device_property_count_u32(dev, propname);
+ if (n < 0) {
+ if (n == -EINVAL)
+ return 0; /* missing, ignore */

- count = 0;
- of_property_for_each_u32(np, "wlf,out-mono", val) {
- if (count == ARRAY_SIZE(pdata->out_mono))
- break;
-
- pdata->out_mono[count] = !!val;
- count++;
+ dev_warn(dev, "%s malformed (%d)\n", propname, n);
+ return n;
}

- count = 0;
- of_property_for_each_u32(np, "wlf,max-channels-clocked", val) {
- if (count == ARRAY_SIZE(pdata->max_channels_clocked))
- break;
-
- pdata->max_channels_clocked[count] = val;
- count++;
- }
+ if (!n)
+ return 0;

- count = 0;
- of_property_for_each_u32(np, "wlf,out-volume-limit", val) {
- if (count == ARRAY_SIZE(pdata->out_vol_limit))
- break;
+ if (n > n_max)
+ n = n_max;

- pdata->out_vol_limit[count] = val;
- count++;
+ ret = device_property_read_u32_array(dev, propname, dest, n);
+ if (ret < 0) {
+ dev_warn(dev, "Failed to read %s (%d)\n", propname, ret);
+ return ret;
}

- ret = of_property_read_u32_array(np, "wlf,spk-fmt",
- pdm_val, ARRAY_SIZE(pdm_val));
-
- if (ret >= 0)
- for (count = 0; count < ARRAY_SIZE(pdata->spk_fmt); ++count)
- pdata->spk_fmt[count] = pdm_val[count];
-
- ret = of_property_read_u32_array(np, "wlf,spk-mute",
- pdm_val, ARRAY_SIZE(pdm_val));
-
- if (ret >= 0)
- for (count = 0; count < ARRAY_SIZE(pdata->spk_mute); ++count)
- pdata->spk_mute[count] = pdm_val[count];
+ return n;
+}

- return 0;
+void arizona_get_audio_pdata(struct arizona *arizona)
+{
+ struct arizona_pdata *pdata = &arizona->pdata;
+ u32 out_mono[ARRAY_SIZE(pdata->out_mono)];
+ int i, n, ret;
+
+ arizona_get_variable_u32_array(arizona->dev, "wlf,inmode",
+ pdata->inmode,
+ ARRAY_SIZE(pdata->inmode));
+
+ arizona_get_variable_u32_array(arizona->dev, "wlf,dmic-ref",
+ pdata->dmic_ref,
+ ARRAY_SIZE(pdata->dmic_ref));
+
+ n = arizona_get_variable_u32_array(arizona->dev, "wlf,out-mono",
+ out_mono, ARRAY_SIZE(out_mono));
+ for (i = 0; i < n; i++)
+ pdata->out_mono[i] = !!out_mono[i];
+
+ arizona_get_variable_u32_array(arizona->dev, "wlf,max-channels-clocked",
+ pdata->max_channels_clocked,
+ ARRAY_SIZE(pdata->max_channels_clocked));
+
+ arizona_get_variable_u32_array(arizona->dev, "wlf,out-volume-limit",
+ pdata->out_vol_limit,
+ ARRAY_SIZE(pdata->out_vol_limit));
+
+ ret = device_property_read_u32_array(arizona->dev, "wlf,spk-fmt",
+ pdata->spk_fmt,
+ ARRAY_SIZE(pdata->spk_fmt));
+ if (ret && ret != -EINVAL)
+ dev_warn(arizona->dev, "Failed to read wlf,spk-fmt (%d)\n", ret);
+
+ ret = device_property_read_u32_array(arizona->dev, "wlf,spk-mute",
+ pdata->spk_mute,
+ ARRAY_SIZE(pdata->spk_mute));
+ if (ret && ret != -EINVAL)
+ dev_warn(arizona->dev, "Failed to read wlf,spk-mute (%d)\n", ret);
}
-EXPORT_SYMBOL_GPL(arizona_of_get_audio_pdata);
+EXPORT_SYMBOL_GPL(arizona_get_audio_pdata);

MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");
MODULE_AUTHOR("Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>");
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 0703182d87b3..499891e62183 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -388,7 +388,7 @@ static inline int arizona_unregister_notifier(struct snd_soc_component *componen
return blocking_notifier_chain_unregister(&arizona->notifier, nb);
}

-int arizona_of_get_audio_pdata(struct arizona *arizona);
+void arizona_get_audio_pdata(struct arizona *arizona);

int arizona_jack_codec_dev_probe(struct arizona_priv *info, struct device *dev);
int arizona_jack_codec_dev_remove(struct arizona_priv *info);
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 5100b1aac902..09cef46f09fc 100644
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -1222,13 +1222,8 @@ static int cs47l24_probe(struct platform_device *pdev)
if (!cs47l24)
return -ENOMEM;

- if (IS_ENABLED(CONFIG_OF)) {
- if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_of_get_audio_pdata(arizona);
- if (ret < 0)
- return ret;
- }
- }
+ if (!dev_get_platdata(arizona->dev))
+ arizona_get_audio_pdata(arizona);

platform_set_drvdata(pdev, cs47l24);

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 74b775b95bfd..bd747171212e 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -2041,13 +2041,8 @@ static int wm5102_probe(struct platform_device *pdev)
return -ENOMEM;
platform_set_drvdata(pdev, wm5102);

- if (IS_ENABLED(CONFIG_OF)) {
- if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_of_get_audio_pdata(arizona);
- if (ret < 0)
- return ret;
- }
- }
+ if (!dev_get_platdata(arizona->dev))
+ arizona_get_audio_pdata(arizona);

mutex_init(&arizona->dac_comp_lock);

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 7a311c869bd3..73c4ffabf4ec 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2403,13 +2403,8 @@ static int wm5110_probe(struct platform_device *pdev)
return -ENOMEM;
platform_set_drvdata(pdev, wm5110);

- if (IS_ENABLED(CONFIG_OF)) {
- if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_of_get_audio_pdata(arizona);
- if (ret < 0)
- return ret;
- }
- }
+ if (!dev_get_platdata(arizona->dev))
+ arizona_get_audio_pdata(arizona);

wm5110->core.arizona = arizona;
wm5110->core.num_inputs = 8;
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 83106523385a..c126afb65928 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1119,13 +1119,8 @@ static int wm8997_probe(struct platform_device *pdev)
return -ENOMEM;
platform_set_drvdata(pdev, wm8997);

- if (IS_ENABLED(CONFIG_OF)) {
- if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_of_get_audio_pdata(arizona);
- if (ret < 0)
- return ret;
- }
- }
+ if (!dev_get_platdata(arizona->dev))
+ arizona_get_audio_pdata(arizona);

wm8997->core.arizona = arizona;
wm8997->core.num_inputs = 4;
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index 8e6f03d00c71..fdb2018e9367 100644
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -1346,13 +1346,8 @@ static int wm8998_probe(struct platform_device *pdev)
return -ENOMEM;
platform_set_drvdata(pdev, wm8998);

- if (IS_ENABLED(CONFIG_OF)) {
- if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_of_get_audio_pdata(arizona);
- if (ret < 0)
- return ret;
- }
- }
+ if (!dev_get_platdata(arizona->dev))
+ arizona_get_audio_pdata(arizona);

wm8998->core.arizona = arizona;
wm8998->core.num_inputs = 3; /* IN1L, IN1R, IN2 */

--
2.56.0.506.g506a7eabc5-goog