Skip to contentSkip to conversation

ASoC: rt5514: The ACPI also should use the function rt5514_parse_dp()

PATCH In review Oder Chiou 2 participants 3 messages Nov 2, 2017 – Nov 3, 2017

Subsystems (3)
Sound ASoC Realtek audio codecs
lore
Share & tools
lore

Oder Chiou

author maintainer
#0 lore raw

PATCH 1/1 ASoC: rt5514: The ACPI also should use the function rt5514_parse_dp()

The patch fixed that the ACPI cannot access the device property from the function rt5514_parse_dp().

Signed-off-by Oder Chiou <[email protected]>
---
 sound/soc/codecs/rt5514.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5514.c +3 -3
index d7956ab..2a5b5d7 100644
@@ -1143,7 +1143,7 @@ static const struct acpi_device_id rt5514_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match);
 #endif
 
-static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev)
+static int rt5514_parse_dp(struct rt5514_priv *rt5514, struct device *dev)
 {
 	device_property_read_u32(dev, "realtek,dmic-init-delay-ms",
 		&rt5514->pdata.dmic_init_delay);

@@ -1183,8 +1183,8 @@ static int rt5514_i2c_probe(struct i2c_client *i2c,
 
 	if (pdata)
 		rt5514->pdata = *pdata;
-	else if (i2c->dev.of_node)
-		rt5514_parse_dt(rt5514, &i2c->dev);
+	else
+		rt5514_parse_dp(rt5514, &i2c->dev);
 
 	rt5514->i2c_regmap = devm_regmap_init_i2c(i2c, &rt5514_i2c_regmap);
 	if (IS_ERR(rt5514->i2c_regmap)) {
Signature · 1 line
2.7.4
maintainer
#1 lore raw

sound/soc/codecs/rt5514.c static int rt5514_i2c_probe(struct i2c_client *i2c, · line 1187

Quoted 4 lines · Oder Chiou
sound/soc/codecs/rt5514.c +2 -2
-	else if (i2c->dev.of_node)
-		rt5514_parse_dt(rt5514, &i2c->dev);
+	else
+		rt5514_parse_dp(rt5514, &i2c->dev);

Should this be changed to i2c->dev.of_node || ACPI_HANDLE(&i2c->dev) or will the function cope fine if there are no properties at all?

maintainer
#2 lore raw

Applied "ASoC: rt5514: The ACPI also should use the function rt5514_parse_dp()" to the asoc tree

In reply to Oder Chiou

The patch

ASoC: rt5514: The ACPI also should use the function rt5514_parse_dp()

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 28aef24d726f8d503fde24ccf8a14b214355cfb5 Mon Sep 17 00:00:00 2001

From: "[email protected]" <[email protected]>
Date: Thu, 2 Nov 2017 19:21:16 +0800
Subject: [PATCH] ASoC: rt5514: The ACPI also should use the function
rt5514_parse_dp()

The patch fixed that the ACPI cannot access the device property from the function rt5514_parse_dp().

Signed-off-by Oder Chiou <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/codecs/rt5514.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5514.c +3 -3
index d7956ababd11..2a5b5d74e697 100644
@@ -1143,7 +1143,7 @@ static const struct acpi_device_id rt5514_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match);
 #endif
 
-static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev)
+static int rt5514_parse_dp(struct rt5514_priv *rt5514, struct device *dev)
 {
 	device_property_read_u32(dev, "realtek,dmic-init-delay-ms",
 		&rt5514->pdata.dmic_init_delay);

@@ -1183,8 +1183,8 @@ static int rt5514_i2c_probe(struct i2c_client *i2c,
 
 	if (pdata)
 		rt5514->pdata = *pdata;
-	else if (i2c->dev.of_node)
-		rt5514_parse_dt(rt5514, &i2c->dev);
+	else
+		rt5514_parse_dp(rt5514, &i2c->dev);
 
 	rt5514->i2c_regmap = devm_regmap_init_i2c(i2c, &rt5514_i2c_regmap);
 	if (IS_ERR(rt5514->i2c_regmap)) {
Signature · 1 line
2.14.1