From: Fletcher Woodruff <fletcherw@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Fletcher Woodruff <fletcherw@chromium.org>,
Bard Liao <bardliao@realtek.com>,
Jaroslav Kysela <perex@perex.cz>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Oder Chiou <oder_chiou@realtek.com>,
Takashi Iwai <tiwai@suse.com>,
Curtis Malainey <cujomalainey@chromium.org>,
Ross Zwisler <zwisler@google.org>,
alsa-devel@alsa-project.org
Subject: [PATCH 2/2] ASoC: rt5677: make ACPI property names match _DSD
Date: Mon, 1 Apr 2019 14:55:19 -0600 [thread overview]
Message-ID: <20190401205519.34023-2-fletcherw@chromium.org> (raw)
In-Reply-To: <20190401205519.34023-1-fletcherw@chromium.org>
The rt5677 driver is using the wrong property names to read from ACPI.
Update the property names to match those from _DSD, so that the correct
GPIO pin numbers are read and that plug-detection works.
With this patch, plugging and unplugging the headphone jack switches
between headphones and speakers automatically.
Signed-off-by: Fletcher Woodruff <fletcherw@chromium.org>
---
sound/soc/codecs/rt5677.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 33380f82b7008f..1f725086cee39c 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4998,25 +4998,6 @@ static const struct acpi_device_id rt5677_acpi_match[] = {
};
MODULE_DEVICE_TABLE(acpi, rt5677_acpi_match);
-static void rt5677_read_acpi_properties(struct rt5677_priv *rt5677,
- struct device *dev)
-{
- u32 val;
-
- if (!device_property_read_u32(dev, "DCLK", &val))
- rt5677->pdata.dmic2_clk_pin = val;
-
- rt5677->pdata.in1_diff = device_property_read_bool(dev, "IN1");
- rt5677->pdata.in2_diff = device_property_read_bool(dev, "IN2");
- rt5677->pdata.lout1_diff = device_property_read_bool(dev, "OUT1");
- rt5677->pdata.lout2_diff = device_property_read_bool(dev, "OUT2");
- rt5677->pdata.lout3_diff = device_property_read_bool(dev, "OUT3");
-
- device_property_read_u32(dev, "JD1", &rt5677->pdata.jd1_gpio);
- device_property_read_u32(dev, "JD2", &rt5677->pdata.jd2_gpio);
- device_property_read_u32(dev, "JD3", &rt5677->pdata.jd3_gpio);
-}
-
static void rt5677_read_device_properties(struct rt5677_priv *rt5677,
struct device *dev)
{
@@ -5273,19 +5254,23 @@ static int rt5677_i2c_probe(struct i2c_client *i2c)
if (match_id)
rt5677->type = (enum rt5677_type)match_id->data;
- rt5677_read_device_properties(rt5677, &i2c->dev);
} else if (ACPI_HANDLE(&i2c->dev)) {
const struct acpi_device_id *acpi_id;
+ u32 val;
acpi_id = acpi_match_device(rt5677_acpi_match, &i2c->dev);
if (acpi_id)
rt5677->type = (enum rt5677_type)acpi_id->driver_data;
- rt5677_read_acpi_properties(rt5677, &i2c->dev);
+ if (!device_property_read_u32(&i2c->dev,
+ "realtek,dmic2_clk_pin", &val))
+ rt5677->pdata.dmic2_clk_pin = val;
} else {
return -EINVAL;
}
+ rt5677_read_device_properties(rt5677, &i2c->dev);
+
/* pow-ldo2 and reset are optional. The codec pins may be statically
* connected on the board without gpios. If the gpio device property
* isn't specified, devm_gpiod_get_optional returns NULL.
--
2.21.0.392.gf8f6787159e-goog
next prev parent reply other threads:[~2019-04-01 20:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 20:55 [PATCH 1/2] ASoC: rt5677: allow multiple interrupt sources Fletcher Woodruff
2019-04-01 20:55 ` Fletcher Woodruff [this message]
2019-04-02 5:06 ` [PATCH 2/2] ASoC: rt5677: make ACPI property names match _DSD Mark Brown
2019-04-02 15:52 ` Fletcher Woodruff
2019-04-03 3:33 ` Mark Brown
2019-04-05 20:42 ` [PATCH v2 0/3] Fix jack detection for Chromebook Pixel Fletcher Woodruff
2019-04-05 20:42 ` [PATCH v2 1/3] ASoC: rt5677: allow multiple interrupt sources Fletcher Woodruff
2019-04-08 6:10 ` Mark Brown
2019-04-09 19:53 ` Fletcher Woodruff
2019-04-05 20:42 ` [PATCH v2 2/3] ASoC: rt5677: handle concurrent interrupts Fletcher Woodruff
2019-04-05 20:42 ` [PATCH v2 3/3] ASoC: rt5677: fall back to DT prop names on error Fletcher Woodruff
2019-04-15 19:45 ` [PATCH v3 0/3] Fix jack detection for Chromebook Pixel Fletcher Woodruff
2019-04-15 19:45 ` [PATCH v3 1/3] ASoC: rt5677: allow multiple interrupt sources Fletcher Woodruff
2019-04-25 15:31 ` [PATCH v3 2/3] ASoC: rt5677: handle concurrent interrupts Fletcher Woodruff
2019-04-25 15:31 ` [PATCH v3 3/3] ASoC: rt5677: fall back to DT prop names on error Fletcher Woodruff
2019-04-18 9:07 ` [PATCH v3 0/3] Fix jack detection for Chromebook Pixel Mark Brown
2019-04-25 15:28 ` Fletcher Woodruff
2019-04-02 5:02 ` [PATCH 1/2] ASoC: rt5677: allow multiple interrupt sources Mark Brown
2019-04-03 21:32 ` Fletcher Woodruff
2019-04-04 5:32 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190401205519.34023-2-fletcherw@chromium.org \
--to=fletcherw@chromium.org \
--cc=alsa-devel@alsa-project.org \
--cc=bardliao@realtek.com \
--cc=broonie@kernel.org \
--cc=cujomalainey@chromium.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oder_chiou@realtek.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=zwisler@google.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).