Input: ixp4xx-beeper - delete driver

The NSLU2 has been migrated to devicetree and there we use
the gpio-beeper.c driver instead, the boardfile will be deleted
for kernel v5.15 so drop this custom and now unneeded driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210714115028.916360-1-linus.walleij@linaro.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 498cde3769810ee5c84a067019064bb9c0f3c559..ae01507b7afd4c6275f6fece7b6a141ae671e1a8 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -309,18 +309,6 @@ config INPUT_GPIO_VIBRA
          To compile this driver as a module, choose M here: the module will be
          called gpio-vibra.
 
-config INPUT_IXP4XX_BEEPER
-       tristate "IXP4XX Beeper support"
-       depends on ARCH_IXP4XX
-       help
-         If you say yes here, you can connect a beeper to the
-         ixp4xx gpio pins. This is used by the LinkSys NSLU2.
-
-         If unsure, say Y.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ixp4xx-beeper.
-
 config INPUT_COBALT_BTNS
        tristate "Cobalt button interface"
        depends on MIPS_COBALT

diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index f593beed7e0563057a683c7482366360555a24a5..2a09435074676833925d8bbecba1f799e5cfe301 100644 (file)
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -44,7 +44,6 @@ obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_IMS_PCU)            += ims-pcu.o
 obj-$(CONFIG_INPUT_IQS269A)            += iqs269a.o
 obj-$(CONFIG_INPUT_IQS626A)            += iqs626a.o
-obj-$(CONFIG_INPUT_IXP4XX_BEEPER)      += ixp4xx-beeper.o
 obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)     += keyspan_remote.o
 obj-$(CONFIG_INPUT_KXTJ9)              += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)          += m68kspkr.o

diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
deleted file mode 100644 (file)
index 05018d0..0000000
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ /dev/null
@@ -1,183 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Generic IXP4xx beeper driver
- *
- * Copyright (C) 2005 Tower Technologies
- *
- * based on nslu2-io.c
- *  Copyright (C) 2004 Karen Spearel
- *
- * Author: Alessandro Zummo <a.zummo@towertech.it>
- * Maintainers: http://www.nslu2-linux.org/
- */
-
-#include <linux/module.h>
-#include <linux/input.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/gpio.h>
-#include <mach/hardware.h>
-
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("ixp4xx beeper driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ixp4xx-beeper");
-
-static DEFINE_SPINLOCK(beep_lock);
-
-static int ixp4xx_timer2_irq;
-
-static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&beep_lock, flags);
-
-       if (count) {
-               gpio_direction_output(pin, 0);
-               *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE;
-       } else {
-               gpio_direction_output(pin, 1);
-               gpio_direction_input(pin);
-               *IXP4XX_OSRT2 = 0;
-       }
-
-       spin_unlock_irqrestore(&beep_lock, flags);
-}
-
-static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
-{
-       unsigned int pin = (unsigned int) input_get_drvdata(dev);
-       unsigned int count = 0;
-
-       if (type != EV_SND)
-               return -1;
-
-       switch (code) {
-               case SND_BELL:
-                       if (value)
-                               value = 1000;
-               case SND_TONE:
-                       break;
-               default:
-                       return -1;
-       }
-
-       if (value > 20 && value < 32767)
-               count = (ixp4xx_timer_freq / (value * 4)) - 1;
-
-       ixp4xx_spkr_control(pin, count);
-
-       return 0;
-}
-
-static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id)
-{
-       unsigned int pin = (unsigned int) dev_id;
-
-       /* clear interrupt */
-       *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND;
-
-       /* flip the beeper output */
-       gpio_set_value(pin, !gpio_get_value(pin));
-
-       return IRQ_HANDLED;
-}
-
-static int ixp4xx_spkr_probe(struct platform_device *dev)
-{
-       struct input_dev *input_dev;
-       int irq;
-       int err;
-
-       input_dev = input_allocate_device();
-       if (!input_dev)
-               return -ENOMEM;
-
-       input_set_drvdata(input_dev, (void *) dev->id);
-
-       input_dev->name = "ixp4xx beeper";
-       input_dev->phys = "ixp4xx/gpio";
-       input_dev->id.bustype = BUS_HOST;
-       input_dev->id.vendor  = 0x001f;
-       input_dev->id.product = 0x0001;
-       input_dev->id.version = 0x0100;
-       input_dev->dev.parent = &dev->dev;
-
-       input_dev->evbit[0] = BIT_MASK(EV_SND);
-       input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
-       input_dev->event = ixp4xx_spkr_event;
-
-       irq = platform_get_irq(dev, 0);
-       if (irq < 0) {
-               err = irq;
-               goto err_free_device;
-       }
-
-       err = gpio_request(dev->id, "ixp4-beeper");
-       if (err)
-               goto err_free_device;
-
-       err = request_irq(irq, &ixp4xx_spkr_interrupt,
-                         IRQF_NO_SUSPEND, "ixp4xx-beeper",
-                         (void *) dev->id);
-       if (err)
-               goto err_free_gpio;
-       ixp4xx_timer2_irq = irq;
-
-       err = input_register_device(input_dev);
-       if (err)
-               goto err_free_irq;
-
-       platform_set_drvdata(dev, input_dev);
-
-       return 0;
-
- err_free_irq:
-       free_irq(irq, (void *)dev->id);
- err_free_gpio:
-       gpio_free(dev->id);
- err_free_device:
-       input_free_device(input_dev);
-
-       return err;
-}
-
-static int ixp4xx_spkr_remove(struct platform_device *dev)
-{
-       struct input_dev *input_dev = platform_get_drvdata(dev);
-       unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
-
-       input_unregister_device(input_dev);
-
-       /* turn the speaker off */
-       disable_irq(ixp4xx_timer2_irq);
-       ixp4xx_spkr_control(pin, 0);
-
-       free_irq(ixp4xx_timer2_irq, (void *)dev->id);
-       gpio_free(dev->id);
-
-       return 0;
-}
-
-static void ixp4xx_spkr_shutdown(struct platform_device *dev)
-{
-       struct input_dev *input_dev = platform_get_drvdata(dev);
-       unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
-
-       /* turn off the speaker */
-       disable_irq(ixp4xx_timer2_irq);
-       ixp4xx_spkr_control(pin, 0);
-}
-
-static struct platform_driver ixp4xx_spkr_platform_driver = {
-       .driver         = {
-               .name   = "ixp4xx-beeper",
-       },
-       .probe          = ixp4xx_spkr_probe,
-       .remove         = ixp4xx_spkr_remove,
-       .shutdown       = ixp4xx_spkr_shutdown,
-};
-module_platform_driver(ixp4xx_spkr_platform_driver);
-