* [PATCH 10/16] Input: remove w90x900 keyboard driver
2019-08-09 20:27 [PATCH 00/16] ARM: remove ks8695 and w90x900 platforms Arnd Bergmann
@ 2019-08-09 20:27 ` Arnd Bergmann
2019-08-09 21:56 ` Dmitry Torokhov
2019-08-09 20:27 ` [PATCH 11/16] Input: remove w90x900 touchscreen driver Arnd Bergmann
2019-08-10 7:29 ` [PATCH 00/16] ARM: remove ks8695 and w90x900 platforms Greg Kroah-Hartman
2 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2019-08-09 20:27 UTC (permalink / raw)
To: soc; +Cc: Arnd Bergmann, Dmitry Torokhov, linux-kernel, linux-input
The ARM w90x900 platform is getting removed, so this driver is obsolete.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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@gmail.com>
- */
-
-#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@gmail.com>");
-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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 10/16] Input: remove w90x900 keyboard driver
2019-08-09 20:27 ` [PATCH 10/16] Input: remove w90x900 keyboard driver Arnd Bergmann
@ 2019-08-09 21:56 ` Dmitry Torokhov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2019-08-09 21:56 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: soc, linux-kernel, linux-input
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@arndb.de>
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@gmail.com>
> - */
> -
> -#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@gmail.com>");
> -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 11/16] Input: remove w90x900 touchscreen driver
2019-08-09 20:27 [PATCH 00/16] ARM: remove ks8695 and w90x900 platforms Arnd Bergmann
2019-08-09 20:27 ` [PATCH 10/16] Input: remove w90x900 keyboard driver Arnd Bergmann
@ 2019-08-09 20:27 ` Arnd Bergmann
2019-08-09 21:56 ` Dmitry Torokhov
2019-08-10 7:29 ` [PATCH 00/16] ARM: remove ks8695 and w90x900 platforms Greg Kroah-Hartman
2 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2019-08-09 20:27 UTC (permalink / raw)
To: soc; +Cc: Arnd Bergmann, Dmitry Torokhov, linux-kernel, linux-input
The ARM w90x900 platform is getting removed, so this driver is obsolete.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/input/touchscreen/Kconfig | 9 -
drivers/input/touchscreen/Makefile | 1 -
drivers/input/touchscreen/w90p910_ts.c | 331 -------------------------
3 files changed, 341 deletions(-)
delete mode 100644 drivers/input/touchscreen/w90p910_ts.c
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index fb91f2d4049e..46ad9090493b 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1112,15 +1112,6 @@ config TOUCHSCREEN_TSC2007_IIO
or ambient light monitoring), temperature and raw input
values.
-config TOUCHSCREEN_W90X900
- tristate "W90P910 touchscreen driver"
- depends on ARCH_W90X900
- help
- Say Y here if you have a W90P910 based touchscreen.
-
- To compile this driver as a module, choose M here: the
- module will be called w90p910_ts.
-
config TOUCHSCREEN_PCAP
tristate "Motorola PCAP touchscreen"
depends on EZX_PCAP
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 084a596a0c8b..94c6162409b3 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -102,7 +102,6 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o
obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o
-obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o
obj-$(CONFIG_TOUCHSCREEN_SX8654) += sx8654.o
obj-$(CONFIG_TOUCHSCREEN_TPS6507X) += tps6507x-ts.o
obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
deleted file mode 100644
index 7893d7fa398c..000000000000
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ /dev/null
@@ -1,331 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2008 Nuvoton technology corporation.
- *
- * Wan ZongShun <mcuos.com@gmail.com>
- */
-
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/input.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-
-/* ADC controller bit defines */
-#define ADC_DELAY 0xf00
-#define ADC_DOWN 0x01
-#define ADC_TSC_Y (0x01 << 8)
-#define ADC_TSC_X (0x00 << 8)
-#define TSC_FOURWIRE (~(0x03 << 1))
-#define ADC_CLK_EN (0x01 << 28) /* ADC clock enable */
-#define ADC_READ_CON (0x01 << 12)
-#define ADC_CONV (0x01 << 13)
-#define ADC_SEMIAUTO (0x01 << 14)
-#define ADC_WAITTRIG (0x03 << 14)
-#define ADC_RST1 (0x01 << 16)
-#define ADC_RST0 (0x00 << 16)
-#define ADC_EN (0x01 << 17)
-#define ADC_INT (0x01 << 18)
-#define WT_INT (0x01 << 20)
-#define ADC_INT_EN (0x01 << 21)
-#define LVD_INT_EN (0x01 << 22)
-#define WT_INT_EN (0x01 << 23)
-#define ADC_DIV (0x04 << 1) /* div = 6 */
-
-enum ts_state {
- TS_WAIT_NEW_PACKET, /* We are waiting next touch report */
- TS_WAIT_X_COORD, /* We are waiting for ADC to report X coord */
- TS_WAIT_Y_COORD, /* We are waiting for ADC to report Y coord */
- TS_IDLE, /* Input device is closed, don't do anything */
-};
-
-struct w90p910_ts {
- struct input_dev *input;
- struct timer_list timer;
- struct clk *clk;
- int irq_num;
- void __iomem *ts_reg;
- spinlock_t lock;
- enum ts_state state;
-};
-
-static void w90p910_report_event(struct w90p910_ts *w90p910_ts, bool down)
-{
- struct input_dev *dev = w90p910_ts->input;
-
- if (down) {
- input_report_abs(dev, ABS_X,
- __raw_readl(w90p910_ts->ts_reg + 0x0c));
- input_report_abs(dev, ABS_Y,
- __raw_readl(w90p910_ts->ts_reg + 0x10));
- }
-
- input_report_key(dev, BTN_TOUCH, down);
- input_sync(dev);
-}
-
-static void w90p910_prepare_x_reading(struct w90p910_ts *w90p910_ts)
-{
- unsigned long ctlreg;
-
- __raw_writel(ADC_TSC_X, w90p910_ts->ts_reg + 0x04);
- ctlreg = __raw_readl(w90p910_ts->ts_reg);
- ctlreg &= ~(ADC_WAITTRIG | WT_INT | WT_INT_EN);
- ctlreg |= ADC_SEMIAUTO | ADC_INT_EN | ADC_CONV;
- __raw_writel(ctlreg, w90p910_ts->ts_reg);
-
- w90p910_ts->state = TS_WAIT_X_COORD;
-}
-
-static void w90p910_prepare_y_reading(struct w90p910_ts *w90p910_ts)
-{
- unsigned long ctlreg;
-
- __raw_writel(ADC_TSC_Y, w90p910_ts->ts_reg + 0x04);
- ctlreg = __raw_readl(w90p910_ts->ts_reg);
- ctlreg &= ~(ADC_WAITTRIG | ADC_INT | WT_INT_EN);
- ctlreg |= ADC_SEMIAUTO | ADC_INT_EN | ADC_CONV;
- __raw_writel(ctlreg, w90p910_ts->ts_reg);
-
- w90p910_ts->state = TS_WAIT_Y_COORD;
-}
-
-static void w90p910_prepare_next_packet(struct w90p910_ts *w90p910_ts)
-{
- unsigned long ctlreg;
-
- ctlreg = __raw_readl(w90p910_ts->ts_reg);
- ctlreg &= ~(ADC_INT | ADC_INT_EN | ADC_SEMIAUTO | ADC_CONV);
- ctlreg |= ADC_WAITTRIG | WT_INT_EN;
- __raw_writel(ctlreg, w90p910_ts->ts_reg);
-
- w90p910_ts->state = TS_WAIT_NEW_PACKET;
-}
-
-static irqreturn_t w90p910_ts_interrupt(int irq, void *dev_id)
-{
- struct w90p910_ts *w90p910_ts = dev_id;
- unsigned long flags;
-
- spin_lock_irqsave(&w90p910_ts->lock, flags);
-
- switch (w90p910_ts->state) {
- case TS_WAIT_NEW_PACKET:
- /*
- * The controller only generates interrupts when pen
- * is down.
- */
- del_timer(&w90p910_ts->timer);
- w90p910_prepare_x_reading(w90p910_ts);
- break;
-
-
- case TS_WAIT_X_COORD:
- w90p910_prepare_y_reading(w90p910_ts);
- break;
-
- case TS_WAIT_Y_COORD:
- w90p910_report_event(w90p910_ts, true);
- w90p910_prepare_next_packet(w90p910_ts);
- mod_timer(&w90p910_ts->timer, jiffies + msecs_to_jiffies(100));
- break;
-
- case TS_IDLE:
- break;
- }
-
- spin_unlock_irqrestore(&w90p910_ts->lock, flags);
-
- return IRQ_HANDLED;
-}
-
-static void w90p910_check_pen_up(struct timer_list *t)
-{
- struct w90p910_ts *w90p910_ts = from_timer(w90p910_ts, t, timer);
- unsigned long flags;
-
- spin_lock_irqsave(&w90p910_ts->lock, flags);
-
- if (w90p910_ts->state == TS_WAIT_NEW_PACKET &&
- !(__raw_readl(w90p910_ts->ts_reg + 0x04) & ADC_DOWN)) {
-
- w90p910_report_event(w90p910_ts, false);
- }
-
- spin_unlock_irqrestore(&w90p910_ts->lock, flags);
-}
-
-static int w90p910_open(struct input_dev *dev)
-{
- struct w90p910_ts *w90p910_ts = input_get_drvdata(dev);
- unsigned long val;
-
- /* enable the ADC clock */
- clk_enable(w90p910_ts->clk);
-
- __raw_writel(ADC_RST1, w90p910_ts->ts_reg);
- msleep(1);
- __raw_writel(ADC_RST0, w90p910_ts->ts_reg);
- msleep(1);
-
- /* set delay and screen type */
- val = __raw_readl(w90p910_ts->ts_reg + 0x04);
- __raw_writel(val & TSC_FOURWIRE, w90p910_ts->ts_reg + 0x04);
- __raw_writel(ADC_DELAY, w90p910_ts->ts_reg + 0x08);
-
- w90p910_ts->state = TS_WAIT_NEW_PACKET;
- wmb();
-
- /* set trigger mode */
- val = __raw_readl(w90p910_ts->ts_reg);
- val |= ADC_WAITTRIG | ADC_DIV | ADC_EN | WT_INT_EN;
- __raw_writel(val, w90p910_ts->ts_reg);
-
- return 0;
-}
-
-static void w90p910_close(struct input_dev *dev)
-{
- struct w90p910_ts *w90p910_ts = input_get_drvdata(dev);
- unsigned long val;
-
- /* disable trigger mode */
-
- spin_lock_irq(&w90p910_ts->lock);
-
- w90p910_ts->state = TS_IDLE;
-
- val = __raw_readl(w90p910_ts->ts_reg);
- val &= ~(ADC_WAITTRIG | ADC_DIV | ADC_EN | WT_INT_EN | ADC_INT_EN);
- __raw_writel(val, w90p910_ts->ts_reg);
-
- spin_unlock_irq(&w90p910_ts->lock);
-
- /* Now that interrupts are shut off we can safely delete timer */
- del_timer_sync(&w90p910_ts->timer);
-
- /* stop the ADC clock */
- clk_disable(w90p910_ts->clk);
-}
-
-static int w90x900ts_probe(struct platform_device *pdev)
-{
- struct w90p910_ts *w90p910_ts;
- struct input_dev *input_dev;
- struct resource *res;
- int err;
-
- w90p910_ts = kzalloc(sizeof(struct w90p910_ts), GFP_KERNEL);
- input_dev = input_allocate_device();
- if (!w90p910_ts || !input_dev) {
- err = -ENOMEM;
- goto fail1;
- }
-
- w90p910_ts->input = input_dev;
- w90p910_ts->state = TS_IDLE;
- spin_lock_init(&w90p910_ts->lock);
- timer_setup(&w90p910_ts->timer, w90p910_check_pen_up, 0);
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- err = -ENXIO;
- goto fail1;
- }
-
- if (!request_mem_region(res->start, resource_size(res),
- pdev->name)) {
- err = -EBUSY;
- goto fail1;
- }
-
- w90p910_ts->ts_reg = ioremap(res->start, resource_size(res));
- if (!w90p910_ts->ts_reg) {
- err = -ENOMEM;
- goto fail2;
- }
-
- w90p910_ts->clk = clk_get(&pdev->dev, NULL);
- if (IS_ERR(w90p910_ts->clk)) {
- err = PTR_ERR(w90p910_ts->clk);
- goto fail3;
- }
-
- input_dev->name = "W90P910 TouchScreen";
- input_dev->phys = "w90p910ts/event0";
- input_dev->id.bustype = BUS_HOST;
- input_dev->id.vendor = 0x0005;
- input_dev->id.product = 0x0001;
- input_dev->id.version = 0x0100;
- input_dev->dev.parent = &pdev->dev;
- input_dev->open = w90p910_open;
- input_dev->close = w90p910_close;
-
- input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
- input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-
- input_set_abs_params(input_dev, ABS_X, 0, 0x400, 0, 0);
- input_set_abs_params(input_dev, ABS_Y, 0, 0x400, 0, 0);
-
- input_set_drvdata(input_dev, w90p910_ts);
-
- w90p910_ts->irq_num = platform_get_irq(pdev, 0);
- if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt,
- 0, "w90p910ts", w90p910_ts)) {
- err = -EBUSY;
- goto fail4;
- }
-
- err = input_register_device(w90p910_ts->input);
- if (err)
- goto fail5;
-
- platform_set_drvdata(pdev, w90p910_ts);
-
- return 0;
-
-fail5: free_irq(w90p910_ts->irq_num, w90p910_ts);
-fail4: clk_put(w90p910_ts->clk);
-fail3: iounmap(w90p910_ts->ts_reg);
-fail2: release_mem_region(res->start, resource_size(res));
-fail1: input_free_device(input_dev);
- kfree(w90p910_ts);
- return err;
-}
-
-static int w90x900ts_remove(struct platform_device *pdev)
-{
- struct w90p910_ts *w90p910_ts = platform_get_drvdata(pdev);
- struct resource *res;
-
- free_irq(w90p910_ts->irq_num, w90p910_ts);
- del_timer_sync(&w90p910_ts->timer);
- iounmap(w90p910_ts->ts_reg);
-
- clk_put(w90p910_ts->clk);
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(res->start, resource_size(res));
-
- input_unregister_device(w90p910_ts->input);
- kfree(w90p910_ts);
-
- return 0;
-}
-
-static struct platform_driver w90x900ts_driver = {
- .probe = w90x900ts_probe,
- .remove = w90x900ts_remove,
- .driver = {
- .name = "nuc900-ts",
- },
-};
-module_platform_driver(w90x900ts_driver);
-
-MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
-MODULE_DESCRIPTION("w90p910 touch screen driver!");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:nuc900-ts");
--
2.20.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 11/16] Input: remove w90x900 touchscreen driver
2019-08-09 20:27 ` [PATCH 11/16] Input: remove w90x900 touchscreen driver Arnd Bergmann
@ 2019-08-09 21:56 ` Dmitry Torokhov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2019-08-09 21:56 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: soc, linux-kernel, linux-input
On Fri, Aug 09, 2019 at 10:27:39PM +0200, Arnd Bergmann wrote:
> The ARM w90x900 platform is getting removed, so this driver is obsolete.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied, thank you.
> ---
> drivers/input/touchscreen/Kconfig | 9 -
> drivers/input/touchscreen/Makefile | 1 -
> drivers/input/touchscreen/w90p910_ts.c | 331 -------------------------
> 3 files changed, 341 deletions(-)
> delete mode 100644 drivers/input/touchscreen/w90p910_ts.c
>
> diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
> index fb91f2d4049e..46ad9090493b 100644
> --- a/drivers/input/touchscreen/Kconfig
> +++ b/drivers/input/touchscreen/Kconfig
> @@ -1112,15 +1112,6 @@ config TOUCHSCREEN_TSC2007_IIO
> or ambient light monitoring), temperature and raw input
> values.
>
> -config TOUCHSCREEN_W90X900
> - tristate "W90P910 touchscreen driver"
> - depends on ARCH_W90X900
> - help
> - Say Y here if you have a W90P910 based touchscreen.
> -
> - To compile this driver as a module, choose M here: the
> - module will be called w90p910_ts.
> -
> config TOUCHSCREEN_PCAP
> tristate "Motorola PCAP touchscreen"
> depends on EZX_PCAP
> diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
> index 084a596a0c8b..94c6162409b3 100644
> --- a/drivers/input/touchscreen/Makefile
> +++ b/drivers/input/touchscreen/Makefile
> @@ -102,7 +102,6 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
> wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
> obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o
> obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o
> -obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o
> obj-$(CONFIG_TOUCHSCREEN_SX8654) += sx8654.o
> obj-$(CONFIG_TOUCHSCREEN_TPS6507X) += tps6507x-ts.o
> obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o
> diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
> deleted file mode 100644
> index 7893d7fa398c..000000000000
> --- a/drivers/input/touchscreen/w90p910_ts.c
> +++ /dev/null
> @@ -1,331 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (c) 2008 Nuvoton technology corporation.
> - *
> - * Wan ZongShun <mcuos.com@gmail.com>
> - */
> -
> -#include <linux/delay.h>
> -#include <linux/module.h>
> -#include <linux/platform_device.h>
> -#include <linux/io.h>
> -#include <linux/clk.h>
> -#include <linux/input.h>
> -#include <linux/interrupt.h>
> -#include <linux/slab.h>
> -
> -/* ADC controller bit defines */
> -#define ADC_DELAY 0xf00
> -#define ADC_DOWN 0x01
> -#define ADC_TSC_Y (0x01 << 8)
> -#define ADC_TSC_X (0x00 << 8)
> -#define TSC_FOURWIRE (~(0x03 << 1))
> -#define ADC_CLK_EN (0x01 << 28) /* ADC clock enable */
> -#define ADC_READ_CON (0x01 << 12)
> -#define ADC_CONV (0x01 << 13)
> -#define ADC_SEMIAUTO (0x01 << 14)
> -#define ADC_WAITTRIG (0x03 << 14)
> -#define ADC_RST1 (0x01 << 16)
> -#define ADC_RST0 (0x00 << 16)
> -#define ADC_EN (0x01 << 17)
> -#define ADC_INT (0x01 << 18)
> -#define WT_INT (0x01 << 20)
> -#define ADC_INT_EN (0x01 << 21)
> -#define LVD_INT_EN (0x01 << 22)
> -#define WT_INT_EN (0x01 << 23)
> -#define ADC_DIV (0x04 << 1) /* div = 6 */
> -
> -enum ts_state {
> - TS_WAIT_NEW_PACKET, /* We are waiting next touch report */
> - TS_WAIT_X_COORD, /* We are waiting for ADC to report X coord */
> - TS_WAIT_Y_COORD, /* We are waiting for ADC to report Y coord */
> - TS_IDLE, /* Input device is closed, don't do anything */
> -};
> -
> -struct w90p910_ts {
> - struct input_dev *input;
> - struct timer_list timer;
> - struct clk *clk;
> - int irq_num;
> - void __iomem *ts_reg;
> - spinlock_t lock;
> - enum ts_state state;
> -};
> -
> -static void w90p910_report_event(struct w90p910_ts *w90p910_ts, bool down)
> -{
> - struct input_dev *dev = w90p910_ts->input;
> -
> - if (down) {
> - input_report_abs(dev, ABS_X,
> - __raw_readl(w90p910_ts->ts_reg + 0x0c));
> - input_report_abs(dev, ABS_Y,
> - __raw_readl(w90p910_ts->ts_reg + 0x10));
> - }
> -
> - input_report_key(dev, BTN_TOUCH, down);
> - input_sync(dev);
> -}
> -
> -static void w90p910_prepare_x_reading(struct w90p910_ts *w90p910_ts)
> -{
> - unsigned long ctlreg;
> -
> - __raw_writel(ADC_TSC_X, w90p910_ts->ts_reg + 0x04);
> - ctlreg = __raw_readl(w90p910_ts->ts_reg);
> - ctlreg &= ~(ADC_WAITTRIG | WT_INT | WT_INT_EN);
> - ctlreg |= ADC_SEMIAUTO | ADC_INT_EN | ADC_CONV;
> - __raw_writel(ctlreg, w90p910_ts->ts_reg);
> -
> - w90p910_ts->state = TS_WAIT_X_COORD;
> -}
> -
> -static void w90p910_prepare_y_reading(struct w90p910_ts *w90p910_ts)
> -{
> - unsigned long ctlreg;
> -
> - __raw_writel(ADC_TSC_Y, w90p910_ts->ts_reg + 0x04);
> - ctlreg = __raw_readl(w90p910_ts->ts_reg);
> - ctlreg &= ~(ADC_WAITTRIG | ADC_INT | WT_INT_EN);
> - ctlreg |= ADC_SEMIAUTO | ADC_INT_EN | ADC_CONV;
> - __raw_writel(ctlreg, w90p910_ts->ts_reg);
> -
> - w90p910_ts->state = TS_WAIT_Y_COORD;
> -}
> -
> -static void w90p910_prepare_next_packet(struct w90p910_ts *w90p910_ts)
> -{
> - unsigned long ctlreg;
> -
> - ctlreg = __raw_readl(w90p910_ts->ts_reg);
> - ctlreg &= ~(ADC_INT | ADC_INT_EN | ADC_SEMIAUTO | ADC_CONV);
> - ctlreg |= ADC_WAITTRIG | WT_INT_EN;
> - __raw_writel(ctlreg, w90p910_ts->ts_reg);
> -
> - w90p910_ts->state = TS_WAIT_NEW_PACKET;
> -}
> -
> -static irqreturn_t w90p910_ts_interrupt(int irq, void *dev_id)
> -{
> - struct w90p910_ts *w90p910_ts = dev_id;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&w90p910_ts->lock, flags);
> -
> - switch (w90p910_ts->state) {
> - case TS_WAIT_NEW_PACKET:
> - /*
> - * The controller only generates interrupts when pen
> - * is down.
> - */
> - del_timer(&w90p910_ts->timer);
> - w90p910_prepare_x_reading(w90p910_ts);
> - break;
> -
> -
> - case TS_WAIT_X_COORD:
> - w90p910_prepare_y_reading(w90p910_ts);
> - break;
> -
> - case TS_WAIT_Y_COORD:
> - w90p910_report_event(w90p910_ts, true);
> - w90p910_prepare_next_packet(w90p910_ts);
> - mod_timer(&w90p910_ts->timer, jiffies + msecs_to_jiffies(100));
> - break;
> -
> - case TS_IDLE:
> - break;
> - }
> -
> - spin_unlock_irqrestore(&w90p910_ts->lock, flags);
> -
> - return IRQ_HANDLED;
> -}
> -
> -static void w90p910_check_pen_up(struct timer_list *t)
> -{
> - struct w90p910_ts *w90p910_ts = from_timer(w90p910_ts, t, timer);
> - unsigned long flags;
> -
> - spin_lock_irqsave(&w90p910_ts->lock, flags);
> -
> - if (w90p910_ts->state == TS_WAIT_NEW_PACKET &&
> - !(__raw_readl(w90p910_ts->ts_reg + 0x04) & ADC_DOWN)) {
> -
> - w90p910_report_event(w90p910_ts, false);
> - }
> -
> - spin_unlock_irqrestore(&w90p910_ts->lock, flags);
> -}
> -
> -static int w90p910_open(struct input_dev *dev)
> -{
> - struct w90p910_ts *w90p910_ts = input_get_drvdata(dev);
> - unsigned long val;
> -
> - /* enable the ADC clock */
> - clk_enable(w90p910_ts->clk);
> -
> - __raw_writel(ADC_RST1, w90p910_ts->ts_reg);
> - msleep(1);
> - __raw_writel(ADC_RST0, w90p910_ts->ts_reg);
> - msleep(1);
> -
> - /* set delay and screen type */
> - val = __raw_readl(w90p910_ts->ts_reg + 0x04);
> - __raw_writel(val & TSC_FOURWIRE, w90p910_ts->ts_reg + 0x04);
> - __raw_writel(ADC_DELAY, w90p910_ts->ts_reg + 0x08);
> -
> - w90p910_ts->state = TS_WAIT_NEW_PACKET;
> - wmb();
> -
> - /* set trigger mode */
> - val = __raw_readl(w90p910_ts->ts_reg);
> - val |= ADC_WAITTRIG | ADC_DIV | ADC_EN | WT_INT_EN;
> - __raw_writel(val, w90p910_ts->ts_reg);
> -
> - return 0;
> -}
> -
> -static void w90p910_close(struct input_dev *dev)
> -{
> - struct w90p910_ts *w90p910_ts = input_get_drvdata(dev);
> - unsigned long val;
> -
> - /* disable trigger mode */
> -
> - spin_lock_irq(&w90p910_ts->lock);
> -
> - w90p910_ts->state = TS_IDLE;
> -
> - val = __raw_readl(w90p910_ts->ts_reg);
> - val &= ~(ADC_WAITTRIG | ADC_DIV | ADC_EN | WT_INT_EN | ADC_INT_EN);
> - __raw_writel(val, w90p910_ts->ts_reg);
> -
> - spin_unlock_irq(&w90p910_ts->lock);
> -
> - /* Now that interrupts are shut off we can safely delete timer */
> - del_timer_sync(&w90p910_ts->timer);
> -
> - /* stop the ADC clock */
> - clk_disable(w90p910_ts->clk);
> -}
> -
> -static int w90x900ts_probe(struct platform_device *pdev)
> -{
> - struct w90p910_ts *w90p910_ts;
> - struct input_dev *input_dev;
> - struct resource *res;
> - int err;
> -
> - w90p910_ts = kzalloc(sizeof(struct w90p910_ts), GFP_KERNEL);
> - input_dev = input_allocate_device();
> - if (!w90p910_ts || !input_dev) {
> - err = -ENOMEM;
> - goto fail1;
> - }
> -
> - w90p910_ts->input = input_dev;
> - w90p910_ts->state = TS_IDLE;
> - spin_lock_init(&w90p910_ts->lock);
> - timer_setup(&w90p910_ts->timer, w90p910_check_pen_up, 0);
> -
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!res) {
> - err = -ENXIO;
> - goto fail1;
> - }
> -
> - if (!request_mem_region(res->start, resource_size(res),
> - pdev->name)) {
> - err = -EBUSY;
> - goto fail1;
> - }
> -
> - w90p910_ts->ts_reg = ioremap(res->start, resource_size(res));
> - if (!w90p910_ts->ts_reg) {
> - err = -ENOMEM;
> - goto fail2;
> - }
> -
> - w90p910_ts->clk = clk_get(&pdev->dev, NULL);
> - if (IS_ERR(w90p910_ts->clk)) {
> - err = PTR_ERR(w90p910_ts->clk);
> - goto fail3;
> - }
> -
> - input_dev->name = "W90P910 TouchScreen";
> - input_dev->phys = "w90p910ts/event0";
> - input_dev->id.bustype = BUS_HOST;
> - input_dev->id.vendor = 0x0005;
> - input_dev->id.product = 0x0001;
> - input_dev->id.version = 0x0100;
> - input_dev->dev.parent = &pdev->dev;
> - input_dev->open = w90p910_open;
> - input_dev->close = w90p910_close;
> -
> - input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
> - input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
> -
> - input_set_abs_params(input_dev, ABS_X, 0, 0x400, 0, 0);
> - input_set_abs_params(input_dev, ABS_Y, 0, 0x400, 0, 0);
> -
> - input_set_drvdata(input_dev, w90p910_ts);
> -
> - w90p910_ts->irq_num = platform_get_irq(pdev, 0);
> - if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt,
> - 0, "w90p910ts", w90p910_ts)) {
> - err = -EBUSY;
> - goto fail4;
> - }
> -
> - err = input_register_device(w90p910_ts->input);
> - if (err)
> - goto fail5;
> -
> - platform_set_drvdata(pdev, w90p910_ts);
> -
> - return 0;
> -
> -fail5: free_irq(w90p910_ts->irq_num, w90p910_ts);
> -fail4: clk_put(w90p910_ts->clk);
> -fail3: iounmap(w90p910_ts->ts_reg);
> -fail2: release_mem_region(res->start, resource_size(res));
> -fail1: input_free_device(input_dev);
> - kfree(w90p910_ts);
> - return err;
> -}
> -
> -static int w90x900ts_remove(struct platform_device *pdev)
> -{
> - struct w90p910_ts *w90p910_ts = platform_get_drvdata(pdev);
> - struct resource *res;
> -
> - free_irq(w90p910_ts->irq_num, w90p910_ts);
> - del_timer_sync(&w90p910_ts->timer);
> - iounmap(w90p910_ts->ts_reg);
> -
> - clk_put(w90p910_ts->clk);
> -
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(res->start, resource_size(res));
> -
> - input_unregister_device(w90p910_ts->input);
> - kfree(w90p910_ts);
> -
> - return 0;
> -}
> -
> -static struct platform_driver w90x900ts_driver = {
> - .probe = w90x900ts_probe,
> - .remove = w90x900ts_remove,
> - .driver = {
> - .name = "nuc900-ts",
> - },
> -};
> -module_platform_driver(w90x900ts_driver);
> -
> -MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
> -MODULE_DESCRIPTION("w90p910 touch screen driver!");
> -MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:nuc900-ts");
> --
> 2.20.0
>
--
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 00/16] ARM: remove ks8695 and w90x900 platforms
2019-08-09 20:27 [PATCH 00/16] ARM: remove ks8695 and w90x900 platforms Arnd Bergmann
2019-08-09 20:27 ` [PATCH 10/16] Input: remove w90x900 keyboard driver Arnd Bergmann
2019-08-09 20:27 ` [PATCH 11/16] Input: remove w90x900 touchscreen driver Arnd Bergmann
@ 2019-08-10 7:29 ` Greg Kroah-Hartman
2 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2019-08-10 7:29 UTC (permalink / raw)
To: Arnd Bergmann
Cc: soc, Wanzongshun (Vincent), Greg Ungerer, linux-serial,
Dmitry Torokhov, linux-input, Linus Walleij, linux-gpio,
David S. Miller, netdev, Guenter Roeck, Mark Brown, alsa-devel,
linux-spi, Bartlomiej Zolnierkiewicz, linux-fbdev, Miquel Raynal,
linux-mtd, linux-arm-kernel, linux-kernel
On Fri, Aug 09, 2019 at 10:27:28PM +0200, Arnd Bergmann wrote:
> As discussed previously, these two ARM platforms have no
> known remaining users, let's remove them completely.
>
> Subsystem maintainers: feel free to take the driver removals
> through your respective trees, they are all independent of
> one another. We can merge any remaining patches through the
> soc tree.
Serial and USB host controller driver patches applied, thanks!
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread