media: Revert "media: saa7146: deprecate hexium_gemini/orion, mxb and ttpci"
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Wed, 1 Feb 2023 12:21:36 +0000 (13:21 +0100)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>
Thu, 9 Feb 2023 08:22:36 +0000 (09:22 +0100)
This reverts commit e33fdb5a02490059e2f48ced2c038c8a46c6476d.

The saa7146-based devices are still in use, esp. for DVB. So move
these drivers back to mainline.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
35 files changed:
MAINTAINERS
drivers/media/common/Kconfig
drivers/media/common/Makefile
drivers/media/common/saa7146/Kconfig [moved from drivers/staging/media/deprecated/saa7146/common/Kconfig with 100% similarity]
drivers/media/common/saa7146/Makefile [moved from drivers/staging/media/deprecated/saa7146/common/Makefile with 100% similarity]
drivers/media/common/saa7146/saa7146_core.c [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_core.c with 99% similarity]
drivers/media/common/saa7146/saa7146_fops.c [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_fops.c with 99% similarity]
drivers/media/common/saa7146/saa7146_hlp.c [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_hlp.c with 99% similarity]
drivers/media/common/saa7146/saa7146_i2c.c [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_i2c.c with 99% similarity]
drivers/media/common/saa7146/saa7146_vbi.c [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_vbi.c with 99% similarity]
drivers/media/common/saa7146/saa7146_video.c [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_video.c with 99% similarity]
drivers/media/pci/Kconfig
drivers/media/pci/Makefile
drivers/media/pci/saa7146/Kconfig [moved from drivers/staging/media/deprecated/saa7146/saa7146/Kconfig with 67% similarity]
drivers/media/pci/saa7146/Makefile [moved from drivers/staging/media/deprecated/saa7146/saa7146/Makefile with 100% similarity]
drivers/media/pci/saa7146/hexium_gemini.c [moved from drivers/staging/media/deprecated/saa7146/saa7146/hexium_gemini.c with 99% similarity]
drivers/media/pci/saa7146/hexium_orion.c [moved from drivers/staging/media/deprecated/saa7146/saa7146/hexium_orion.c with 99% similarity]
drivers/media/pci/saa7146/mxb.c [moved from drivers/staging/media/deprecated/saa7146/saa7146/mxb.c with 99% similarity]
drivers/media/pci/ttpci/Kconfig [moved from drivers/staging/media/deprecated/saa7146/ttpci/Kconfig with 83% similarity]
drivers/media/pci/ttpci/Makefile [moved from drivers/staging/media/deprecated/saa7146/ttpci/Makefile with 100% similarity]
drivers/media/pci/ttpci/budget-av.c [moved from drivers/staging/media/deprecated/saa7146/ttpci/budget-av.c with 99% similarity]
drivers/media/pci/ttpci/budget-ci.c [moved from drivers/staging/media/deprecated/saa7146/ttpci/budget-ci.c with 100% similarity]
drivers/media/pci/ttpci/budget-core.c [moved from drivers/staging/media/deprecated/saa7146/ttpci/budget-core.c with 100% similarity]
drivers/media/pci/ttpci/budget.c [moved from drivers/staging/media/deprecated/saa7146/ttpci/budget.c with 100% similarity]
drivers/media/pci/ttpci/budget.h [moved from drivers/staging/media/deprecated/saa7146/ttpci/budget.h with 98% similarity]
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
drivers/staging/media/av7110/Makefile
drivers/staging/media/av7110/av7110.h
drivers/staging/media/deprecated/saa7146/Kconfig [deleted file]
drivers/staging/media/deprecated/saa7146/Makefile [deleted file]
drivers/staging/media/deprecated/saa7146/saa7146/TODO [deleted file]
drivers/staging/media/deprecated/saa7146/ttpci/TODO [deleted file]
include/media/drv-intf/saa7146.h [moved from drivers/staging/media/deprecated/saa7146/common/saa7146.h with 100% similarity]
include/media/drv-intf/saa7146_vv.h [moved from drivers/staging/media/deprecated/saa7146/common/saa7146_vv.h with 99% similarity]

index b8a4b52..14dee68 100644 (file)
@@ -18393,7 +18393,9 @@ M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/staging/media/deprecated/saa7146/
+F:     drivers/media/common/saa7146/
+F:     drivers/media/pci/saa7146/
+F:     include/media/drv-intf/saa7146*
 
 SAFESETID SECURITY MODULE
 M:     Micah Morton <mortonm@chromium.org>
index 852b7d9..a2ae712 100644 (file)
@@ -22,6 +22,7 @@ config VIDEO_TVEEPROM
        depends on I2C
 
 source "drivers/media/common/b2c2/Kconfig"
+source "drivers/media/common/saa7146/Kconfig"
 source "drivers/media/common/siano/Kconfig"
 source "drivers/media/common/v4l2-tpg/Kconfig"
 source "drivers/media/common/videobuf2/Kconfig"
index d78a0df..ad0b1e9 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-y += b2c2/ siano/ v4l2-tpg/ videobuf2/
+obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
 
 # Please keep it alphabetically sorted by Kconfig name
 # (e. g. LC_ALL=C sort Makefile)
@@ -8,8 +8,8 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <media/drv-intf/saa7146.h>
 #include <linux/module.h>
-#include "saa7146.h"
 
 static int saa7146_num;
 
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
-#include "saa7146_vv.h"
 
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
@@ -3,7 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/export.h>
-#include "saa7146_vv.h"
+#include <media/drv-intf/saa7146_vv.h>
 
 static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
 {
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include "saa7146_vv.h"
+#include <media/drv-intf/saa7146_vv.h>
 
 static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
 {
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "saa7146_vv.h"
+#include <media/drv-intf/saa7146_vv.h>
 
 static int vbi_pixel_to_capture = 720 * 2;
 
@@ -1,10 +1,10 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <media/drv-intf/saa7146_vv.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ctrls.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include "saa7146_vv.h"
 
 static int max_memory = 32;
 
index dff0b45..4801945 100644 (file)
@@ -27,6 +27,7 @@ if MEDIA_ANALOG_TV_SUPPORT
 
 source "drivers/media/pci/dt3155/Kconfig"
 source "drivers/media/pci/ivtv/Kconfig"
+source "drivers/media/pci/saa7146/Kconfig"
 
 endif
 
@@ -57,6 +58,7 @@ source "drivers/media/pci/pluto2/Kconfig"
 source "drivers/media/pci/pt1/Kconfig"
 source "drivers/media/pci/pt3/Kconfig"
 source "drivers/media/pci/smipcie/Kconfig"
+source "drivers/media/pci/ttpci/Kconfig"
 
 endif
 
index 8f887a8..8bed619 100644 (file)
@@ -5,7 +5,8 @@
 
 # Please keep it alphabetically sorted by directory
 # (e. g. LC_ALL=C sort Makefile)
-obj-y        +=        b2c2/           \
+obj-y        +=        ttpci/          \
+               b2c2/           \
                pluto2/         \
                dm1105/         \
                pt1/            \
@@ -13,6 +14,7 @@ obj-y        +=       b2c2/           \
                mantis/         \
                ngene/          \
                ddbridge/       \
+               saa7146/        \
                smipcie/        \
                netup_unidvb/   \
                intel/
similarity index 67%
rename from drivers/staging/media/deprecated/saa7146/saa7146/Kconfig
rename to drivers/media/pci/saa7146/Kconfig
index 228e8d3..3bbb68a 100644 (file)
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_HEXIUM_GEMINI
-       tristate "Hexium Gemini frame grabber (DEPRECATED)"
+       tristate "Hexium Gemini frame grabber"
        depends on PCI && VIDEO_DEV && I2C
        select VIDEO_SAA7146_VV
        help
@@ -8,28 +8,22 @@ config VIDEO_HEXIUM_GEMINI
          grabber card by Hexium. Please note that the Gemini Dual
          card is *not* fully supported.
 
-         This driver is deprecated and is scheduled for removal by
-         the beginning of 2023. See the TODO file for more information.
-
          To compile this driver as a module, choose M here: the
          module will be called hexium_gemini.
 
 config VIDEO_HEXIUM_ORION
-       tristate "Hexium HV-PCI6 and Orion frame grabber (DEPRECATED)"
+       tristate "Hexium HV-PCI6 and Orion frame grabber"
        depends on PCI && VIDEO_DEV && I2C
        select VIDEO_SAA7146_VV
        help
          This is a video4linux driver for the Hexium HV-PCI6 and
          Orion frame grabber cards by Hexium.
 
-         This driver is deprecated and is scheduled for removal by
-         the beginning of 2023. See the TODO file for more information.
-
          To compile this driver as a module, choose M here: the
          module will be called hexium_orion.
 
 config VIDEO_MXB
-       tristate "Siemens-Nixdorf 'Multimedia eXtension Board' (DEPRECATED)"
+       tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
        depends on PCI && VIDEO_DEV && I2C
        select VIDEO_SAA7146_VV
        select VIDEO_TUNER
@@ -41,8 +35,5 @@ config VIDEO_MXB
          This is a video4linux driver for the 'Multimedia eXtension Board'
          TV card by Siemens-Nixdorf.
 
-         This driver is deprecated and is scheduled for removal by
-         the beginning of 2023. See the TODO file for more information.
-
          To compile this driver as a module, choose M here: the
          module will be called mxb.
@@ -13,9 +13,9 @@
 
 #define DEBUG_VARIABLE debug
 
+#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include "../common/saa7146_vv.h"
 
 static int debug;
 module_param(debug, int, 0);
@@ -13,9 +13,9 @@
 
 #define DEBUG_VARIABLE debug
 
+#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include "../common/saa7146_vv.h"
 
 static int debug;
 module_param(debug, int, 0);
similarity index 99%
rename from drivers/staging/media/deprecated/saa7146/saa7146/mxb.c
rename to drivers/media/pci/saa7146/mxb.c
index 3e568f9..7ded8f5 100644 (file)
 
 #define DEBUG_VARIABLE debug
 
+#include <media/drv-intf/saa7146_vv.h>
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
 #include <media/i2c/saa7115.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 
-#include "../common/saa7146_vv.h"
 #include "tea6415c.h"
 #include "tea6420.h"
 
similarity index 83%
rename from drivers/staging/media/deprecated/saa7146/ttpci/Kconfig
rename to drivers/media/pci/ttpci/Kconfig
index 8c85ed5..65a6832 100644 (file)
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_BUDGET_CORE
-       tristate "SAA7146 DVB cards (aka Budget, Nova-PCI) (DEPRECATED)"
+       tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
        depends on DVB_CORE && PCI && I2C
        select VIDEO_SAA7146
        select TTPCI_EEPROM
@@ -10,7 +10,7 @@ config DVB_BUDGET_CORE
          MPEG2 decoder.
 
 config DVB_BUDGET
-       tristate "Budget cards (DEPRECATED)"
+       tristate "Budget cards"
        depends on DVB_BUDGET_CORE && I2C
        select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT
@@ -30,16 +30,13 @@ config DVB_BUDGET
          or Nova-PCI cards) without onboard MPEG2 decoder, and without
          analog inputs or an onboard Common Interface connector.
 
-         This driver is deprecated and is scheduled for removal by
-         the beginning of 2023. See the TODO file for more information.
-
          Say Y if you own such a card and want to use it.
 
          To compile this driver as a module, choose M here: the
          module will be called budget.
 
 config DVB_BUDGET_CI
-       tristate "Budget cards with onboard CI connector (DEPRECATED)"
+       tristate "Budget cards with onboard CI connector"
        depends on DVB_BUDGET_CORE && I2C
        select DVB_STV0297 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@@ -60,16 +57,13 @@ config DVB_BUDGET_CI
          Note: The Common Interface is not yet supported by this driver
          due to lack of information from the vendor.
 
-         This driver is deprecated and is scheduled for removal by
-         the beginning of 2023. See the TODO file for more information.
-
          Say Y if you own such a card and want to use it.
 
          To compile this driver as a module, choose M here: the
          module will be called budget-ci.
 
 config DVB_BUDGET_AV
-       tristate "Budget cards with analog video inputs (DEPRECATED)"
+       tristate "Budget cards with analog video inputs"
        depends on DVB_BUDGET_CORE && I2C
        select VIDEO_SAA7146_VV
        depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
@@ -86,9 +80,6 @@ config DVB_BUDGET_AV
          (so called Budget- or Nova-PCI cards) without onboard
          MPEG2 decoder, but with one or more analog video inputs.
 
-         This driver is deprecated and is scheduled for removal by
-         the beginning of 2023. See the TODO file for more information.
-
          Say Y if you own such a card and want to use it.
 
          To compile this driver as a module, choose M here: the
@@ -29,7 +29,7 @@
 #include "tda1004x.h"
 #include "tua6100.h"
 #include "dvb-pll.h"
-#include "../common/saa7146_vv.h"
+#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
similarity index 98%
rename from drivers/staging/media/deprecated/saa7146/ttpci/budget.h
rename to drivers/media/pci/ttpci/budget.h
index 82cc0df..bd87432 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 
-#include "../common/saa7146.h"
+#include <media/drv-intf/saa7146.h>
 
 extern int budget_debug;
 
index 9a43d88..bc6c7b2 100644 (file)
@@ -54,7 +54,6 @@ menuconfig STAGING_MEDIA_DEPRECATED
 
 if STAGING_MEDIA_DEPRECATED
 source "drivers/staging/media/deprecated/atmel/Kconfig"
-source "drivers/staging/media/deprecated/saa7146/Kconfig"
 endif
 
 endif
index 2efdbf7..1a4c3a0 100644 (file)
@@ -10,4 +10,3 @@ obj-$(CONFIG_VIDEO_SUNXI)     += sunxi/
 obj-$(CONFIG_VIDEO_TEGRA)      += tegra-video/
 obj-$(CONFIG_VIDEO_IPU3_IMGU)  += ipu3/
 obj-$(CONFIG_DVB_AV7110)       += av7110/
-obj-y += deprecated/saa7146/
index c04cd0a..307b267 100644 (file)
@@ -18,6 +18,5 @@ obj-$(CONFIG_DVB_SP8870) += sp8870.o
 
 ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
 ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/pci/ttpci
 ccflags-y += -I $(srctree)/drivers/media/common
-ccflags-y += -I $(srctree)/drivers/staging/media/deprecated/saa7146/ttpci
-ccflags-y += -I $(srctree)/drivers/staging/media/deprecated/saa7146/common
index 9fde69b..809d938 100644 (file)
@@ -33,7 +33,7 @@
 #include "stv0297.h"
 #include "l64781.h"
 
-#include "saa7146_vv.h"
+#include <media/drv-intf/saa7146_vv.h>
 
 
 #define ANALOG_TUNER_VES1820 1
diff --git a/drivers/staging/media/deprecated/saa7146/Kconfig b/drivers/staging/media/deprecated/saa7146/Kconfig
deleted file mode 100644 (file)
index d0cb521..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-source "drivers/staging/media/deprecated/saa7146/common/Kconfig"
-source "drivers/staging/media/deprecated/saa7146/saa7146/Kconfig"
-source "drivers/staging/media/deprecated/saa7146/ttpci/Kconfig"
diff --git a/drivers/staging/media/deprecated/saa7146/Makefile b/drivers/staging/media/deprecated/saa7146/Makefile
deleted file mode 100644 (file)
index 9d99fde..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
- # SPDX-License-Identifier: GPL-2.0-only
-obj-y += common/ saa7146/ ttpci/
diff --git a/drivers/staging/media/deprecated/saa7146/saa7146/TODO b/drivers/staging/media/deprecated/saa7146/saa7146/TODO
deleted file mode 100644 (file)
index c9ae2ec..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-The saa7146-based drivers are one of the few drivers still not using
-the vb2 framework, so these drivers are now deprecated with the intent of
-removing them altogether by the beginning of 2023.
-
-In order to keep these drivers they have to be converted to vb2.
-If someone is interested in doing this work, then contact the
-linux-media mailinglist (https://linuxtv.org/lists.php).
diff --git a/drivers/staging/media/deprecated/saa7146/ttpci/TODO b/drivers/staging/media/deprecated/saa7146/ttpci/TODO
deleted file mode 100644 (file)
index c9ae2ec..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-The saa7146-based drivers are one of the few drivers still not using
-the vb2 framework, so these drivers are now deprecated with the intent of
-removing them altogether by the beginning of 2023.
-
-In order to keep these drivers they have to be converted to vb2.
-If someone is interested in doing this work, then contact the
-linux-media mailinglist (https://linuxtv.org/lists.php).
@@ -5,8 +5,8 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-fh.h>
+#include <media/drv-intf/saa7146.h>
 #include <media/videobuf-dma-sg.h>
-#include "saa7146.h"
 
 #define MAX_SAA7146_CAPTURE_BUFFERS    32      /* arbitrary */
 #define BUFFER_TIMEOUT     (HZ/2)  /* 0.5 seconds */