On Fri, Aug 09, 2019 at 10:27:38PM +0200, Arnd Bergmann wrote:
> The ARM w90x900 platform is getting removed, so this driver is obsolete.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Applied, thank you.
> ---
> drivers/input/keyboard/Kconfig | 11 -
> drivers/input/keyboard/Makefile | 1 -
> drivers/input/keyboard/w90p910_keypad.c | 264 -------------------
> include/linux/platform_data/keypad-w90p910.h | 16 --
> 4 files changed, 292 deletions(-)
> delete mode 100644 drivers/input/keyboard/w90p910_keypad.c
> delete mode 100644 include/linux/platform_data/keypad-w90p910.h
>
> diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
> index 8e9c3ea9d5e7..c1da129a4eb5 100644
> --- a/drivers/input/keyboard/Kconfig
> +++ b/drivers/input/keyboard/Kconfig
> @@ -731,17 +731,6 @@ config KEYBOARD_XTKBD
> To compile this driver as a module, choose M here: the
> module will be called xtkbd.
>
> -config KEYBOARD_W90P910
> - tristate "W90P910 Matrix Keypad support"
> - depends on ARCH_W90X900
> - select INPUT_MATRIXKMAP
> - help
> - Say Y here to enable the matrix keypad on evaluation board
> - based on W90P910.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called w90p910_keypad.
> -
> config KEYBOARD_CROS_EC
> tristate "ChromeOS EC keyboard"
> select INPUT_MATRIXKMAP
> diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
> index 06a0af6efeae..9510325c0c5d 100644
> --- a/drivers/input/keyboard/Makefile
> +++ b/drivers/input/keyboard/Makefile
> @@ -68,4 +68,3 @@ obj-$(CONFIG_KEYBOARD_TEGRA) += tegra-kbc.o
> obj-$(CONFIG_KEYBOARD_TM2_TOUCHKEY) += tm2-touchkey.o
> obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o
> obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
> -obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o
> diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c
> deleted file mode 100644
> index c88d05d6108a..000000000000
> --- a/drivers/input/keyboard/w90p910_keypad.c
> +++ /dev/null
> @@ -1,264 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (c) 2008-2009 Nuvoton technology corporation.
> - *
> - * Wan ZongShun <mcuos.com@xxxxxxxxx>
> - */
> -
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/interrupt.h>
> -#include <linux/input.h>
> -#include <linux/device.h>
> -#include <linux/platform_device.h>
> -#include <linux/clk.h>
> -#include <linux/err.h>
> -#include <linux/io.h>
> -#include <linux/slab.h>
> -
> -#include <linux/platform_data/keypad-w90p910.h>
> -
> -/* Keypad Interface Control Registers */
> -#define KPI_CONF 0x00
> -#define KPI_3KCONF 0x04
> -#define KPI_LPCONF 0x08
> -#define KPI_STATUS 0x0C
> -
> -#define IS1KEY (0x01 << 16)
> -#define INTTR (0x01 << 21)
> -#define KEY0R (0x0f << 3)
> -#define KEY0C 0x07
> -#define DEBOUNCE_BIT 0x08
> -#define KSIZE0 (0x01 << 16)
> -#define KSIZE1 (0x01 << 17)
> -#define KPSEL (0x01 << 19)
> -#define ENKP (0x01 << 18)
> -
> -#define KGET_RAW(n) (((n) & KEY0R) >> 3)
> -#define KGET_COLUMN(n) ((n) & KEY0C)
> -
> -#define W90P910_NUM_ROWS 8
> -#define W90P910_NUM_COLS 8
> -#define W90P910_ROW_SHIFT 3
> -
> -struct w90p910_keypad {
> - const struct w90p910_keypad_platform_data *pdata;
> - struct clk *clk;
> - struct input_dev *input_dev;
> - void __iomem *mmio_base;
> - int irq;
> - unsigned short keymap[W90P910_NUM_ROWS * W90P910_NUM_COLS];
> -};
> -
> -static void w90p910_keypad_scan_matrix(struct w90p910_keypad *keypad,
> - unsigned int status)
> -{
> - struct input_dev *input_dev = keypad->input_dev;
> - unsigned int row = KGET_RAW(status);
> - unsigned int col = KGET_COLUMN(status);
> - unsigned int code = MATRIX_SCAN_CODE(row, col, W90P910_ROW_SHIFT);
> - unsigned int key = keypad->keymap[code];
> -
> - input_event(input_dev, EV_MSC, MSC_SCAN, code);
> - input_report_key(input_dev, key, 1);
> - input_sync(input_dev);
> -
> - input_event(input_dev, EV_MSC, MSC_SCAN, code);
> - input_report_key(input_dev, key, 0);
> - input_sync(input_dev);
> -}
> -
> -static irqreturn_t w90p910_keypad_irq_handler(int irq, void *dev_id)
> -{
> - struct w90p910_keypad *keypad = dev_id;
> - unsigned int kstatus, val;
> -
> - kstatus = __raw_readl(keypad->mmio_base + KPI_STATUS);
> -
> - val = INTTR | IS1KEY;
> -
> - if (kstatus & val)
> - w90p910_keypad_scan_matrix(keypad, kstatus);
> -
> - return IRQ_HANDLED;
> -}
> -
> -static int w90p910_keypad_open(struct input_dev *dev)
> -{
> - struct w90p910_keypad *keypad = input_get_drvdata(dev);
> - const struct w90p910_keypad_platform_data *pdata = keypad->pdata;
> - unsigned int val, config;
> -
> - /* Enable unit clock */
> - clk_enable(keypad->clk);
> -
> - val = __raw_readl(keypad->mmio_base + KPI_CONF);
> - val |= (KPSEL | ENKP);
> - val &= ~(KSIZE0 | KSIZE1);
> -
> - config = pdata->prescale | (pdata->debounce << DEBOUNCE_BIT);
> -
> - val |= config;
> -
> - __raw_writel(val, keypad->mmio_base + KPI_CONF);
> -
> - return 0;
> -}
> -
> -static void w90p910_keypad_close(struct input_dev *dev)
> -{
> - struct w90p910_keypad *keypad = input_get_drvdata(dev);
> -
> - /* Disable clock unit */
> - clk_disable(keypad->clk);
> -}
> -
> -static int w90p910_keypad_probe(struct platform_device *pdev)
> -{
> - const struct w90p910_keypad_platform_data *pdata =
> - dev_get_platdata(&pdev->dev);
> - const struct matrix_keymap_data *keymap_data;
> - struct w90p910_keypad *keypad;
> - struct input_dev *input_dev;
> - struct resource *res;
> - int irq;
> - int error;
> -
> - if (!pdata) {
> - dev_err(&pdev->dev, "no platform data defined\n");
> - return -EINVAL;
> - }
> -
> - keymap_data = pdata->keymap_data;
> -
> - irq = platform_get_irq(pdev, 0);
> - if (irq < 0) {
> - dev_err(&pdev->dev, "failed to get keypad irq\n");
> - return -ENXIO;
> - }
> -
> - keypad = kzalloc(sizeof(struct w90p910_keypad), GFP_KERNEL);
> - input_dev = input_allocate_device();
> - if (!keypad || !input_dev) {
> - dev_err(&pdev->dev, "failed to allocate driver data\n");
> - error = -ENOMEM;
> - goto failed_free;
> - }
> -
> - keypad->pdata = pdata;
> - keypad->input_dev = input_dev;
> - keypad->irq = irq;
> -
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (res == NULL) {
> - dev_err(&pdev->dev, "failed to get I/O memory\n");
> - error = -ENXIO;
> - goto failed_free;
> - }
> -
> - res = request_mem_region(res->start, resource_size(res), pdev->name);
> - if (res == NULL) {
> - dev_err(&pdev->dev, "failed to request I/O memory\n");
> - error = -EBUSY;
> - goto failed_free;
> - }
> -
> - keypad->mmio_base = ioremap(res->start, resource_size(res));
> - if (keypad->mmio_base == NULL) {
> - dev_err(&pdev->dev, "failed to remap I/O memory\n");
> - error = -ENXIO;
> - goto failed_free_res;
> - }
> -
> - keypad->clk = clk_get(&pdev->dev, NULL);
> - if (IS_ERR(keypad->clk)) {
> - dev_err(&pdev->dev, "failed to get keypad clock\n");
> - error = PTR_ERR(keypad->clk);
> - goto failed_free_io;
> - }
> -
> - /* set multi-function pin for w90p910 kpi. */
> - mfp_set_groupi(&pdev->dev);
> -
> - input_dev->name = pdev->name;
> - input_dev->id.bustype = BUS_HOST;
> - input_dev->open = w90p910_keypad_open;
> - input_dev->close = w90p910_keypad_close;
> - input_dev->dev.parent = &pdev->dev;
> -
> - error = matrix_keypad_build_keymap(keymap_data, NULL,
> - W90P910_NUM_ROWS, W90P910_NUM_COLS,
> - keypad->keymap, input_dev);
> - if (error) {
> - dev_err(&pdev->dev, "failed to build keymap\n");
> - goto failed_put_clk;
> - }
> -
> - error = request_irq(keypad->irq, w90p910_keypad_irq_handler,
> - 0, pdev->name, keypad);
> - if (error) {
> - dev_err(&pdev->dev, "failed to request IRQ\n");
> - goto failed_put_clk;
> - }
> -
> - __set_bit(EV_REP, input_dev->evbit);
> - input_set_capability(input_dev, EV_MSC, MSC_SCAN);
> - input_set_drvdata(input_dev, keypad);
> -
> - /* Register the input device */
> - error = input_register_device(input_dev);
> - if (error) {
> - dev_err(&pdev->dev, "failed to register input device\n");
> - goto failed_free_irq;
> - }
> -
> - platform_set_drvdata(pdev, keypad);
> - return 0;
> -
> -failed_free_irq:
> - free_irq(irq, keypad);
> -failed_put_clk:
> - clk_put(keypad->clk);
> -failed_free_io:
> - iounmap(keypad->mmio_base);
> -failed_free_res:
> - release_mem_region(res->start, resource_size(res));
> -failed_free:
> - input_free_device(input_dev);
> - kfree(keypad);
> - return error;
> -}
> -
> -static int w90p910_keypad_remove(struct platform_device *pdev)
> -{
> - struct w90p910_keypad *keypad = platform_get_drvdata(pdev);
> - struct resource *res;
> -
> - free_irq(keypad->irq, keypad);
> -
> - clk_put(keypad->clk);
> -
> - input_unregister_device(keypad->input_dev);
> -
> - iounmap(keypad->mmio_base);
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(res->start, resource_size(res));
> -
> - kfree(keypad);
> -
> - return 0;
> -}
> -
> -static struct platform_driver w90p910_keypad_driver = {
> - .probe = w90p910_keypad_probe,
> - .remove = w90p910_keypad_remove,
> - .driver = {
> - .name = "nuc900-kpi",
> - },
> -};
> -module_platform_driver(w90p910_keypad_driver);
> -
> -MODULE_AUTHOR("Wan ZongShun <mcuos.com@xxxxxxxxx>");
> -MODULE_DESCRIPTION("w90p910 keypad driver");
> -MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:nuc900-keypad");
> diff --git a/include/linux/platform_data/keypad-w90p910.h b/include/linux/platform_data/keypad-w90p910.h
> deleted file mode 100644
> index 206ca4ecd93f..000000000000
> --- a/include/linux/platform_data/keypad-w90p910.h
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef __ASM_ARCH_W90P910_KEYPAD_H
> -#define __ASM_ARCH_W90P910_KEYPAD_H
> -
> -#include <linux/input/matrix_keypad.h>
> -
> -extern void mfp_set_groupi(struct device *dev);
> -
> -struct w90p910_keypad_platform_data {
> - const struct matrix_keymap_data *keymap_data;
> -
> - unsigned int prescale;
> - unsigned int debounce;
> -};
> -
> -#endif /* __ASM_ARCH_W90P910_KEYPAD_H */
> --
> 2.20.0
>
--
Dmitry
