input: remove pxa930_rotary keyboard driver

The pxa930 platform is getting removed and no upstream machine
ever defined a rotary keyboard device.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 5d481847d71860153d956baeb137bac0fd11a5aa..d98650426dc28f2c5b17b138ca99e024594e8c34 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -550,15 +550,6 @@ config KEYBOARD_PXA27x
          To compile this driver as a module, choose M here: the
          module will be called pxa27x_keypad.
 
-config KEYBOARD_PXA930_ROTARY
-       tristate "PXA930/PXA935 Enhanced Rotary Controller Support"
-       depends on CPU_PXA930 || CPU_PXA935
-       help
-         Enable support for PXA930/PXA935 Enhanced Rotary Controller.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pxa930_rotary.
-
 config KEYBOARD_PMIC8XXX
        tristate "Qualcomm PMIC8XXX keypad support"
        depends on MFD_PM8XXX

diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 5ccfdf5c022253c21b1e5dd8ee0982e7386527e5..aecef00c5d09d3406023277ffed3c9883fbe6897 100644 (file)
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_KEYBOARD_OPENCORES)      += opencores-kbd.o
 obj-$(CONFIG_KEYBOARD_PINEPHONE)       += pinephone-keyboard.o
 obj-$(CONFIG_KEYBOARD_PMIC8XXX)                += pmic8xxx-keypad.o
 obj-$(CONFIG_KEYBOARD_PXA27x)          += pxa27x_keypad.o
-obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)   += pxa930_rotary.o
 obj-$(CONFIG_KEYBOARD_QT1050)           += qt1050.o
 obj-$(CONFIG_KEYBOARD_QT1070)           += qt1070.o
 obj-$(CONFIG_KEYBOARD_QT2160)          += qt2160.o

diff --git a/drivers/input/keyboard/pxa930_rotary.c b/drivers/input/keyboard/pxa930_rotary.c
deleted file mode 100644 (file)
index 2fe9dcf..0000000
--- a/drivers/input/keyboard/pxa930_rotary.c
+++ /dev/null
@@ -1,195 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Driver for the enhanced rotary controller on pxa930 and pxa935
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/input.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/slab.h>
-
-#include <linux/platform_data/keyboard-pxa930_rotary.h>
-
-#define SBCR   (0x04)
-#define ERCR   (0x0c)
-
-#define SBCR_ERSB      (1 << 5)
-
-struct pxa930_rotary {
-       struct input_dev        *input_dev;
-       void __iomem            *mmio_base;
-       int                     last_ercr;
-
-       struct pxa930_rotary_platform_data *pdata;
-};
-
-static void clear_sbcr(struct pxa930_rotary *r)
-{
-       uint32_t sbcr = __raw_readl(r->mmio_base + SBCR);
-
-       __raw_writel(sbcr | SBCR_ERSB, r->mmio_base + SBCR);
-       __raw_writel(sbcr & ~SBCR_ERSB, r->mmio_base + SBCR);
-}
-
-static irqreturn_t rotary_irq(int irq, void *dev_id)
-{
-       struct pxa930_rotary *r = dev_id;
-       struct pxa930_rotary_platform_data *pdata = r->pdata;
-       int ercr, delta, key;
-
-       ercr = __raw_readl(r->mmio_base + ERCR) & 0xf;
-       clear_sbcr(r);
-
-       delta = ercr - r->last_ercr;
-       if (delta == 0)
-               return IRQ_HANDLED;
-
-       r->last_ercr = ercr;
-
-       if (pdata->up_key && pdata->down_key) {
-               key = (delta > 0) ? pdata->up_key : pdata->down_key;
-               input_report_key(r->input_dev, key, 1);
-               input_sync(r->input_dev);
-               input_report_key(r->input_dev, key, 0);
-       } else
-               input_report_rel(r->input_dev, pdata->rel_code, delta);
-
-       input_sync(r->input_dev);
-
-       return IRQ_HANDLED;
-}
-
-static int pxa930_rotary_open(struct input_dev *dev)
-{
-       struct pxa930_rotary *r = input_get_drvdata(dev);
-
-       clear_sbcr(r);
-
-       return 0;
-}
-
-static void pxa930_rotary_close(struct input_dev *dev)
-{
-       struct pxa930_rotary *r = input_get_drvdata(dev);
-
-       clear_sbcr(r);
-}
-
-static int pxa930_rotary_probe(struct platform_device *pdev)
-{
-       struct pxa930_rotary_platform_data *pdata =
-                       dev_get_platdata(&pdev->dev);
-       struct pxa930_rotary *r;
-       struct input_dev *input_dev;
-       struct resource *res;
-       int irq;
-       int err;
-
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0)
-               return -ENXIO;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "no I/O memory defined\n");
-               return -ENXIO;
-       }
-
-       if (!pdata) {
-               dev_err(&pdev->dev, "no platform data defined\n");
-               return -EINVAL;
-       }
-
-       r = kzalloc(sizeof(struct pxa930_rotary), GFP_KERNEL);
-       if (!r)
-               return -ENOMEM;
-
-       r->mmio_base = ioremap(res->start, resource_size(res));
-       if (r->mmio_base == NULL) {
-               dev_err(&pdev->dev, "failed to remap IO memory\n");
-               err = -ENXIO;
-               goto failed_free;
-       }
-
-       r->pdata = pdata;
-       platform_set_drvdata(pdev, r);
-
-       /* allocate and register the input device */
-       input_dev = input_allocate_device();
-       if (!input_dev) {
-               dev_err(&pdev->dev, "failed to allocate input device\n");
-               err = -ENOMEM;
-               goto failed_free_io;
-       }
-
-       input_dev->name = pdev->name;
-       input_dev->id.bustype = BUS_HOST;
-       input_dev->open = pxa930_rotary_open;
-       input_dev->close = pxa930_rotary_close;
-       input_dev->dev.parent = &pdev->dev;
-
-       if (pdata->up_key && pdata->down_key) {
-               __set_bit(pdata->up_key, input_dev->keybit);
-               __set_bit(pdata->down_key, input_dev->keybit);
-               __set_bit(EV_KEY, input_dev->evbit);
-       } else {
-               __set_bit(pdata->rel_code, input_dev->relbit);
-               __set_bit(EV_REL, input_dev->evbit);
-       }
-
-       r->input_dev = input_dev;
-       input_set_drvdata(input_dev, r);
-
-       err = request_irq(irq, rotary_irq, 0,
-                       "enhanced rotary", r);
-       if (err) {
-               dev_err(&pdev->dev, "failed to request IRQ\n");
-               goto failed_free_input;
-       }
-
-       err = input_register_device(input_dev);
-       if (err) {
-               dev_err(&pdev->dev, "failed to register input device\n");
-               goto failed_free_irq;
-       }
-
-       return 0;
-
-failed_free_irq:
-       free_irq(irq, r);
-failed_free_input:
-       input_free_device(input_dev);
-failed_free_io:
-       iounmap(r->mmio_base);
-failed_free:
-       kfree(r);
-       return err;
-}
-
-static int pxa930_rotary_remove(struct platform_device *pdev)
-{
-       struct pxa930_rotary *r = platform_get_drvdata(pdev);
-
-       free_irq(platform_get_irq(pdev, 0), r);
-       input_unregister_device(r->input_dev);
-       iounmap(r->mmio_base);
-       kfree(r);
-
-       return 0;
-}
-
-static struct platform_driver pxa930_rotary_driver = {
-       .driver         = {
-               .name   = "pxa930-rotary",
-       },
-       .probe          = pxa930_rotary_probe,
-       .remove         = pxa930_rotary_remove,
-};
-module_platform_driver(pxa930_rotary_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Driver for PXA93x Enhanced Rotary Controller");
-MODULE_AUTHOR("Yao Yong <yaoyong@marvell.com>");

diff --git a/include/linux/platform_data/keyboard-pxa930_rotary.h b/include/linux/platform_data/keyboard-pxa930_rotary.h
deleted file mode 100644 (file)
index 3271aa0..0000000
--- a/include/linux/platform_data/keyboard-pxa930_rotary.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __ASM_ARCH_PXA930_ROTARY_H
-#define __ASM_ARCH_PXA930_ROTARY_H
-
-/* NOTE:
- *
- * rotary can be either interpreted as a ralative input event (e.g.
- * REL_WHEEL or REL_HWHEEL) or a specific key event (e.g. UP/DOWN
- * or LEFT/RIGHT), depending on if up_key & down_key are assigned
- * or rel_code is assigned a non-zero value. When all are non-zero,
- * up_key and down_key will be preferred.
- */
-struct pxa930_rotary_platform_data {
-       int     up_key;
-       int     down_key;
-       int     rel_code;
-};
-
-void __init pxa930_set_rotarykey_info(struct pxa930_rotary_platform_data *info);
-
-#endif /* __ASM_ARCH_PXA930_ROTARY_H */