From: Benson Leung <bleung@chromium.org>
To: gene.chen@intel.com, moch@chromium.org,
mika.westerberg@linux.intel.com, lkml14@scotdoyle.com,
kirill.shutemov@linux.intel.com, olof@lixom.net,
linux-kernel@vger.kernel.org
Cc: bleung@chromium.org
Subject: [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720
Date: Tue, 17 Jun 2014 14:02:00 -0700 [thread overview]
Message-ID: <1403038923-19444-2-git-send-email-bleung@chromium.org> (raw)
In-Reply-To: <1403038923-19444-1-git-send-email-bleung@chromium.org>
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Acer C720 has touchpad and light sensor connected to a separate I2C buses.
Since the designware I2C host controller driver has two instances on this
particular machine we need a way to match the correct instance. Add support
for this and then register both C720 touchpad and light sensor.
This code is based on following patch from Benson Leung:
https://patchwork.kernel.org/patch/3074411/
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
---
drivers/platform/chrome/chromeos_laptop.c | 45 ++++++++++++++++++++++++++-----
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 7f1a2e2..a241e5f 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -45,6 +45,8 @@ static const char *i2c_adapter_names[] = {
"SMBus I801 adapter",
"i915 gmbus vga",
"i915 gmbus panel",
+ "i2c-designware-pci",
+ "i2c-designware-pci",
};
/* Keep this enum consistent with i2c_adapter_names */
@@ -52,6 +54,8 @@ enum i2c_adapter_type {
I2C_ADAPTER_SMBUS = 0,
I2C_ADAPTER_VGADDC,
I2C_ADAPTER_PANEL,
+ I2C_ADAPTER_DESIGNWARE_0,
+ I2C_ADAPTER_DESIGNWARE_1,
};
struct i2c_peripheral {
@@ -172,29 +176,42 @@ static struct i2c_client *__add_probed_i2c_device(
return client;
}
+struct i2c_lookup {
+ const char *name;
+ int instance;
+ int n;
+};
+
static int __find_i2c_adap(struct device *dev, void *data)
{
- const char *name = data;
+ struct i2c_lookup *lookup = data;
static const char *prefix = "i2c-";
struct i2c_adapter *adapter;
if (strncmp(dev_name(dev), prefix, strlen(prefix)) != 0)
return 0;
adapter = to_i2c_adapter(dev);
- return (strncmp(adapter->name, name, strlen(name)) == 0);
+ if (strncmp(adapter->name, lookup->name, strlen(lookup->name)) == 0 &&
+ lookup->n++ == lookup->instance)
+ return 1;
+ return 0;
}
static int find_i2c_adapter_num(enum i2c_adapter_type type)
{
struct device *dev = NULL;
struct i2c_adapter *adapter;
- const char *name = i2c_adapter_names[type];
+ struct i2c_lookup lookup;
+
+ memset(&lookup, 0, sizeof(lookup));
+ lookup.name = i2c_adapter_names[type];
+ lookup.instance = (type == I2C_ADAPTER_DESIGNWARE_1) ? 1 : 0;
+
/* find the adapter by name */
- dev = bus_find_device(&i2c_bus_type, NULL, (void *)name,
- __find_i2c_adap);
+ dev = bus_find_device(&i2c_bus_type, NULL, &lookup, __find_i2c_adap);
if (!dev) {
/* Adapters may appear later. Deferred probing will retry */
pr_notice("%s: i2c adapter %s not found on system.\n", __func__,
- name);
+ lookup.name);
return -ENODEV;
}
adapter = to_i2c_adapter(dev);
@@ -377,6 +394,15 @@ static struct chromeos_laptop acer_ac700 = {
},
};
+static struct chromeos_laptop acer_c720 = {
+ .i2c_peripherals = {
+ /* Touchpad. */
+ { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 },
+ /* Light Sensor. */
+ { .add = setup_isl29018_als, I2C_ADAPTER_DESIGNWARE_1 },
+ },
+};
+
static struct chromeos_laptop hp_pavilion_14_chromebook = {
.i2c_peripherals = {
/* Touchpad. */
@@ -434,6 +460,13 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
_CBDD(acer_ac700),
},
{
+ .ident = "Acer C720",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Peppy"),
+ },
+ _CBDD(acer_c720),
+ },
+ {
.ident = "HP Pavilion 14 Chromebook",
.matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "Butterfly"),
--
2.0.0.526.g5318336
next prev parent reply other threads:[~2014-06-17 21:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 22:44 [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Benson Leung
2014-06-03 22:44 ` [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 Benson Leung
2014-06-03 22:44 ` [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch Benson Leung
2014-06-03 22:44 ` [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch Benson Leung
2014-06-03 22:59 ` [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Olof Johansson
2014-06-17 14:45 ` Benson Leung
2014-07-01 0:05 ` Scot Doyle
2014-07-01 0:06 ` Olof Johansson
2014-07-10 13:11 ` Scot Doyle
2014-08-01 13:08 ` Oliver Neukum
2014-08-01 14:18 ` Scot Doyle
2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung
2014-06-17 21:02 ` Benson Leung [this message]
2014-06-17 21:02 ` [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 Benson Leung
2014-06-18 10:20 ` Mika Westerberg
2014-06-17 21:02 ` [PATCHv2 3/4] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch Benson Leung
2014-06-18 10:21 ` Mika Westerberg
2014-06-17 21:02 ` [PATCHv2 4/4] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch Benson Leung
2014-06-18 10:22 ` Mika Westerberg
2014-07-10 16:36 ` [PATCHv2 0/4] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Olof Johansson
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=1403038923-19444-2-git-send-email-bleung@chromium.org \
--to=bleung@chromium.org \
--cc=gene.chen@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkml14@scotdoyle.com \
--cc=mika.westerberg@linux.intel.com \
--cc=moch@chromium.org \
--cc=olof@lixom.net \
/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).