* [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks
@ 2014-06-03 22:44 Benson Leung
2014-06-03 22:44 ` [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 Benson Leung
` (4 more replies)
0 siblings, 5 replies; 20+ messages in thread
From: Benson Leung @ 2014-06-03 22:44 UTC (permalink / raw)
To: gene.chen, moch, mika.westerberg, kirill.shutemov, olof,
linux-kernel
Cc: bleung
This patch series should be applied after Mika Westerberg's patch here:
https://patchwork.kernel.org/patch/4288591/
It will add support for the cypress touchpads on the HP Chromebook 14,
Dell Chromebook 11, and Toshiba CB35.
[PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14
[PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 Touch
[PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 2014-06-03 22:44 [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Benson Leung @ 2014-06-03 22:44 ` Benson Leung 2014-06-03 22:44 ` [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch Benson Leung ` (3 subsequent siblings) 4 siblings, 0 replies; 20+ messages in thread From: Benson Leung @ 2014-06-03 22:44 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, kirill.shutemov, olof, linux-kernel Cc: bleung Add support for the trackpad on HP Chromebook 14. Signed-off-by: Benson Leung <bleung@chromium.org> --- drivers/platform/chrome/chromeos_laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index 44806c5..3e113ce 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c @@ -391,6 +391,13 @@ static struct chromeos_laptop chromebook_pixel = { }, }; +static struct chromeos_laptop hp_chromebook_14 = { + .i2c_peripherals = { + /* Touchpad. */ + { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, + }, +}; + static struct chromeos_laptop acer_c7_chromebook = { .i2c_peripherals = { /* Touchpad. */ @@ -457,6 +464,14 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = { _CBDD(chromebook_pixel), }, { + .ident = "HP Chromebook 14", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_PRODUCT_NAME, "Falco"), + }, + _CBDD(hp_chromebook_14), + }, + { .ident = "Acer C7 Chromebook", .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Parrot"), -- 1.9.1.423.g4596e3a ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch 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 ` Benson Leung 2014-06-03 22:44 ` [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch Benson Leung ` (2 subsequent siblings) 4 siblings, 0 replies; 20+ messages in thread From: Benson Leung @ 2014-06-03 22:44 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, kirill.shutemov, olof, linux-kernel Cc: bleung From: Mohammed Habibulla <moch@chromium.org> Add support for Dell Chromebook 11's touch device, which is the same as falco/peppy on the same bus using the LynxPoint-LP I2C via the i2c-designware-pci driver. Based on these patches from the chromeos-3.8 kernel: https://chromium-review.googlesource.com/#/c/65320/ https://chromium-review.googlesource.com/#/c/174664/ Signed-off-by: Mohammed Habibulla <moch@chromium.org> Signed-off-by: Benson Leung <bleung@chromium.org> --- drivers/platform/chrome/chromeos_laptop.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index 3e113ce..c4d89ae 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c @@ -398,6 +398,13 @@ static struct chromeos_laptop hp_chromebook_14 = { }, }; +static struct chromeos_laptop dell_chromebook_11 = { + .i2c_peripherals = { + /* Touchpad. */ + { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, + }, +}; + static struct chromeos_laptop acer_c7_chromebook = { .i2c_peripherals = { /* Touchpad. */ @@ -463,6 +470,13 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = { }, _CBDD(chromebook_pixel), }, + .ident = "Wolf", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_PRODUCT_NAME, "Wolf"), + }, + _CBDD(dell_chromebook_11), + }, { .ident = "HP Chromebook 14", .matches = { -- 1.9.1.423.g4596e3a ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch 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 ` Benson Leung 2014-06-03 22:59 ` [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Olof Johansson 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung 4 siblings, 0 replies; 20+ messages in thread From: Benson Leung @ 2014-06-03 22:44 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, kirill.shutemov, olof, linux-kernel Cc: bleung From: Gene Chen <gene.chen@intel.com> Add support for Leon touch devices, which is the same as falco/peppy/wolf on the same buses using the LynxPoint-LP I2C via the i2c-designware-pci driver. Based on these patches from the chromeos-3.8 kernel: https://chromium-review.googlesource.com/168351 https://chromium-review.googlesource.com/173445 Signed-off-by: Gene Chen <gene.chen@intel.com> Signed-off-by: Benson Leung <bleung@chromium.org> --- drivers/platform/chrome/chromeos_laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index c4d89ae..0f06ab5 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c @@ -405,6 +405,13 @@ static struct chromeos_laptop dell_chromebook_11 = { }, }; +static struct chromeos_laptop toshiba_cb35 = { + .i2c_peripherals = { + /* Touchpad. */ + { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, + }, +}; + static struct chromeos_laptop acer_c7_chromebook = { .i2c_peripherals = { /* Touchpad. */ @@ -486,6 +493,14 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = { _CBDD(hp_chromebook_14), }, { + .ident = "Toshiba CB35", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_PRODUCT_NAME, "Leon"), + }, + _CBDD(toshiba_cb35), + }, + { .ident = "Acer C7 Chromebook", .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Parrot"), -- 1.9.1.423.g4596e3a ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-06-03 22:44 [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Benson Leung ` (2 preceding siblings ...) 2014-06-03 22:44 ` [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch Benson Leung @ 2014-06-03 22:59 ` Olof Johansson 2014-06-17 14:45 ` Benson Leung 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung 4 siblings, 1 reply; 20+ messages in thread From: Olof Johansson @ 2014-06-03 22:59 UTC (permalink / raw) To: Benson Leung Cc: gene.chen, moch, mika.westerberg, Kirill A. Shutemov, linux-kernel@vger.kernel.org Hi, On Tue, Jun 3, 2014 at 3:44 PM, Benson Leung <bleung@chromium.org> wrote: > This patch series should be applied after Mika Westerberg's patch here: > https://patchwork.kernel.org/patch/4288591/ > > It will add support for the cypress touchpads on the HP Chromebook 14, > Dell Chromebook 11, and Toshiba CB35. > > [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 > [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 Touch > [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch The 3.16 merge window is open, please resend after -rc1 and I'll queue it up. -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 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 0 siblings, 1 reply; 20+ messages in thread From: Benson Leung @ 2014-06-17 14:45 UTC (permalink / raw) To: Olof Johansson Cc: gene.chen, moch, Mika Westerberg, Kirill A. Shutemov, linux-kernel@vger.kernel.org Looks like -rc1 is here, so I'll respin these and send them out again. On Tue, Jun 3, 2014 at 3:59 PM, Olof Johansson <olof@lixom.net> wrote: > Hi, > > On Tue, Jun 3, 2014 at 3:44 PM, Benson Leung <bleung@chromium.org> wrote: >> This patch series should be applied after Mika Westerberg's patch here: >> https://patchwork.kernel.org/patch/4288591/ >> >> It will add support for the cypress touchpads on the HP Chromebook 14, >> Dell Chromebook 11, and Toshiba CB35. >> >> [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 >> [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 Touch >> [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch > > The 3.16 merge window is open, please resend after -rc1 and I'll queue it up. > > > -Olof -- Benson Leung Software Engineer, Chrom* OS bleung@chromium.org ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-06-17 14:45 ` Benson Leung @ 2014-07-01 0:05 ` Scot Doyle 2014-07-01 0:06 ` Olof Johansson 0 siblings, 1 reply; 20+ messages in thread From: Scot Doyle @ 2014-07-01 0:05 UTC (permalink / raw) To: Olof Johansson Cc: Benson Leung, gene.chen, moch, Mika Westerberg, Kirill A. Shutemov, linux-kernel@vger.kernel.org Hi Olof, did you apply these patches? I haven't seen them in 3.16-rc3, linux-next, kernel/git/olof/chrome-platform, kernel/git/olof/misc, or kernel/git/arm/arm-soc. Thanks, Scot On Tue, 17 Jun 2014, Benson Leung wrote: > Looks like -rc1 is here, so I'll respin these and send them out again. > > On Tue, Jun 3, 2014 at 3:59 PM, Olof Johansson <olof@lixom.net> wrote: >> Hi, >> >> On Tue, Jun 3, 2014 at 3:44 PM, Benson Leung <bleung@chromium.org> wrote: >>> This patch series should be applied after Mika Westerberg's patch here: >>> https://patchwork.kernel.org/patch/4288591/ >>> >>> It will add support for the cypress touchpads on the HP Chromebook 14, >>> Dell Chromebook 11, and Toshiba CB35. >>> >>> [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 >>> [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 Touch >>> [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch >> >> The 3.16 merge window is open, please resend after -rc1 and I'll queue it up. >> >> >> -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-07-01 0:05 ` Scot Doyle @ 2014-07-01 0:06 ` Olof Johansson 2014-07-10 13:11 ` Scot Doyle 0 siblings, 1 reply; 20+ messages in thread From: Olof Johansson @ 2014-07-01 0:06 UTC (permalink / raw) To: Scot Doyle Cc: Benson Leung, gene.chen, moch, Mika Westerberg, Kirill A. Shutemov, linux-kernel@vger.kernel.org No, not yet. I'll do a pass of merges of this (and arm-soc) on Wednesday. -Olof On Mon, Jun 30, 2014 at 5:05 PM, Scot Doyle <lkml14@scotdoyle.com> wrote: > Hi Olof, did you apply these patches? I haven't seen them in 3.16-rc3, > linux-next, kernel/git/olof/chrome-platform, kernel/git/olof/misc, or > kernel/git/arm/arm-soc. > > Thanks, > Scot > > > On Tue, 17 Jun 2014, Benson Leung wrote: >> >> Looks like -rc1 is here, so I'll respin these and send them out again. >> >> On Tue, Jun 3, 2014 at 3:59 PM, Olof Johansson <olof@lixom.net> wrote: >>> >>> Hi, >>> >>> On Tue, Jun 3, 2014 at 3:44 PM, Benson Leung <bleung@chromium.org> wrote: >>>> >>>> This patch series should be applied after Mika Westerberg's patch here: >>>> https://patchwork.kernel.org/patch/4288591/ >>>> >>>> It will add support for the cypress touchpads on the HP Chromebook 14, >>>> Dell Chromebook 11, and Toshiba CB35. >>>> >>>> [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 >>>> [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 >>>> Touch >>>> [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch >>> >>> >>> The 3.16 merge window is open, please resend after -rc1 and I'll queue it >>> up. >>> >>> >>> -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-07-01 0:06 ` Olof Johansson @ 2014-07-10 13:11 ` Scot Doyle 2014-08-01 13:08 ` Oliver Neukum 0 siblings, 1 reply; 20+ messages in thread From: Scot Doyle @ 2014-07-10 13:11 UTC (permalink / raw) To: Olof Johansson Cc: Benson Leung, gene.chen, moch, Mika Westerberg, linux-kernel@vger.kernel.org Hi Olof, Have these been applied? If not, where should I watch for them? Thank you, Scot On Mon, 30 Jun 2014, Olof Johansson wrote: > No, not yet. I'll do a pass of merges of this (and arm-soc) on Wednesday. > > > -Olof > > On Mon, Jun 30, 2014 at 5:05 PM, Scot Doyle <lkml14@scotdoyle.com> wrote: >> Hi Olof, did you apply these patches? I haven't seen them in 3.16-rc3, >> linux-next, kernel/git/olof/chrome-platform, kernel/git/olof/misc, or >> kernel/git/arm/arm-soc. >> >> Thanks, >> Scot >> >> >> On Tue, 17 Jun 2014, Benson Leung wrote: >>> >>> Looks like -rc1 is here, so I'll respin these and send them out again. >>> >>> On Tue, Jun 3, 2014 at 3:59 PM, Olof Johansson <olof@lixom.net> wrote: >>>> >>>> Hi, >>>> >>>> On Tue, Jun 3, 2014 at 3:44 PM, Benson Leung <bleung@chromium.org> wrote: >>>>> >>>>> This patch series should be applied after Mika Westerberg's patch here: >>>>> https://patchwork.kernel.org/patch/4288591/ >>>>> >>>>> It will add support for the cypress touchpads on the HP Chromebook 14, >>>>> Dell Chromebook 11, and Toshiba CB35. >>>>> >>>>> [PATCH 1/3] platform/chrome: chromeos_laptop - Add HP Chromebook 14 >>>>> [PATCH 2/3] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 >>>>> Touch >>>>> [PATCH 3/3] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch >>>> >>>> >>>> The 3.16 merge window is open, please resend after -rc1 and I'll queue it >>>> up. >>>> >>>> >>>> -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-07-10 13:11 ` Scot Doyle @ 2014-08-01 13:08 ` Oliver Neukum 2014-08-01 14:18 ` Scot Doyle 0 siblings, 1 reply; 20+ messages in thread From: Oliver Neukum @ 2014-08-01 13:08 UTC (permalink / raw) To: Scot Doyle Cc: Olof Johansson, Benson Leung, gene.chen, moch, Mika Westerberg, linux-kernel@vger.kernel.org On Thu, 2014-07-10 at 14:11 +0100, Scot Doyle wrote: > Hi Olof, > > Have these been applied? If not, where should I watch for them? Hi, could you tell me from which tree I could get these patches? Regards Oliver ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-08-01 13:08 ` Oliver Neukum @ 2014-08-01 14:18 ` Scot Doyle 0 siblings, 0 replies; 20+ messages in thread From: Scot Doyle @ 2014-08-01 14:18 UTC (permalink / raw) To: Oliver Neukum Cc: Scot Doyle, Olof Johansson, Benson Leung, gene.chen, moch, Mika Westerberg, linux-kernel@vger.kernel.org On Fri, 1 Aug 2014, Oliver Neukum wrote: > On Thu, 2014-07-10 at 14:11 +0100, Scot Doyle wrote: >> Hi Olof, >> >> Have these been applied? If not, where should I watch for them? > > Hi, > > could you tell me from which tree I could get these patches? > > Regards > Oliver Sure, they're in chrome-platform's for-next branch: https://git.kernel.org/cgit/linux/kernel/git/olof/chrome-platform.git/log/drivers/platform/chrome?h=for-next ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCHv2 0/4] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-06-03 22:44 [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Benson Leung ` (3 preceding siblings ...) 2014-06-03 22:59 ` [PATCH 0/3] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Olof Johansson @ 2014-06-17 21:01 ` Benson Leung 2014-06-17 21:02 ` [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 Benson Leung ` (4 more replies) 4 siblings, 5 replies; 20+ messages in thread From: Benson Leung @ 2014-06-17 21:01 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, lkml14, kirill.shutemov, olof, linux-kernel Cc: bleung This patch series will add support for the cypress touchpads on the HP Chromebook 14, Dell Chromebook 11, and Toshiba CB35. Based on the work here by Mika Westerberg, which this series incorporates : https://patchwork.kernel.org/patch/4288591/ [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 [PATCHv2 3/4] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 Touch [PATCHv2 4/4] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung @ 2014-06-17 21:02 ` Benson Leung 2014-06-17 21:02 ` [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 Benson Leung ` (3 subsequent siblings) 4 siblings, 0 replies; 20+ messages in thread From: Benson Leung @ 2014-06-17 21:02 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, lkml14, kirill.shutemov, olof, linux-kernel Cc: bleung 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 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung 2014-06-17 21:02 ` [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 Benson Leung @ 2014-06-17 21:02 ` 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 ` (2 subsequent siblings) 4 siblings, 1 reply; 20+ messages in thread From: Benson Leung @ 2014-06-17 21:02 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, lkml14, kirill.shutemov, olof, linux-kernel Cc: bleung Add support for the trackpad on HP Chromebook 14. Signed-off-by: Benson Leung <bleung@chromium.org> --- drivers/platform/chrome/chromeos_laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index a241e5f..02e014b 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c @@ -380,6 +380,13 @@ static struct chromeos_laptop chromebook_pixel = { }, }; +static struct chromeos_laptop hp_chromebook_14 = { + .i2c_peripherals = { + /* Touchpad. */ + { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, + }, +}; + static struct chromeos_laptop acer_c7_chromebook = { .i2c_peripherals = { /* Touchpad. */ @@ -446,6 +453,14 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = { _CBDD(chromebook_pixel), }, { + .ident = "HP Chromebook 14", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_PRODUCT_NAME, "Falco"), + }, + _CBDD(hp_chromebook_14), + }, + { .ident = "Acer C7 Chromebook", .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Parrot"), -- 2.0.0.526.g5318336 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 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 0 siblings, 0 replies; 20+ messages in thread From: Mika Westerberg @ 2014-06-18 10:20 UTC (permalink / raw) To: Benson Leung; +Cc: gene.chen, moch, lkml14, kirill.shutemov, olof, linux-kernel On Tue, Jun 17, 2014 at 02:02:01PM -0700, Benson Leung wrote: > Add support for the trackpad on HP Chromebook 14. > > Signed-off-by: Benson Leung <bleung@chromium.org> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCHv2 3/4] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung 2014-06-17 21:02 ` [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 Benson Leung 2014-06-17 21:02 ` [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 Benson Leung @ 2014-06-17 21:02 ` 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-07-10 16:36 ` [PATCHv2 0/4] platform/chrome: chromeos_laptop - Add Haswell Chromebooks Olof Johansson 4 siblings, 1 reply; 20+ messages in thread From: Benson Leung @ 2014-06-17 21:02 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, lkml14, kirill.shutemov, olof, linux-kernel Cc: bleung From: Mohammed Habibulla <moch@chromium.org> Add support for Dell Chromebook 11's touch device, which is the same as falco/peppy on the same bus using the LynxPoint-LP I2C via the i2c-designware-pci driver. Based on these patches from the chromeos-3.8 kernel: https://chromium-review.googlesource.com/#/c/65320/ https://chromium-review.googlesource.com/#/c/174664/ Signed-off-by: Mohammed Habibulla <moch@chromium.org> Signed-off-by: Benson Leung <bleung@chromium.org> --- drivers/platform/chrome/chromeos_laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index 02e014b..e0a6710 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c @@ -387,6 +387,13 @@ static struct chromeos_laptop hp_chromebook_14 = { }, }; +static struct chromeos_laptop dell_chromebook_11 = { + .i2c_peripherals = { + /* Touchpad. */ + { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, + }, +}; + static struct chromeos_laptop acer_c7_chromebook = { .i2c_peripherals = { /* Touchpad. */ @@ -453,6 +460,14 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = { _CBDD(chromebook_pixel), }, { + .ident = "Wolf", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_PRODUCT_NAME, "Wolf"), + }, + _CBDD(dell_chromebook_11), + }, + { .ident = "HP Chromebook 14", .matches = { DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), -- 2.0.0.526.g5318336 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCHv2 3/4] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch 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 0 siblings, 0 replies; 20+ messages in thread From: Mika Westerberg @ 2014-06-18 10:21 UTC (permalink / raw) To: Benson Leung; +Cc: gene.chen, moch, lkml14, kirill.shutemov, olof, linux-kernel On Tue, Jun 17, 2014 at 02:02:02PM -0700, Benson Leung wrote: > From: Mohammed Habibulla <moch@chromium.org> > > Add support for Dell Chromebook 11's touch device, which is the same > as falco/peppy on the same bus using the LynxPoint-LP I2C via the > i2c-designware-pci driver. > > Based on these patches from the chromeos-3.8 kernel: > https://chromium-review.googlesource.com/#/c/65320/ > https://chromium-review.googlesource.com/#/c/174664/ > > Signed-off-by: Mohammed Habibulla <moch@chromium.org> > Signed-off-by: Benson Leung <bleung@chromium.org> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCHv2 4/4] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung ` (2 preceding siblings ...) 2014-06-17 21:02 ` [PATCHv2 3/4] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch Benson Leung @ 2014-06-17 21:02 ` 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 4 siblings, 1 reply; 20+ messages in thread From: Benson Leung @ 2014-06-17 21:02 UTC (permalink / raw) To: gene.chen, moch, mika.westerberg, lkml14, kirill.shutemov, olof, linux-kernel Cc: bleung From: Gene Chen <gene.chen@intel.com> Add support for Leon touch devices, which is the same as falco/peppy/wolf on the same buses using the LynxPoint-LP I2C via the i2c-designware-pci driver. Based on these patches from the chromeos-3.8 kernel: https://chromium-review.googlesource.com/168351 https://chromium-review.googlesource.com/173445 Signed-off-by: Gene Chen <gene.chen@intel.com> Signed-off-by: Benson Leung <bleung@chromium.org> Tested-by: Scot Doyle <lkml14@scotdoyle.com> --- drivers/platform/chrome/chromeos_laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index e0a6710..37fa570 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c @@ -394,6 +394,13 @@ static struct chromeos_laptop dell_chromebook_11 = { }, }; +static struct chromeos_laptop toshiba_cb35 = { + .i2c_peripherals = { + /* Touchpad. */ + { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, + }, +}; + static struct chromeos_laptop acer_c7_chromebook = { .i2c_peripherals = { /* Touchpad. */ @@ -476,6 +483,14 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = { _CBDD(hp_chromebook_14), }, { + .ident = "Toshiba CB35", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_PRODUCT_NAME, "Leon"), + }, + _CBDD(toshiba_cb35), + }, + { .ident = "Acer C7 Chromebook", .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Parrot"), -- 2.0.0.526.g5318336 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCHv2 4/4] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch 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 0 siblings, 0 replies; 20+ messages in thread From: Mika Westerberg @ 2014-06-18 10:22 UTC (permalink / raw) To: Benson Leung; +Cc: gene.chen, moch, lkml14, kirill.shutemov, olof, linux-kernel On Tue, Jun 17, 2014 at 02:02:03PM -0700, Benson Leung wrote: > From: Gene Chen <gene.chen@intel.com> > > Add support for Leon touch devices, which is the same as > falco/peppy/wolf on the same buses using the LynxPoint-LP I2C > via the i2c-designware-pci driver. > > Based on these patches from the chromeos-3.8 kernel: > https://chromium-review.googlesource.com/168351 > https://chromium-review.googlesource.com/173445 > > Signed-off-by: Gene Chen <gene.chen@intel.com> > Signed-off-by: Benson Leung <bleung@chromium.org> > Tested-by: Scot Doyle <lkml14@scotdoyle.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCHv2 0/4] platform/chrome: chromeos_laptop - Add Haswell Chromebooks 2014-06-17 21:01 ` [PATCHv2 0/4] " Benson Leung ` (3 preceding siblings ...) 2014-06-17 21:02 ` [PATCHv2 4/4] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch Benson Leung @ 2014-07-10 16:36 ` Olof Johansson 4 siblings, 0 replies; 20+ messages in thread From: Olof Johansson @ 2014-07-10 16:36 UTC (permalink / raw) To: Benson Leung Cc: gene.chen, moch, mika.westerberg, lkml14, kirill.shutemov, linux-kernel On Tue, Jun 17, 2014 at 02:01:59PM -0700, Benson Leung wrote: > This patch series will add support for the cypress touchpads on the > HP Chromebook 14, Dell Chromebook 11, and Toshiba CB35. > > Based on the work here by Mika Westerberg, which this series incorporates : > https://patchwork.kernel.org/patch/4288591/ > > [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 > [PATCHv2 2/4] platform/chrome: chromeos_laptop - Add HP Chromebook 14 > [PATCHv2 3/4] platform/chrome: chromeos_laptop - Add Dell Chromebook 11 Touch > [PATCHv2 4/4] platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch Applied, sorry for the repeated delays. :-/ -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2014-08-01 14:31 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 ` [PATCHv2 1/4] platform/chrome: chromeos_laptop - Add support for Acer C720 Benson Leung 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
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).