aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroder_chiou@realtek.com <oder_chiou@realtek.com>2017-11-02 07:21:16 -0400
committerMark Brown <broonie@kernel.org>2017-11-03 07:45:51 -0400
commit28aef24d726f8d503fde24ccf8a14b214355cfb5 (patch)
tree999855f663a27f990d199e7ad04c1d566fac9b98
parentd6604145dfccc3dd9e882dd3d6bd2545c9ff64e9 (diff)
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 <oder_chiou@realtek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/rt5514.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index d7956ababd11..2a5b5d74e697 100644
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -1143,7 +1143,7 @@ static const struct acpi_device_id rt5514_acpi_match[] = {
1143MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match); 1143MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match);
1144#endif 1144#endif
1145 1145
1146static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev) 1146static int rt5514_parse_dp(struct rt5514_priv *rt5514, struct device *dev)
1147{ 1147{
1148 device_property_read_u32(dev, "realtek,dmic-init-delay-ms", 1148 device_property_read_u32(dev, "realtek,dmic-init-delay-ms",
1149 &rt5514->pdata.dmic_init_delay); 1149 &rt5514->pdata.dmic_init_delay);
@@ -1183,8 +1183,8 @@ static int rt5514_i2c_probe(struct i2c_client *i2c,
1183 1183
1184 if (pdata) 1184 if (pdata)
1185 rt5514->pdata = *pdata; 1185 rt5514->pdata = *pdata;
1186 else if (i2c->dev.of_node) 1186 else
1187 rt5514_parse_dt(rt5514, &i2c->dev); 1187 rt5514_parse_dp(rt5514, &i2c->dev);
1188 1188
1189 rt5514->i2c_regmap = devm_regmap_init_i2c(i2c, &rt5514_i2c_regmap); 1189 rt5514->i2c_regmap = devm_regmap_init_i2c(i2c, &rt5514_i2c_regmap);
1190 if (IS_ERR(rt5514->i2c_regmap)) { 1190 if (IS_ERR(rt5514->i2c_regmap)) {