From 73edd2b7c07fb8ad5455086f126c079734a904b7 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 9 Nov 2016 10:52:12 -0800 Subject: drivers/i2c/wacom: Make the driver more generic Wacom I2C driver can be used by devices other than touchscreen. e.g. digitizer. So there is no need to name the driver with touchscreen specific attributes. Only a separate descriptor name is required that needs to be set by mainboard correctly. BUG=chrome-os-partner:56246 BRANCH=None TEST=Compiles successfully. Change-Id: I0d32a4adae477373b3f4c5f3abbe188860701194 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/17341 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/drivers/i2c/wacom/Kconfig | 3 ++ src/drivers/i2c/wacom/Makefile.inc | 1 + src/drivers/i2c/wacom/chip.h | 32 +++++++++++++++++++ src/drivers/i2c/wacom/wacom.c | 59 +++++++++++++++++++++++++++++++++++ src/drivers/i2c/wacom_ts/Kconfig | 3 -- src/drivers/i2c/wacom_ts/Makefile.inc | 1 - src/drivers/i2c/wacom_ts/chip.h | 31 ------------------ src/drivers/i2c/wacom_ts/ts.c | 59 ----------------------------------- 8 files changed, 95 insertions(+), 94 deletions(-) create mode 100644 src/drivers/i2c/wacom/Kconfig create mode 100644 src/drivers/i2c/wacom/Makefile.inc create mode 100644 src/drivers/i2c/wacom/chip.h create mode 100644 src/drivers/i2c/wacom/wacom.c delete mode 100644 src/drivers/i2c/wacom_ts/Kconfig delete mode 100644 src/drivers/i2c/wacom_ts/Makefile.inc delete mode 100644 src/drivers/i2c/wacom_ts/chip.h delete mode 100644 src/drivers/i2c/wacom_ts/ts.c (limited to 'src/drivers') diff --git a/src/drivers/i2c/wacom/Kconfig b/src/drivers/i2c/wacom/Kconfig new file mode 100644 index 0000000000..be2bf8336b --- /dev/null +++ b/src/drivers/i2c/wacom/Kconfig @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000000..e8df2c68a8 --- /dev/null +++ b/src/drivers/i2c/wacom/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_DRIVERS_I2C_WACOM) += wacom.c diff --git a/src/drivers/i2c/wacom/chip.h b/src/drivers/i2c/wacom/chip.h new file mode 100644 index 0000000000..fc75194119 --- /dev/null +++ b/src/drivers/i2c/wacom/chip.h @@ -0,0 +1,32 @@ +/* + * 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 + +#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 new file mode 100644 index 0000000000..c54194fc96 --- /dev/null +++ b/src/drivers/i2c/wacom/wacom.c @@ -0,0 +1,59 @@ +/* + * 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 +#include +#include +#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) +{ + i2c_generic_fill_ssdt(dev, &i2c_wacom_fill_dsm); +} + +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 +}; diff --git a/src/drivers/i2c/wacom_ts/Kconfig b/src/drivers/i2c/wacom_ts/Kconfig deleted file mode 100644 index 50da3f14ec..0000000000 --- a/src/drivers/i2c/wacom_ts/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config DRIVERS_I2C_WACOM_TS - bool - select DRIVERS_I2C_GENERIC diff --git a/src/drivers/i2c/wacom_ts/Makefile.inc b/src/drivers/i2c/wacom_ts/Makefile.inc deleted file mode 100644 index 94550997f6..0000000000 --- a/src/drivers/i2c/wacom_ts/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -ramstage-$(CONFIG_DRIVERS_I2C_WACOM_TS) += ts.c diff --git a/src/drivers/i2c/wacom_ts/chip.h b/src/drivers/i2c/wacom_ts/chip.h deleted file mode 100644 index 3c748d5158..0000000000 --- a/src/drivers/i2c/wacom_ts/chip.h +++ /dev/null @@ -1,31 +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_TS_CHIP_H__ -#define __I2C_WACOM_TS_CHIP_H__ - -#include - -#define WCOM50C1_HID "WCOM50C1" -#define WCOMNTN2_HID "WCOMNTN2" -#define PNP0C50_CID "PNP0C50" -#define WCOM_TS_DESC "WCOM Touchscreen" - -struct drivers_i2c_wacom_ts_config { - struct drivers_i2c_generic_config generic; - uint8_t hid_desc_reg_offset; -}; - -#endif /* __I2C_WACOM_TS_CHIP_H__ */ diff --git a/src/drivers/i2c/wacom_ts/ts.c b/src/drivers/i2c/wacom_ts/ts.c deleted file mode 100644 index ebc888361b..0000000000 --- a/src/drivers/i2c/wacom_ts/ts.c +++ /dev/null @@ -1,59 +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 -#include -#include -#include "chip.h" - -static void i2c_wacom_ts_fill_dsm(struct device *dev) -{ - struct drivers_i2c_wacom_ts_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_ts_fill_ssdt_generator(struct device *dev) -{ - i2c_generic_fill_ssdt(dev, &i2c_wacom_ts_fill_dsm); -} - -static const char *i2c_wacom_ts_acpi_name(struct device *dev) -{ - return "WCTS"; -} - -static struct device_operations i2c_wacom_ts_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, - .enable_resources = DEVICE_NOOP, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &i2c_wacom_ts_acpi_name, - .acpi_fill_ssdt_generator = &i2c_wacom_ts_fill_ssdt_generator, -#endif -}; - -static void i2c_wacom_ts_enable(struct device *dev) -{ - dev->ops = &i2c_wacom_ts_ops; -} - -struct chip_operations drivers_i2c_wacom_ts_ops = { - CHIP_NAME("Wacom Touchscreen Device") - .enable_dev = &i2c_wacom_ts_enable -}; -- cgit v1.2.3