From: Carlo Caione <carlo@caione.org>
To: linux@endlessm.com, bardliao@realtek.com, oder_chiou@realtek.com,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
andy.shevchenko@gmail.com
Cc: Carlo Caione <carlo@endlessm.com>
Subject: [PATCH v2] ASoC: rt5645: Introduce mapping for ACPI-defined GPIO
Date: Fri, 9 Feb 2018 14:23:18 +0000 [thread overview]
Message-ID: <20180209142318.14451-1-carlo@caione.org> (raw)
From: Carlo Caione <carlo@endlessm.com>
On at least one notebook (ECS EF20EA) the 'hp-detect' GPIO is defined in
the DSDT table by the ACPI GpioIo resources in _CRS. Add this mapping to
the rt5645 driver to enable the jack detection also on non-DT platforms.
Method (_CRS, 0, NotSerialized)
{
Name (SBUF, ResourceTemplate ()
{
I2cSerialBusV2 (0x001A, ControllerInitiated, 0x00061A80,
AddressingMode7Bit, "\\_SB.PCI0.I2C2",
0x00, ResourceConsumer, , Exclusive,
)
GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x0000,
"\\_SB.GPO3", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x004F
}
GpioIo (Shared, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
"\\_SB.GPO3", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x004F
}
})
Return (SBUF) /* \_SB_.PCI0.I2C2.RTK2._CRS.SBUF */
}
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
Changelog:
v2:
- s/ACPI_HANDLE/has_acpi_companion/
---
sound/soc/codecs/rt5645.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 8f140c8b93ac..8e3d1e4ddb63 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3764,6 +3764,13 @@ static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
return 0;
}
+static const struct acpi_gpio_params hp_detect_gpios = { 1, 0, false };
+
+static const struct acpi_gpio_mapping cht_rt5645_gpios[] = {
+ { "hp-detect-gpios", &hp_detect_gpios, 1 },
+ {},
+};
+
static int rt5645_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -3779,6 +3786,10 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
if (rt5645 == NULL)
return -ENOMEM;
+ if (has_acpi_companion(&i2c->dev))
+ if (devm_acpi_dev_add_driver_gpios(&i2c->dev, cht_rt5645_gpios))
+ dev_dbg(&i2c->dev, "Failed to add driver gpios\n");
+
rt5645->i2c = i2c;
i2c_set_clientdata(i2c, rt5645);
--
2.14.1
next reply other threads:[~2018-02-09 14:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-09 14:23 Carlo Caione [this message]
2018-02-09 14:50 ` Andy Shevchenko
2018-02-15 9:11 ` Carlo Caione
2018-02-15 9:17 ` Hans de Goede
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=20180209142318.14451-1-carlo@caione.org \
--to=carlo@caione.org \
--cc=alsa-devel@alsa-project.org \
--cc=andy.shevchenko@gmail.com \
--cc=bardliao@realtek.com \
--cc=carlo@endlessm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@endlessm.com \
--cc=oder_chiou@realtek.com \
/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
all inboxes | Powered by JetHome®