[media] tw686x-kh: remove obsolete driver

The functionality that was part of the tw686x-kh driver but not of the
mainlined tw686x driver has now been added to the tw686x driver as well.

So this driver no longer adds any functionality not available through
the mainlined driver and it can now be removed.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

9 files changed, 0 insertions, 1202 deletions

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 7292f23954df..53827778b414 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -31,8 +31,6 @@ source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/pulse8-cec/Kconfig"
 
-source "drivers/staging/media/tw686x-kh/Kconfig"
-
 source "drivers/staging/media/s5p-cec/Kconfig"
 
 # Keep LIRC at the end, as it has sub-menus
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 87ce8ad1e22a..6316e8c7a497 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)  += davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)       += omap4iss/
 obj-$(CONFIG_USB_PULSE8_CEC)    += pulse8-cec/
-obj-$(CONFIG_VIDEO_TW686X_KH)   += tw686x-kh/
diff --git a/drivers/staging/media/tw686x-kh/Kconfig b/drivers/staging/media/tw686x-kh/Kconfig
deleted file mode 100644
index 6264d30edf5a..000000000000
--- a/drivers/staging/media/tw686x-kh/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-config VIDEO_TW686X_KH
-        tristate "Intersil/Techwell TW686x Video For Linux"
-        depends on VIDEO_DEV && PCI && VIDEO_V4L2
-        depends on !(VIDEO_TW686X=y || VIDEO_TW686X=m) || COMPILE_TEST
-        select VIDEOBUF2_DMA_SG
-        help
-          Support for Intersil/Techwell TW686x-based frame grabber cards.
-
-          Currently supported chips:
-          - TW6864 (4 video channels),
-          - TW6865 (4 video channels, not tested, second generation chip),
-          - TW6868 (8 video channels but only 4 first channels using
-            built-in video decoder are supported, not tested),
-          - TW6869 (8 video channels, second generation chip).
-
-          To compile this driver as a module, choose M here: the module
-          will be named tw686x-kh.
diff --git a/drivers/staging/media/tw686x-kh/Makefile b/drivers/staging/media/tw686x-kh/Makefile
deleted file mode 100644
index 2a36a38cf30e..000000000000
--- a/drivers/staging/media/tw686x-kh/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-tw686x-kh-objs := tw686x-kh-core.o tw686x-kh-video.o
-
-obj-$(CONFIG_VIDEO_TW686X_KH) += tw686x-kh.o
diff --git a/drivers/staging/media/tw686x-kh/TODO b/drivers/staging/media/tw686x-kh/TODO
deleted file mode 100644
index 480a495b11fb..000000000000
--- a/drivers/staging/media/tw686x-kh/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-TODO:
-
-- implement V4L2_FIELD_INTERLACED* mode(s).
-- add audio support
-
-Please Cc: patches to Krzysztof Halasa <khalasa@piap.pl>.
diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh-core.c b/drivers/staging/media/tw686x-kh/tw686x-kh-core.c
deleted file mode 100644
index 03b3b62c59c4..000000000000
--- a/drivers/staging/media/tw686x-kh/tw686x-kh-core.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2015 Industrial Research Institute for Automation
- * and Measurements PIAP
- *
- * Written by Krzysztof Ha?asa.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
-
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include "tw686x-kh.h"
-#include "tw686x-kh-regs.h"
-
-static irqreturn_t tw686x_irq(int irq, void *dev_id)
-{
-        struct tw686x_dev *dev = (struct tw686x_dev *)dev_id;
-        u32 int_status = reg_read(dev, INT_STATUS); /* cleared on read */
-        unsigned long flags;
-        unsigned int handled = 0;
-
-        if (int_status) {
-                spin_lock_irqsave(&dev->irq_lock, flags);
-                dev->dma_requests |= int_status;
-                spin_unlock_irqrestore(&dev->irq_lock, flags);
-
-                if (int_status & 0xFF0000FF)
-                        handled = tw686x_kh_video_irq(dev);
-        }
-
-        return IRQ_RETVAL(handled);
-}
-
-static int tw686x_probe(struct pci_dev *pci_dev,
-                        const struct pci_device_id *pci_id)
-{
-        struct tw686x_dev *dev;
-        int err;
-
-        dev = devm_kzalloc(&pci_dev->dev, sizeof(*dev) +
-                           (pci_id->driver_data & TYPE_MAX_CHANNELS) *
-                           sizeof(dev->video_channels[0]), GFP_KERNEL);
-        if (!dev)
-                return -ENOMEM;
-
-        sprintf(dev->name, "TW%04X", pci_dev->device);
-        dev->type = pci_id->driver_data;
-
-        pr_info("%s: PCI %s, IRQ %d, MMIO 0x%lx\n", dev->name,
-                pci_name(pci_dev), pci_dev->irq,
-                (unsigned long)pci_resource_start(pci_dev, 0));
-
-        dev->pci_dev = pci_dev;
-        if (pcim_enable_device(pci_dev))
-                return -EIO;
-
-        pci_set_master(pci_dev);
-
-        if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
-                pr_err("%s: 32-bit PCI DMA not supported\n", dev->name);
-                return -EIO;
-        }
-
-        err = pci_request_regions(pci_dev, dev->name);
-        if (err < 0) {
-                pr_err("%s: Unable to get MMIO region\n", dev->name);
-                return err;
-        }
-
-        dev->mmio = pci_ioremap_bar(pci_dev, 0);
-        if (!dev->mmio) {
-                pr_err("%s: Unable to remap MMIO region\n", dev->name);
-                return -EIO;
-        }
-
-        reg_write(dev, SYS_SOFT_RST, 0x0F); /* Reset all subsystems */
-        mdelay(1);
-
-        reg_write(dev, SRST[0], 0x3F);
-        if (max_channels(dev) > 4)
-                reg_write(dev, SRST[1], 0x3F);
-        reg_write(dev, DMA_CMD, 0);
-        reg_write(dev, DMA_CHANNEL_ENABLE, 0);
-        reg_write(dev, DMA_CHANNEL_TIMEOUT, 0x3EFF0FF0);
-        reg_write(dev, DMA_TIMER_INTERVAL, 0x38000);
-        reg_write(dev, DMA_CONFIG, 0xFFFFFF04);
-
-        spin_lock_init(&dev->irq_lock);
-
-        err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw686x_irq,
-                               IRQF_SHARED, dev->name, dev);
-        if (err < 0) {
-                pr_err("%s: Unable to get IRQ\n", dev->name);
-                return err;
-        }
-
-        err = tw686x_kh_video_init(dev);
-        if (err)
-                return err;
-
-        pci_set_drvdata(pci_dev, dev);
-        return 0;
-}
-
-static void tw686x_remove(struct pci_dev *pci_dev)
-{
-        struct tw686x_dev *dev = pci_get_drvdata(pci_dev);
-
-        tw686x_kh_video_free(dev);
-}
-
-/* driver_data is number of A/V channels */
-static const struct pci_device_id tw686x_pci_tbl[] = {
-        {PCI_DEVICE(0x1797, 0x6864), .driver_data = 4},
-        /* not tested */
-        {PCI_DEVICE(0x1797, 0x6865), .driver_data = 4 | TYPE_SECOND_GEN},
-        /* TW6868 supports 8 A/V channels with an external TW2865 chip -
-           not supported by the driver */
-        {PCI_DEVICE(0x1797, 0x6868), .driver_data = 4}, /* not tested */
-        {PCI_DEVICE(0x1797, 0x6869), .driver_data = 8 | TYPE_SECOND_GEN},
-        {}
-};
-
-static struct pci_driver tw686x_pci_driver = {
-        .name = "tw686x-kh",
-        .id_table = tw686x_pci_tbl,
-        .probe = tw686x_probe,
-        .remove = tw686x_remove,