From 1bf411c743c0bbea849a36862a6cc9b62f411bc0 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 22 Jun 2018 10:20:50 -0700 Subject: drivers/i2c/alps: Get rid of i2c/alps driver i2c/alps driver implementation is an exact copy of the i2c/hid driver with only the addition of ALPS0001_HID. This can be supported by the i2c/hid driver using the hid field in devicetree which is what glkrvp mainboard does. So, this change removes the i2c/alps driver which is anyways unused. Change-Id: I60761c384f3d800532b2b346272da7be28b77acd Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/27208 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Patrick Georgi Reviewed-by: Paul Menzel --- src/drivers/i2c/alps/Kconfig | 3 -- src/drivers/i2c/alps/Makefile.inc | 1 - src/drivers/i2c/alps/alps.c | 60 --------------------------------------- src/drivers/i2c/alps/chip.h | 30 -------------------- 4 files changed, 94 deletions(-) delete mode 100644 src/drivers/i2c/alps/Kconfig delete mode 100644 src/drivers/i2c/alps/Makefile.inc delete mode 100644 src/drivers/i2c/alps/alps.c delete mode 100644 src/drivers/i2c/alps/chip.h (limited to 'src/drivers') diff --git a/src/drivers/i2c/alps/Kconfig b/src/drivers/i2c/alps/Kconfig deleted file mode 100644 index b49581d4aa..0000000000 --- a/src/drivers/i2c/alps/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config DRIVERS_I2C_ALPS - bool - select DRIVERS_I2C_GENERIC diff --git a/src/drivers/i2c/alps/Makefile.inc b/src/drivers/i2c/alps/Makefile.inc deleted file mode 100644 index aa18034a03..0000000000 --- a/src/drivers/i2c/alps/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -ramstage-$(CONFIG_DRIVERS_I2C_ALPS) += alps.c diff --git a/src/drivers/i2c/alps/alps.c b/src/drivers/i2c/alps/alps.c deleted file mode 100644 index 286237402a..0000000000 --- a/src/drivers/i2c/alps/alps.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Intel Corporation. - * - * 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_alps_fill_dsm(struct device *dev) -{ - struct drivers_i2c_alps_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_alps_fill_ssdt_generator(struct device *dev) -{ - struct drivers_i2c_alps_config *config = dev->chip_info; - i2c_generic_fill_ssdt(dev, &i2c_alps_fill_dsm, &config->generic); -} - -static const char *i2c_alps_acpi_name(const struct device *dev) -{ - return "ALPS"; -} - -static struct device_operations i2c_alps_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, - .enable_resources = DEVICE_NOOP, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &i2c_alps_acpi_name, - .acpi_fill_ssdt_generator = &i2c_alps_fill_ssdt_generator, -#endif -}; - -static void i2c_alps_enable(struct device *dev) -{ - dev->ops = &i2c_alps_ops; -} - -struct chip_operations drivers_i2c_alps_ops = { - CHIP_NAME("ALPS I2C Device") - .enable_dev = &i2c_alps_enable -}; diff --git a/src/drivers/i2c/alps/chip.h b/src/drivers/i2c/alps/chip.h deleted file mode 100644 index fb0b0fab4f..0000000000 --- a/src/drivers/i2c/alps/chip.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Intel Corporation. - * - * 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_ALPS_CHIP_H__ -#define __I2C_ALPS_CHIP_H__ - -#include - -#define ALPS0001_HID "ALPS0001" -#define PNP0C50_CID "PNP0C50" -#define ALPS_TP_DESC "ALPS Touchpad" - -struct drivers_i2c_alps_config { - struct drivers_i2c_generic_config generic; - uint8_t hid_desc_reg_offset; -}; - -#endif /* __I2C_ALPS_CHIP_H__ */ -- cgit v1.2.3