summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorBenson Leung <bleung@chromium.org>2013-02-21 12:14:55 -0800
committerMatthew Garrett <matthew.garrett@nebula.com>2013-02-27 08:30:46 -0500
commit741bf0c7be835d7fdecac5d942e88b5d43958f40 (patch)
treef21a99bee79a9d598b1c01d6f5cb7015b8479fbe /drivers/platform
parentcc5c3985a3b17cc7a4bfdf084950d92c8919ea4b (diff)
downloadop-kernel-dev-741bf0c7be835d7fdecac5d942e88b5d43958f40.zip
op-kernel-dev-741bf0c7be835d7fdecac5d942e88b5d43958f40.tar.gz
Platform: x86: chromeos_laptop - add i915 gmbuses to adapter names
Add the two other i2c buses (vga and panel) from i915. Chromebook Pixel has input and light sensor devices on these busses. Signed-off-by: Benson Leung <bleung@chromium.org> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/chromeos_laptop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index 04a11cc..93d6680 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -39,11 +39,15 @@ static struct i2c_client *ts;
const char *i2c_adapter_names[] = {
"SMBus I801 adapter",
+ "i915 gmbus vga",
+ "i915 gmbus panel",
};
/* Keep this enum consistent with i2c_adapter_names */
enum i2c_adapter_type {
I2C_ADAPTER_SMBUS = 0,
+ I2C_ADAPTER_VGADDC,
+ I2C_ADAPTER_PANEL,
};
static struct i2c_board_info __initdata cyapa_device = {
OpenPOWER on IntegriCloud