diff options
author | Furquan Shaikh <furquan@chromium.org> | 2017-02-19 01:18:09 -0800 |
---|---|---|
committer | Furquan Shaikh <furquan@google.com> | 2017-02-20 21:41:34 +0100 |
commit | 5360c7ef94c9415fd0decd99b6a2d243f9c52e4c (patch) | |
tree | 073198f962b49d7db78b3def2f42ef77557e5e5d /src/drivers | |
parent | 658a6dc78de74509d977f71664592e8a77cdec97 (diff) |
drivers/i2c: Use I2C HID driver for wacom devices
Wacom I2C driver does the same thing as I2C HID driver, other than
defining macros for Wacom HID. Instead of maintaining two separate
drivers providing the same functionality, update all wacom devices to
use generic I2C HID driver.
BUG=None
BRANCH=None
TEST=Verified that ACPI nodes for wacom devices are unchanged.
Change-Id: Ibb3226d1f3934f5c3c5d98b939756775d11b792c
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/18401
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/i2c/wacom/Kconfig | 3 | ||||
-rw-r--r-- | src/drivers/i2c/wacom/Makefile.inc | 1 | ||||
-rw-r--r-- | src/drivers/i2c/wacom/chip.h | 32 | ||||
-rw-r--r-- | src/drivers/i2c/wacom/wacom.c | 60 |
4 files changed, 0 insertions, 96 deletions
diff --git a/src/drivers/i2c/wacom/Kconfig b/src/drivers/i2c/wacom/Kconfig deleted file mode 100644 index be2bf8336b..0000000000 --- a/src/drivers/i2c/wacom/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config DRIVERS_I2C_WACOM - bool - select DRIVERS_I2C_GENERIC diff --git a/src/drivers/i2c/wacom/Makefile.inc b/src/drivers/i2c/wacom/Makefile.inc deleted file mode 100644 index e8df2c68a8..0000000000 --- a/src/drivers/i2c/wacom/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -ramstage-$(CONFIG_DRIVERS_I2C_WACOM) += wacom.c diff --git a/src/drivers/i2c/wacom/chip.h b/src/drivers/i2c/wacom/chip.h deleted file mode 100644 index fc75194119..0000000000 --- a/src/drivers/i2c/wacom/chip.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2016 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __I2C_WACOM_CHIP_H__ -#define __I2C_WACOM_CHIP_H__ - -#include <drivers/i2c/generic/chip.h> - -#define WCOM50C1_HID "WCOM50C1" -#define WCOMNTN2_HID "WCOMNTN2" -#define PNP0C50_CID "PNP0C50" -#define WCOM_TS_DESC "WCOM Touchscreen" -#define WCOM_DT_DESC "WCOM Digitizer" - -struct drivers_i2c_wacom_config { - struct drivers_i2c_generic_config generic; - uint8_t hid_desc_reg_offset; -}; - -#endif /* __I2C_WACOM_CHIP_H__ */ diff --git a/src/drivers/i2c/wacom/wacom.c b/src/drivers/i2c/wacom/wacom.c deleted file mode 100644 index e6d12775a2..0000000000 --- a/src/drivers/i2c/wacom/wacom.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2016 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/acpigen_dsm.h> -#include <device/device.h> -#include <stdint.h> -#include "chip.h" - -static void i2c_wacom_fill_dsm(struct device *dev) -{ - struct drivers_i2c_wacom_config *config = dev->chip_info; - struct dsm_i2c_hid_config dsm_config = { - .hid_desc_reg_offset = config->hid_desc_reg_offset, - }; - - acpigen_write_dsm_i2c_hid(&dsm_config); -} - -static void i2c_wacom_fill_ssdt_generator(struct device *dev) -{ - struct drivers_i2c_wacom_config *config = dev->chip_info; - i2c_generic_fill_ssdt(dev, &i2c_wacom_fill_dsm, &config->generic); -} - -static const char *i2c_wacom_acpi_name(struct device *dev) -{ - return "WCOM"; -} - -static struct device_operations i2c_wacom_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, - .enable_resources = DEVICE_NOOP, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &i2c_wacom_acpi_name, - .acpi_fill_ssdt_generator = &i2c_wacom_fill_ssdt_generator, -#endif -}; - -static void i2c_wacom_enable(struct device *dev) -{ - dev->ops = &i2c_wacom_ops; -} - -struct chip_operations drivers_i2c_wacom_ops = { - CHIP_NAME("Wacom I2C Device") - .enable_dev = &i2c_wacom_enable -}; |