github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: codecs: max9892x: Unify interleave mode OF property

Browse Source 
MAX98926 and MAX98927 are quite similar and use the same bindings,
although drivers were not implementing them in the same way:
MAX98926 has boolean "interleave-mode" but MAX98927 has uint32
"interleave_mode".  Unify them under maxim,interleave-mode, already used
in other Maxim device.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230730201826.70453-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2023-07-30 22:18:25 +02:00 committed by Mark Brown
parent 7136368a2f
commit ddef7518e7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/max98926.c
View File

@ -528,7 +528,8 @@ static int max98926_i2c_probe(struct i2c_client *i2c)
"Failed to allocate regmap: %d\n", ret);
goto err_out;
}
if (of_property_read_bool(i2c->dev.of_node, "interleave-mode"))
if (of_property_read_bool(i2c->dev.of_node, "maxim,interleave-mode") ||
of_property_read_bool(i2c->dev.of_node, "interleave-mode"))
max98926->interleave_mode = true;
if (!of_property_read_u32(i2c->dev.of_node, "vmon-slot-no", &value)) {

16
sound/soc/codecs/max98927.c
View File

@ -879,14 +879,14 @@ static int max98927_i2c_probe(struct i2c_client *i2c)
i2c_set_clientdata(i2c, max98927);
/* update interleave mode info */
if (!of_property_read_u32(i2c->dev.of_node,
"interleave_mode", &value)) {
if (value > 0)
max98927->interleave_mode = true;
else
max98927->interleave_mode = false;
} else
max98927->interleave_mode = false;
if (of_property_read_bool(i2c->dev.of_node, "maxim,interleave-mode")) {
max98927->interleave_mode = true;
} else {
if (!of_property_read_u32(i2c->dev.of_node, "interleave_mode",
&value))
if (value > 0)
max98927->interleave_mode = true;
}
/* regmap initialization */
max98927->regmap