* [PATCH 0/9] Deprecate old non-vb2 drivers
@ 2022-08-11 9:17 Hans Verkuil
2022-08-11 9:17 ` [PATCH 1/9] staging/media: add a STAGING_MEDIA_DEPRECATED option Hans Verkuil
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar
This patch series deprecates the cpia2, meye, zr364xx, tm6000,
fsl-viu, dm644x_ccdc, dm355_cddc, dm365_isif, hexium_gemini/orion,
mxb and ttpci drivers.
The cpia2 and meye drivers do not use either vb2 or vb1, and the
other drivers use vb1 instead of vb2.
Note: the DVB ttpci driver (saa7146 based) can probably be kept
if someone would be willing to disentangle it from the saa7146
common code that's shared between DVB and V4L2 drivers. But it
is such old hardware that I am not sure it is worth the effort.
After this series the only remaining drivers in mainline that
still use vb1 are cx18 and bt8xx.
Regards,
Hans
Hans Verkuil (9):
staging/media: add a STAGING_MEDIA_DEPRECATED option
cpia2: deprecate this driver
meye: deprecate this driver
zr364xx: deprecate this driver
tm6000: deprecate this driver
fsl-viu: deprecate this driver
davinci: deprecate dm644x_ccdc, dm355_cddc and dm365_isif
saa7146: deprecate hexium_gemini/orion, mxb and ttpci
av7110: move to staging/media/deprecated/saa7146
drivers/media/common/Kconfig | 1 -
drivers/media/common/Makefile | 2 +-
drivers/media/pci/Kconfig | 3 -
drivers/media/pci/Makefile | 5 +-
drivers/media/platform/nxp/Kconfig | 12 ----
drivers/media/platform/nxp/Makefile | 1 -
drivers/media/platform/ti/davinci/Kconfig | 49 ----------------
drivers/media/platform/ti/davinci/Makefile | 4 --
drivers/media/usb/Kconfig | 3 -
drivers/media/usb/Makefile | 3 -
drivers/staging/media/Kconfig | 27 +++++++--
drivers/staging/media/Makefile | 10 +++-
drivers/staging/media/av7110/TODO | 3 -
.../media/deprecated}/cpia2/Kconfig | 5 +-
.../media/deprecated}/cpia2/Makefile | 0
drivers/staging/media/deprecated/cpia2/TODO | 6 ++
.../media/deprecated}/cpia2/cpia2.h | 0
.../media/deprecated}/cpia2/cpia2_core.c | 0
.../media/deprecated}/cpia2/cpia2_registers.h | 0
.../media/deprecated}/cpia2/cpia2_usb.c | 0
.../media/deprecated}/cpia2/cpia2_v4l.c | 0
.../staging/media/deprecated/fsl-viu/Kconfig | 17 ++++++
.../staging/media/deprecated/fsl-viu/Makefile | 2 +
drivers/staging/media/deprecated/fsl-viu/TODO | 8 +++
.../media/deprecated/fsl-viu}/fsl-viu.c | 0
.../media/deprecated}/meye/Kconfig | 5 +-
.../media/deprecated}/meye/Makefile | 0
drivers/staging/media/deprecated/meye/TODO | 6 ++
.../media/deprecated}/meye/meye.c | 0
.../media/deprecated}/meye/meye.h | 0
.../staging/media/deprecated/saa7146/Kconfig | 5 ++
.../staging/media/deprecated/saa7146/Makefile | 2 +
.../{ => deprecated/saa7146}/av7110/Kconfig | 20 +++++--
.../{ => deprecated/saa7146}/av7110/Makefile | 3 +-
.../media/deprecated/saa7146/av7110/TODO | 9 +++
.../av7110/audio-bilingual-channel-select.rst | 0
.../saa7146}/av7110/audio-channel-select.rst | 0
.../saa7146}/av7110/audio-clear-buffer.rst | 0
.../saa7146}/av7110/audio-continue.rst | 0
.../saa7146}/av7110/audio-fclose.rst | 0
.../saa7146}/av7110/audio-fopen.rst | 0
.../saa7146}/av7110/audio-fwrite.rst | 0
.../av7110/audio-get-capabilities.rst | 0
.../saa7146}/av7110/audio-get-status.rst | 0
.../saa7146}/av7110/audio-pause.rst | 0
.../saa7146}/av7110/audio-play.rst | 0
.../saa7146}/av7110/audio-select-source.rst | 0
.../saa7146}/av7110/audio-set-av-sync.rst | 0
.../saa7146}/av7110/audio-set-bypass-mode.rst | 0
.../saa7146}/av7110/audio-set-id.rst | 0
.../saa7146}/av7110/audio-set-mixer.rst | 0
.../saa7146}/av7110/audio-set-mute.rst | 0
.../saa7146}/av7110/audio-set-streamtype.rst | 0
.../saa7146}/av7110/audio-stop.rst | 0
.../{ => deprecated/saa7146}/av7110/audio.rst | 0
.../saa7146}/av7110/audio_data_types.rst | 0
.../saa7146}/av7110/audio_function_calls.rst | 0
.../{ => deprecated/saa7146}/av7110/av7110.c | 0
.../{ => deprecated/saa7146}/av7110/av7110.h | 2 +-
.../saa7146}/av7110/av7110_av.c | 0
.../saa7146}/av7110/av7110_av.h | 0
.../saa7146}/av7110/av7110_ca.c | 0
.../saa7146}/av7110/av7110_ca.h | 0
.../saa7146}/av7110/av7110_hw.c | 0
.../saa7146}/av7110/av7110_hw.h | 0
.../saa7146}/av7110/av7110_ipack.c | 0
.../saa7146}/av7110/av7110_ipack.h | 0
.../saa7146}/av7110/av7110_ir.c | 0
.../saa7146}/av7110/av7110_v4l.c | 0
.../saa7146}/av7110/budget-patch.c | 0
.../saa7146}/av7110/dvb_filter.c | 0
.../saa7146}/av7110/dvb_filter.h | 0
.../{ => deprecated/saa7146}/av7110/sp8870.c | 0
.../{ => deprecated/saa7146}/av7110/sp8870.h | 0
.../saa7146}/av7110/video-clear-buffer.rst | 0
.../saa7146}/av7110/video-command.rst | 0
.../saa7146}/av7110/video-continue.rst | 0
.../saa7146}/av7110/video-fast-forward.rst | 0
.../saa7146}/av7110/video-fclose.rst | 0
.../saa7146}/av7110/video-fopen.rst | 0
.../saa7146}/av7110/video-freeze.rst | 0
.../saa7146}/av7110/video-fwrite.rst | 0
.../av7110/video-get-capabilities.rst | 0
.../saa7146}/av7110/video-get-event.rst | 0
.../saa7146}/av7110/video-get-frame-count.rst | 0
.../saa7146}/av7110/video-get-pts.rst | 0
.../saa7146}/av7110/video-get-size.rst | 0
.../saa7146}/av7110/video-get-status.rst | 0
.../saa7146}/av7110/video-play.rst | 0
.../saa7146}/av7110/video-select-source.rst | 0
.../saa7146}/av7110/video-set-blank.rst | 0
.../av7110/video-set-display-format.rst | 0
.../saa7146}/av7110/video-set-format.rst | 0
.../saa7146}/av7110/video-set-streamtype.rst | 0
.../saa7146}/av7110/video-slowmotion.rst | 0
.../saa7146}/av7110/video-stillpicture.rst | 0
.../saa7146}/av7110/video-stop.rst | 0
.../saa7146}/av7110/video-try-command.rst | 0
.../{ => deprecated/saa7146}/av7110/video.rst | 0
.../saa7146}/av7110/video_function_calls.rst | 0
.../saa7146}/av7110/video_types.rst | 0
.../media/deprecated/saa7146/common}/Kconfig | 0
.../media/deprecated/saa7146/common}/Makefile | 0
.../deprecated/saa7146/common}/saa7146.h | 0
.../deprecated/saa7146/common}/saa7146_core.c | 2 +-
.../deprecated/saa7146/common}/saa7146_fops.c | 2 +-
.../deprecated/saa7146/common}/saa7146_hlp.c | 2 +-
.../deprecated/saa7146/common}/saa7146_i2c.c | 2 +-
.../deprecated/saa7146/common}/saa7146_vbi.c | 2 +-
.../saa7146/common}/saa7146_video.c | 2 +-
.../deprecated/saa7146/common}/saa7146_vv.h | 2 +-
.../media/deprecated/saa7146}/saa7146/Kconfig | 15 ++++-
.../deprecated/saa7146}/saa7146/Makefile | 0
.../media/deprecated/saa7146/saa7146/TODO | 7 +++
.../saa7146}/saa7146/hexium_gemini.c | 2 +-
.../saa7146}/saa7146/hexium_orion.c | 2 +-
.../media/deprecated/saa7146}/saa7146/mxb.c | 2 +-
.../media/deprecated/saa7146}/ttpci/Kconfig | 17 ++++--
.../media/deprecated/saa7146}/ttpci/Makefile | 0
.../media/deprecated/saa7146/ttpci/TODO | 7 +++
.../deprecated/saa7146}/ttpci/budget-av.c | 2 +-
.../deprecated/saa7146}/ttpci/budget-ci.c | 0
.../deprecated/saa7146}/ttpci/budget-core.c | 0
.../media/deprecated/saa7146}/ttpci/budget.c | 0
.../media/deprecated/saa7146}/ttpci/budget.h | 2 +-
.../media/{ => deprecated}/stkwebcam/Kconfig | 0
.../media/{ => deprecated}/stkwebcam/Makefile | 0
.../media/{ => deprecated}/stkwebcam/TODO | 0
.../{ => deprecated}/stkwebcam/stk-sensor.c | 0
.../{ => deprecated}/stkwebcam/stk-webcam.c | 0
.../{ => deprecated}/stkwebcam/stk-webcam.h | 0
.../media/deprecated}/tm6000/Kconfig | 5 +-
.../media/deprecated}/tm6000/Makefile | 0
drivers/staging/media/deprecated/tm6000/TODO | 8 +++
.../media/deprecated}/tm6000/tm6000-alsa.c | 0
.../media/deprecated}/tm6000/tm6000-cards.c | 0
.../media/deprecated}/tm6000/tm6000-core.c | 0
.../media/deprecated}/tm6000/tm6000-dvb.c | 0
.../media/deprecated}/tm6000/tm6000-i2c.c | 0
.../media/deprecated}/tm6000/tm6000-input.c | 0
.../media/deprecated}/tm6000/tm6000-regs.h | 0
.../media/deprecated}/tm6000/tm6000-stds.c | 0
.../deprecated}/tm6000/tm6000-usb-isoc.h | 0
.../media/deprecated}/tm6000/tm6000-video.c | 0
.../media/deprecated}/tm6000/tm6000.h | 0
.../media/deprecated/vpfe_capture/Kconfig | 58 +++++++++++++++++++
.../media/deprecated/vpfe_capture/Makefile | 4 ++
.../media/deprecated/vpfe_capture/TODO | 8 +++
.../deprecated/vpfe_capture}/ccdc_hw_device.h | 0
.../deprecated/vpfe_capture}/dm355_ccdc.c | 2 +-
.../deprecated/vpfe_capture}/dm355_ccdc.h | 0
.../vpfe_capture}/dm355_ccdc_regs.h | 0
.../deprecated/vpfe_capture}/dm644x_ccdc.c | 2 +-
.../deprecated/vpfe_capture}/dm644x_ccdc.h | 0
.../vpfe_capture}/dm644x_ccdc_regs.h | 0
.../media/deprecated/vpfe_capture}/isif.c | 2 +-
.../media/deprecated/vpfe_capture}/isif.h | 0
.../deprecated/vpfe_capture}/isif_regs.h | 0
.../deprecated/vpfe_capture}/vpfe_capture.c | 0
.../media/deprecated}/zr364xx/Kconfig | 7 ++-
.../media/deprecated}/zr364xx/Makefile | 0
drivers/staging/media/deprecated/zr364xx/TODO | 8 +++
.../media/deprecated}/zr364xx/zr364xx.c | 0
163 files changed, 264 insertions(+), 123 deletions(-)
delete mode 100644 drivers/staging/media/av7110/TODO
rename drivers/{media/usb => staging/media/deprecated}/cpia2/Kconfig (66%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/cpia2/TODO
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_core.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_registers.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_usb.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_v4l.c (100%)
create mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig
create mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile
create mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO
rename drivers/{media/platform/nxp => staging/media/deprecated/fsl-viu}/fsl-viu.c (100%)
rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%)
rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/meye/TODO
rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%)
rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%)
create mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig
create mode 100644 drivers/staging/media/deprecated/saa7146/Makefile
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Kconfig (82%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Makefile (78%)
create mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-bilingual-channel-select.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-channel-select.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-clear-buffer.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-continue.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fclose.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fopen.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fwrite.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-capabilities.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-status.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-pause.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-play.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-select-source.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-av-sync.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-bypass-mode.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-id.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mixer.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mute.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-streamtype.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-stop.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_data_types.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_function_calls.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.h (99%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ir.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_v4l.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/budget-patch.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-clear-buffer.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-command.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-continue.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fast-forward.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fclose.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fopen.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-freeze.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fwrite.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-capabilities.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-event.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-frame-count.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-pts.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-size.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-status.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-play.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-select-source.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-blank.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-display-format.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-format.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-streamtype.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-slowmotion.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stillpicture.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stop.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-try-command.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_function_calls.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_types.rst (100%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Kconfig (100%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Makefile (100%)
rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146.h (100%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_core.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_fops.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_hlp.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_i2c.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_vbi.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_video.c (99%)
rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146_vv.h (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Kconfig (67%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_gemini.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_orion.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/mxb.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Kconfig (83%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-av.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-ci.c (100%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-core.c (100%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.c (100%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.h (98%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/Kconfig (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/Makefile (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/TODO (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-sensor.c (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.c (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/Kconfig (84%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/tm6000/TODO
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-alsa.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-cards.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-core.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-dvb.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-i2c.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-input.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-regs.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-stds.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-usb-isoc.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-video.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000.h (100%)
create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig
create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile
create mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/ccdc_hw_device.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc.c (99%)
rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm355_ccdc.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc_regs.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc.c (99%)
rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm644x_ccdc.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc_regs.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif.c (99%)
rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/isif.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif_regs.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/vpfe_capture.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Kconfig (65%)
rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/zr364xx/TODO
rename drivers/{media/usb => staging/media/deprecated}/zr364xx/zr364xx.c (100%)
--
2.35.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/9] staging/media: add a STAGING_MEDIA_DEPRECATED option
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 2/9] cpia2: deprecate this driver Hans Verkuil
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Add a kernel config option to build deprecated media drivers
that are scheduled for removal. Move stkwebcam to the deprecated
directory to make it clear that this driver is deprecated.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/staging/media/Kconfig | 18 ++++++++++++++++--
drivers/staging/media/Makefile | 2 +-
.../media/{ => deprecated}/stkwebcam/Kconfig | 0
.../media/{ => deprecated}/stkwebcam/Makefile | 0
.../media/{ => deprecated}/stkwebcam/TODO | 0
.../{ => deprecated}/stkwebcam/stk-sensor.c | 0
.../{ => deprecated}/stkwebcam/stk-webcam.c | 0
.../{ => deprecated}/stkwebcam/stk-webcam.h | 0
8 files changed, 17 insertions(+), 3 deletions(-)
rename drivers/staging/media/{ => deprecated}/stkwebcam/Kconfig (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/Makefile (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/TODO (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-sensor.c (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.c (100%)
rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.h (100%)
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 421ce9dbf44c..3545ba722037 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -38,12 +38,26 @@ source "drivers/staging/media/omap4iss/Kconfig"
source "drivers/staging/media/rkvdec/Kconfig"
-source "drivers/staging/media/stkwebcam/Kconfig"
-
source "drivers/staging/media/sunxi/Kconfig"
source "drivers/staging/media/tegra-video/Kconfig"
source "drivers/staging/media/zoran/Kconfig"
+menuconfig STAGING_MEDIA_DEPRECATED
+ bool "Media staging drivers (DEPRECATED)"
+ default n
+ help
+ This option enables deprecated media drivers that are
+ scheduled for future removal from the kernel.
+
+ If you wish to work on these drivers to prevent their removal,
+ then contact the linux-media@vger.kernel.org mailing list.
+
+ If in doubt, say N here.
+
+if STAGING_MEDIA_DEPRECATED
+source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
+endif
+
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 950e96f10aad..c516764b5393 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_VIDEO_MAX96712) += max96712/
obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/
-obj-$(CONFIG_VIDEO_STKWEBCAM) += stkwebcam/
+obj-$(CONFIG_VIDEO_STKWEBCAM) += deprecated/stkwebcam/
obj-$(CONFIG_VIDEO_SUNXI) += sunxi/
obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
diff --git a/drivers/staging/media/stkwebcam/Kconfig b/drivers/staging/media/deprecated/stkwebcam/Kconfig
similarity index 100%
rename from drivers/staging/media/stkwebcam/Kconfig
rename to drivers/staging/media/deprecated/stkwebcam/Kconfig
diff --git a/drivers/staging/media/stkwebcam/Makefile b/drivers/staging/media/deprecated/stkwebcam/Makefile
similarity index 100%
rename from drivers/staging/media/stkwebcam/Makefile
rename to drivers/staging/media/deprecated/stkwebcam/Makefile
diff --git a/drivers/staging/media/stkwebcam/TODO b/drivers/staging/media/deprecated/stkwebcam/TODO
similarity index 100%
rename from drivers/staging/media/stkwebcam/TODO
rename to drivers/staging/media/deprecated/stkwebcam/TODO
diff --git a/drivers/staging/media/stkwebcam/stk-sensor.c b/drivers/staging/media/deprecated/stkwebcam/stk-sensor.c
similarity index 100%
rename from drivers/staging/media/stkwebcam/stk-sensor.c
rename to drivers/staging/media/deprecated/stkwebcam/stk-sensor.c
diff --git a/drivers/staging/media/stkwebcam/stk-webcam.c b/drivers/staging/media/deprecated/stkwebcam/stk-webcam.c
similarity index 100%
rename from drivers/staging/media/stkwebcam/stk-webcam.c
rename to drivers/staging/media/deprecated/stkwebcam/stk-webcam.c
diff --git a/drivers/staging/media/stkwebcam/stk-webcam.h b/drivers/staging/media/deprecated/stkwebcam/stk-webcam.h
similarity index 100%
rename from drivers/staging/media/stkwebcam/stk-webcam.h
rename to drivers/staging/media/deprecated/stkwebcam/stk-webcam.h
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/9] cpia2: deprecate this driver
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
2022-08-11 9:17 ` [PATCH 1/9] staging/media: add a STAGING_MEDIA_DEPRECATED option Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 3/9] meye: " Hans Verkuil
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the cpia2 driver. This driver does not use the vb2 framework
for video streaming, instead it implements its own version.
We want to get rid of these old drivers, so deprecated it for future
removal.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 1 -
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
.../{media/usb => staging/media/deprecated}/cpia2/Kconfig | 5 ++++-
.../{media/usb => staging/media/deprecated}/cpia2/Makefile | 0
drivers/staging/media/deprecated/cpia2/TODO | 6 ++++++
.../{media/usb => staging/media/deprecated}/cpia2/cpia2.h | 0
.../usb => staging/media/deprecated}/cpia2/cpia2_core.c | 0
.../media/deprecated}/cpia2/cpia2_registers.h | 0
.../usb => staging/media/deprecated}/cpia2/cpia2_usb.c | 0
.../usb => staging/media/deprecated}/cpia2/cpia2_v4l.c | 0
12 files changed, 12 insertions(+), 3 deletions(-)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/Kconfig (66%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/cpia2/TODO
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_core.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_registers.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_usb.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_v4l.c (100%)
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index af88e0766388..afbb8dd28b5b 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -13,7 +13,6 @@ if MEDIA_USB_SUPPORT
if MEDIA_CAMERA_SUPPORT
comment "Webcam devices"
-source "drivers/media/usb/cpia2/Kconfig"
source "drivers/media/usb/gspca/Kconfig"
source "drivers/media/usb/pwc/Kconfig"
source "drivers/media/usb/s2255/Kconfig"
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 25fa2015b179..fa8e16ff9b03 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_USB_MSI2500) += msi2500/
obj-$(CONFIG_USB_PWC) += pwc/
obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
obj-$(CONFIG_VIDEO_AU0828) += au0828/
-obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
obj-$(CONFIG_VIDEO_GO7007) += go7007/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 3545ba722037..360220ad9ffd 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -57,6 +57,7 @@ menuconfig STAGING_MEDIA_DEPRECATED
If in doubt, say N here.
if STAGING_MEDIA_DEPRECATED
+source "drivers/staging/media/deprecated/cpia2/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index c516764b5393..12e0cbbeaad1 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_INTEL_ATOMISP) += atomisp/
+obj-$(CONFIG_VIDEO_CPIA2) += deprecated/cpia2/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_VIDEO_MAX96712) += max96712/
obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/
diff --git a/drivers/media/usb/cpia2/Kconfig b/drivers/staging/media/deprecated/cpia2/Kconfig
similarity index 66%
rename from drivers/media/usb/cpia2/Kconfig
rename to drivers/staging/media/deprecated/cpia2/Kconfig
index da2c6862b4a2..ee3b25a759d4 100644
--- a/drivers/media/usb/cpia2/Kconfig
+++ b/drivers/staging/media/deprecated/cpia2/Kconfig
@@ -1,10 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CPIA2
- tristate "CPiA2 Video For Linux"
+ tristate "CPiA2 Video For Linux (DEPRECATED)"
depends on USB && VIDEO_DEV
help
This is the video4linux driver for cameras based on Vision's CPiA2
(Colour Processor Interface ASIC), such as the Digital Blue QX5
Microscope. If you have one of these cameras, say Y here
+ This driver is deprecated and is scheduled for removal by
+ the beginning of 2023. See the TODO file for more information.
+
This driver is also available as a module (cpia2).
diff --git a/drivers/media/usb/cpia2/Makefile b/drivers/staging/media/deprecated/cpia2/Makefile
similarity index 100%
rename from drivers/media/usb/cpia2/Makefile
rename to drivers/staging/media/deprecated/cpia2/Makefile
diff --git a/drivers/staging/media/deprecated/cpia2/TODO b/drivers/staging/media/deprecated/cpia2/TODO
new file mode 100644
index 000000000000..92ac8718d164
--- /dev/null
+++ b/drivers/staging/media/deprecated/cpia2/TODO
@@ -0,0 +1,6 @@
+The cpia2 driver does not use the vb2 framework for streaming
+video, instead it implements this in the driver.
+
+To prevent removal of this driver early 2023 it has to be
+converted to use vb2. Contact the linux-media@vger.kernel.org
+mailing list if you want to do this.
diff --git a/drivers/media/usb/cpia2/cpia2.h b/drivers/staging/media/deprecated/cpia2/cpia2.h
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2.h
rename to drivers/staging/media/deprecated/cpia2/cpia2.h
diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/staging/media/deprecated/cpia2/cpia2_core.c
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_core.c
rename to drivers/staging/media/deprecated/cpia2/cpia2_core.c
diff --git a/drivers/media/usb/cpia2/cpia2_registers.h b/drivers/staging/media/deprecated/cpia2/cpia2_registers.h
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_registers.h
rename to drivers/staging/media/deprecated/cpia2/cpia2_registers.h
diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/staging/media/deprecated/cpia2/cpia2_usb.c
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_usb.c
rename to drivers/staging/media/deprecated/cpia2/cpia2_usb.c
diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/staging/media/deprecated/cpia2/cpia2_v4l.c
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_v4l.c
rename to drivers/staging/media/deprecated/cpia2/cpia2_v4l.c
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/9] meye: deprecate this driver
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
2022-08-11 9:17 ` [PATCH 1/9] staging/media: add a STAGING_MEDIA_DEPRECATED option Hans Verkuil
2022-08-11 9:17 ` [PATCH 2/9] cpia2: deprecate this driver Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 4/9] zr364xx: " Hans Verkuil
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the meye driver. This driver does not use the vb2 framework
for video streaming, instead it implements its own version.
We want to get rid of these old drivers, so deprecated it for future
removal.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/pci/Kconfig | 1 -
drivers/media/pci/Makefile | 1 -
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
.../{media/pci => staging/media/deprecated}/meye/Kconfig | 5 ++++-
.../{media/pci => staging/media/deprecated}/meye/Makefile | 0
drivers/staging/media/deprecated/meye/TODO | 6 ++++++
drivers/{media/pci => staging/media/deprecated}/meye/meye.c | 0
drivers/{media/pci => staging/media/deprecated}/meye/meye.h | 0
9 files changed, 12 insertions(+), 3 deletions(-)
rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%)
rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/meye/TODO
rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%)
rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%)
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 1224d908713a..84c927516c11 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -13,7 +13,6 @@ if MEDIA_PCI_SUPPORT
if MEDIA_CAMERA_SUPPORT
comment "Media capture support"
-source "drivers/media/pci/meye/Kconfig"
source "drivers/media/pci/solo6x10/Kconfig"
source "drivers/media/pci/sta2x11/Kconfig"
source "drivers/media/pci/tw5864/Kconfig"
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index 551169a3e434..6ad7c4dff021 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821/
obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_DT3155) += dt3155/
obj-$(CONFIG_VIDEO_IVTV) += ivtv/
-obj-$(CONFIG_VIDEO_MEYE) += meye/
obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 360220ad9ffd..180f450f9e27 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -58,6 +58,7 @@ menuconfig STAGING_MEDIA_DEPRECATED
if STAGING_MEDIA_DEPRECATED
source "drivers/staging/media/deprecated/cpia2/Kconfig"
+source "drivers/staging/media/deprecated/meye/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 12e0cbbeaad1..f10f6613a443 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_VIDEO_CPIA2) += deprecated/cpia2/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_VIDEO_MAX96712) += max96712/
obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/
+obj-$(CONFIG_VIDEO_MEYE) += deprecated/meye/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/
obj-$(CONFIG_VIDEO_STKWEBCAM) += deprecated/stkwebcam/
diff --git a/drivers/media/pci/meye/Kconfig b/drivers/staging/media/deprecated/meye/Kconfig
similarity index 73%
rename from drivers/media/pci/meye/Kconfig
rename to drivers/staging/media/deprecated/meye/Kconfig
index 3e69b66f1a5b..f135f8568c85 100644
--- a/drivers/media/pci/meye/Kconfig
+++ b/drivers/staging/media/deprecated/meye/Kconfig
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_MEYE
- tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
+ tristate "Sony Vaio Picturebook Motion Eye Video For Linux (DEPRECATED)"
depends on PCI && VIDEO_DEV
depends on SONY_LAPTOP
depends on X86 || COMPILE_TEST
@@ -12,5 +12,8 @@ config VIDEO_MEYE
If you say Y or M here, you need to say Y or M to "Sony Laptop
Extras" in the misc device section.
+ 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 meye.
diff --git a/drivers/media/pci/meye/Makefile b/drivers/staging/media/deprecated/meye/Makefile
similarity index 100%
rename from drivers/media/pci/meye/Makefile
rename to drivers/staging/media/deprecated/meye/Makefile
diff --git a/drivers/staging/media/deprecated/meye/TODO b/drivers/staging/media/deprecated/meye/TODO
new file mode 100644
index 000000000000..6d1d1433d5a0
--- /dev/null
+++ b/drivers/staging/media/deprecated/meye/TODO
@@ -0,0 +1,6 @@
+The meye driver does not use the vb2 framework for streaming
+video, instead it implements this in the driver.
+
+To prevent removal of this driver early 2023 it has to be
+converted to use vb2. Contact the linux-media@vger.kernel.org
+mailing list if you want to do this.
diff --git a/drivers/media/pci/meye/meye.c b/drivers/staging/media/deprecated/meye/meye.c
similarity index 100%
rename from drivers/media/pci/meye/meye.c
rename to drivers/staging/media/deprecated/meye/meye.c
diff --git a/drivers/media/pci/meye/meye.h b/drivers/staging/media/deprecated/meye/meye.h
similarity index 100%
rename from drivers/media/pci/meye/meye.h
rename to drivers/staging/media/deprecated/meye/meye.h
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/9] zr364xx: deprecate this driver
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
` (2 preceding siblings ...)
2022-08-11 9:17 ` [PATCH 3/9] meye: " Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 5/9] tm6000: " Hans Verkuil
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the zr364xx driver. This driver does not use the vb2 framework
for video streaming, instead it uses the old videobuf framework.
We want to get rid of these old drivers, so deprecated it for future
removal.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 1 -
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
.../usb => staging/media/deprecated}/zr364xx/Kconfig | 7 +++++--
.../usb => staging/media/deprecated}/zr364xx/Makefile | 0
drivers/staging/media/deprecated/zr364xx/TODO | 8 ++++++++
.../usb => staging/media/deprecated}/zr364xx/zr364xx.c | 0
8 files changed, 15 insertions(+), 4 deletions(-)
rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Kconfig (65%)
rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/zr364xx/TODO
rename drivers/{media/usb => staging/media/deprecated}/zr364xx/zr364xx.c (100%)
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index afbb8dd28b5b..3d0138f8573c 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -18,7 +18,6 @@ source "drivers/media/usb/pwc/Kconfig"
source "drivers/media/usb/s2255/Kconfig"
source "drivers/media/usb/usbtv/Kconfig"
source "drivers/media/usb/uvc/Kconfig"
-source "drivers/media/usb/zr364xx/Kconfig"
endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index fa8e16ff9b03..7fccc6604b1f 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -12,7 +12,6 @@ obj-y += s2255/
obj-y += siano/
obj-y += ttusb-budget/
obj-y += ttusb-dec/
-obj-y += zr364xx/
# Please keep it alphabetically sorted by Kconfig name
# (e. g. LC_ALL=C sort Makefile)
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 180f450f9e27..4d134c68ca5c 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -60,6 +60,7 @@ if STAGING_MEDIA_DEPRECATED
source "drivers/staging/media/deprecated/cpia2/Kconfig"
source "drivers/staging/media/deprecated/meye/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
+source "drivers/staging/media/deprecated/zr364xx/Kconfig"
endif
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index f10f6613a443..27b6e6bf42ba 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -13,4 +13,5 @@ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
+obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
obj-$(CONFIG_DVB_AV7110) += av7110/
diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/staging/media/deprecated/zr364xx/Kconfig
similarity index 65%
rename from drivers/media/usb/zr364xx/Kconfig
rename to drivers/staging/media/deprecated/zr364xx/Kconfig
index a9fb02566c4b..ea29c9d8dca2 100644
--- a/drivers/media/usb/zr364xx/Kconfig
+++ b/drivers/staging/media/deprecated/zr364xx/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config USB_ZR364XX
- tristate "USB ZR364XX Camera support"
- depends on VIDEO_DEV
+ tristate "USB ZR364XX Camera support (DEPRECATED)"
+ depends on USB && VIDEO_DEV
select VIDEOBUF_GEN
select VIDEOBUF_VMALLOC
help
@@ -10,6 +10,9 @@ config USB_ZR364XX
See <file:Documentation/admin-guide/media/zr364xx.rst> for more info
and list of supported cameras.
+ 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 zr364xx.
diff --git a/drivers/media/usb/zr364xx/Makefile b/drivers/staging/media/deprecated/zr364xx/Makefile
similarity index 100%
rename from drivers/media/usb/zr364xx/Makefile
rename to drivers/staging/media/deprecated/zr364xx/Makefile
diff --git a/drivers/staging/media/deprecated/zr364xx/TODO b/drivers/staging/media/deprecated/zr364xx/TODO
new file mode 100644
index 000000000000..c9908c086f87
--- /dev/null
+++ b/drivers/staging/media/deprecated/zr364xx/TODO
@@ -0,0 +1,8 @@
+This is one of the few drivers still not using the vb2
+framework, so this driver is now deprecated with the intent of
+removing it altogether by the beginning of 2023.
+
+In order to keep this driver it has 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/media/usb/zr364xx/zr364xx.c b/drivers/staging/media/deprecated/zr364xx/zr364xx.c
similarity index 100%
rename from drivers/media/usb/zr364xx/zr364xx.c
rename to drivers/staging/media/deprecated/zr364xx/zr364xx.c
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/9] tm6000: deprecate this driver
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
` (3 preceding siblings ...)
2022-08-11 9:17 ` [PATCH 4/9] zr364xx: " Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 6/9] fsl-viu: " Hans Verkuil
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the tm6000 driver. This driver does not use the vb2 framework
for video streaming, instead it uses the old videobuf framework.
We want to get rid of these old drivers, so deprecated it for future
removal.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 1 -
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
.../usb => staging/media/deprecated}/tm6000/Kconfig | 5 ++++-
.../usb => staging/media/deprecated}/tm6000/Makefile | 0
drivers/staging/media/deprecated/tm6000/TODO | 8 ++++++++
.../usb => staging/media/deprecated}/tm6000/tm6000-alsa.c | 0
.../media/deprecated}/tm6000/tm6000-cards.c | 0
.../usb => staging/media/deprecated}/tm6000/tm6000-core.c | 0
.../usb => staging/media/deprecated}/tm6000/tm6000-dvb.c | 0
.../usb => staging/media/deprecated}/tm6000/tm6000-i2c.c | 0
.../media/deprecated}/tm6000/tm6000-input.c | 0
.../usb => staging/media/deprecated}/tm6000/tm6000-regs.h | 0
.../usb => staging/media/deprecated}/tm6000/tm6000-stds.c | 0
.../media/deprecated}/tm6000/tm6000-usb-isoc.h | 0
.../media/deprecated}/tm6000/tm6000-video.c | 0
.../usb => staging/media/deprecated}/tm6000/tm6000.h | 0
18 files changed, 14 insertions(+), 3 deletions(-)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/Kconfig (84%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/tm6000/TODO
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-alsa.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-cards.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-core.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-dvb.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-i2c.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-input.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-regs.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-stds.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-usb-isoc.h (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-video.c (100%)
rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000.h (100%)
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 3d0138f8573c..813171d25ac5 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -36,7 +36,6 @@ if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)
source "drivers/media/usb/au0828/Kconfig"
source "drivers/media/usb/cx231xx/Kconfig"
-source "drivers/media/usb/tm6000/Kconfig"
endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 7fccc6604b1f..6d171beea20d 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -29,5 +29,4 @@ obj-$(CONFIG_VIDEO_GO7007) += go7007/
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
obj-$(CONFIG_VIDEO_STK1160) += stk1160/
-obj-$(CONFIG_VIDEO_TM6000) += tm6000/
obj-$(CONFIG_VIDEO_USBTV) += usbtv/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 4d134c68ca5c..85a5275ec16d 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -60,6 +60,7 @@ if STAGING_MEDIA_DEPRECATED
source "drivers/staging/media/deprecated/cpia2/Kconfig"
source "drivers/staging/media/deprecated/meye/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
+source "drivers/staging/media/deprecated/tm6000/Kconfig"
source "drivers/staging/media/deprecated/zr364xx/Kconfig"
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 27b6e6bf42ba..073dbae14e89 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/
obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
+obj-$(CONFIG_VIDEO_TM6000) += deprecated/tm6000/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
obj-$(CONFIG_DVB_AV7110) += av7110/
diff --git a/drivers/media/usb/tm6000/Kconfig b/drivers/staging/media/deprecated/tm6000/Kconfig
similarity index 84%
rename from drivers/media/usb/tm6000/Kconfig
rename to drivers/staging/media/deprecated/tm6000/Kconfig
index 56e977deba81..73d72e49eb28 100644
--- a/drivers/media/usb/tm6000/Kconfig
+++ b/drivers/staging/media/deprecated/tm6000/Kconfig
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_TM6000
- tristate "TV Master TM5600/6000/6010 driver"
+ tristate "TV Master TM5600/6000/6010 driver (DEPRECATED)"
depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB
select VIDEO_TUNER
select MEDIA_TUNER_XC2028
@@ -13,6 +13,9 @@ config VIDEO_TM6000
only compressed MPEG data over the usb bus, so you need
an external software decoder to watch TV on your computer.
+ 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 device and want to use it.
config VIDEO_TM6000_ALSA
diff --git a/drivers/media/usb/tm6000/Makefile b/drivers/staging/media/deprecated/tm6000/Makefile
similarity index 100%
rename from drivers/media/usb/tm6000/Makefile
rename to drivers/staging/media/deprecated/tm6000/Makefile
diff --git a/drivers/staging/media/deprecated/tm6000/TODO b/drivers/staging/media/deprecated/tm6000/TODO
new file mode 100644
index 000000000000..c9908c086f87
--- /dev/null
+++ b/drivers/staging/media/deprecated/tm6000/TODO
@@ -0,0 +1,8 @@
+This is one of the few drivers still not using the vb2
+framework, so this driver is now deprecated with the intent of
+removing it altogether by the beginning of 2023.
+
+In order to keep this driver it has 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/media/usb/tm6000/tm6000-alsa.c b/drivers/staging/media/deprecated/tm6000/tm6000-alsa.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-alsa.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-alsa.c
diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/staging/media/deprecated/tm6000/tm6000-cards.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-cards.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-cards.c
diff --git a/drivers/media/usb/tm6000/tm6000-core.c b/drivers/staging/media/deprecated/tm6000/tm6000-core.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-core.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-core.c
diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/staging/media/deprecated/tm6000/tm6000-dvb.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-dvb.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-dvb.c
diff --git a/drivers/media/usb/tm6000/tm6000-i2c.c b/drivers/staging/media/deprecated/tm6000/tm6000-i2c.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-i2c.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-i2c.c
diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/staging/media/deprecated/tm6000/tm6000-input.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-input.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-input.c
diff --git a/drivers/media/usb/tm6000/tm6000-regs.h b/drivers/staging/media/deprecated/tm6000/tm6000-regs.h
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-regs.h
rename to drivers/staging/media/deprecated/tm6000/tm6000-regs.h
diff --git a/drivers/media/usb/tm6000/tm6000-stds.c b/drivers/staging/media/deprecated/tm6000/tm6000-stds.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-stds.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-stds.c
diff --git a/drivers/media/usb/tm6000/tm6000-usb-isoc.h b/drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-usb-isoc.h
rename to drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/staging/media/deprecated/tm6000/tm6000-video.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-video.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-video.c
diff --git a/drivers/media/usb/tm6000/tm6000.h b/drivers/staging/media/deprecated/tm6000/tm6000.h
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000.h
rename to drivers/staging/media/deprecated/tm6000/tm6000.h
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/9] fsl-viu: deprecate this driver
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
` (4 preceding siblings ...)
2022-08-11 9:17 ` [PATCH 5/9] tm6000: " Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 7/9] davinci: deprecate dm644x_ccdc, dm355_cddc and dm365_isif Hans Verkuil
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the fsl-viu driver. This driver does not use the vb2 framework
for video streaming, instead it uses the old videobuf framework.
We want to get rid of these old drivers, so deprecated it for future
removal.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/platform/nxp/Kconfig | 12 ------------
drivers/media/platform/nxp/Makefile | 1 -
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
.../staging/media/deprecated/fsl-viu/Kconfig | 17 +++++++++++++++++
.../staging/media/deprecated/fsl-viu/Makefile | 2 ++
drivers/staging/media/deprecated/fsl-viu/TODO | 8 ++++++++
.../media/deprecated/fsl-viu}/fsl-viu.c | 0
8 files changed, 29 insertions(+), 13 deletions(-)
create mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig
create mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile
create mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO
rename drivers/{media/platform/nxp => staging/media/deprecated/fsl-viu}/fsl-viu.c (100%)
diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
index 1ac0a6e91111..797fa2db3f41 100644
--- a/drivers/media/platform/nxp/Kconfig
+++ b/drivers/media/platform/nxp/Kconfig
@@ -15,18 +15,6 @@ config VIDEO_IMX_MIPI_CSIS
Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
-config VIDEO_VIU
- tristate "NXP VIU Video Driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && (PPC_MPC512x || COMPILE_TEST) && I2C
- select VIDEOBUF_DMA_CONTIG
- help
- Support for Freescale VIU video driver. This device captures
- video data, or overlays video on DIU frame buffer.
-
- Say Y here if you want to enable VIU device on MPC5121e Rev2+.
- In doubt, say N.
-
# mem2mem drivers
config VIDEO_IMX_PXP
diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile
index efc38c6578ce..dd3e54c1a0dd 100644
--- a/drivers/media/platform/nxp/Makefile
+++ b/drivers/media/platform/nxp/Makefile
@@ -5,4 +5,3 @@ obj-y += imx-jpeg/
obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
-obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 85a5275ec16d..7d5922a60dd5 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -58,6 +58,7 @@ menuconfig STAGING_MEDIA_DEPRECATED
if STAGING_MEDIA_DEPRECATED
source "drivers/staging/media/deprecated/cpia2/Kconfig"
+source "drivers/staging/media/deprecated/fsl-viu/Kconfig"
source "drivers/staging/media/deprecated/meye/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
source "drivers/staging/media/deprecated/tm6000/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 073dbae14e89..0bbfdc269630 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
obj-$(CONFIG_VIDEO_TM6000) += deprecated/tm6000/
+obj-$(CONFIG_VIDEO_VIU) += deprecated/fsl-viu/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
obj-$(CONFIG_DVB_AV7110) += av7110/
diff --git a/drivers/staging/media/deprecated/fsl-viu/Kconfig b/drivers/staging/media/deprecated/fsl-viu/Kconfig
new file mode 100644
index 000000000000..3617f7d8aa1c
--- /dev/null
+++ b/drivers/staging/media/deprecated/fsl-viu/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_VIU
+ tristate "NXP VIU Video Driver (DEPRECATED)"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_DEV && (PPC_MPC512x || COMPILE_TEST) && I2C
+ select VIDEOBUF_DMA_CONTIG
+ help
+ Support for Freescale VIU video driver. This device captures
+ video data, or overlays video on DIU frame buffer.
+
+ This driver is deprecated and is scheduled for removal by
+ the beginning of 2023. See the TODO file for more information.
+
+ Say Y here if you want to enable VIU device on MPC5121e Rev2+.
+ In doubt, say N.
+
+
diff --git a/drivers/staging/media/deprecated/fsl-viu/Makefile b/drivers/staging/media/deprecated/fsl-viu/Makefile
new file mode 100644
index 000000000000..931ec56ad08c
--- /dev/null
+++ b/drivers/staging/media/deprecated/fsl-viu/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
diff --git a/drivers/staging/media/deprecated/fsl-viu/TODO b/drivers/staging/media/deprecated/fsl-viu/TODO
new file mode 100644
index 000000000000..c9908c086f87
--- /dev/null
+++ b/drivers/staging/media/deprecated/fsl-viu/TODO
@@ -0,0 +1,8 @@
+This is one of the few drivers still not using the vb2
+framework, so this driver is now deprecated with the intent of
+removing it altogether by the beginning of 2023.
+
+In order to keep this driver it has 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/media/platform/nxp/fsl-viu.c b/drivers/staging/media/deprecated/fsl-viu/fsl-viu.c
similarity index 100%
rename from drivers/media/platform/nxp/fsl-viu.c
rename to drivers/staging/media/deprecated/fsl-viu/fsl-viu.c
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/9] davinci: deprecate dm644x_ccdc, dm355_cddc and dm365_isif
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
` (5 preceding siblings ...)
2022-08-11 9:17 ` [PATCH 6/9] fsl-viu: " Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 8/9] saa7146: deprecate hexium_gemini/orion, mxb and ttpci Hans Verkuil
2022-08-11 9:17 ` [PATCH 9/9] av7110: move to staging/media/deprecated/saa7146 Hans Verkuil
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the dm644x_ccdc, dm355_cddc and dm365_isif davinci drivers:
all three depend on the vpfe_capture driver, and that driver does not
use the vb2 framework for video streaming, instead it uses the old
videobuf framework.
We want to get rid of these old drivers, so deprecated these for future
removal.
Note that include/media/davinci/vpfe_capture.h can't be moved to staging
since it is used in arch/arm/mach-davinci/davinci.h.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/platform/ti/davinci/Kconfig | 49 ----------------
drivers/media/platform/ti/davinci/Makefile | 4 --
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
.../media/deprecated/vpfe_capture/Kconfig | 58 +++++++++++++++++++
.../media/deprecated/vpfe_capture/Makefile | 4 ++
.../media/deprecated/vpfe_capture/TODO | 8 +++
.../deprecated/vpfe_capture}/ccdc_hw_device.h | 0
.../deprecated/vpfe_capture}/dm355_ccdc.c | 2 +-
.../deprecated/vpfe_capture}/dm355_ccdc.h | 0
.../vpfe_capture}/dm355_ccdc_regs.h | 0
.../deprecated/vpfe_capture}/dm644x_ccdc.c | 2 +-
.../deprecated/vpfe_capture}/dm644x_ccdc.h | 0
.../vpfe_capture}/dm644x_ccdc_regs.h | 0
.../media/deprecated/vpfe_capture}/isif.c | 2 +-
.../media/deprecated/vpfe_capture}/isif.h | 0
.../deprecated/vpfe_capture}/isif_regs.h | 0
.../deprecated/vpfe_capture}/vpfe_capture.c | 0
18 files changed, 75 insertions(+), 56 deletions(-)
create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig
create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile
create mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/ccdc_hw_device.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc.c (99%)
rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm355_ccdc.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc_regs.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc.c (99%)
rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm644x_ccdc.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc_regs.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif.c (99%)
rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/isif.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif_regs.h (100%)
rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/vpfe_capture.c (100%)
diff --git a/drivers/media/platform/ti/davinci/Kconfig b/drivers/media/platform/ti/davinci/Kconfig
index c61e697aeb12..96d4bed7fe9e 100644
--- a/drivers/media/platform/ti/davinci/Kconfig
+++ b/drivers/media/platform/ti/davinci/Kconfig
@@ -32,55 +32,6 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
To compile this driver as a module, choose M here. There will
be two modules called vpif.ko and vpif_capture.ko
-config VIDEO_DM6446_CCDC
- tristate "TI DM6446 CCDC video capture driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV
- depends on ARCH_DAVINCI || COMPILE_TEST
- depends on I2C
- select VIDEOBUF_DMA_CONTIG
- help
- Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
- with decoder modules such as TVP5146 over BT656 or
- sensor module such as MT9T001 over a raw interface. This
- module configures the interface and CCDC/ISIF to do
- video frame capture from slave decoders.
-
- To compile this driver as a module, choose M here. There will
- be three modules called vpfe_capture.ko, vpss.ko and dm644x_ccdc.ko
-
-config VIDEO_DM355_CCDC
- tristate "TI DM355 CCDC video capture driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV
- depends on ARCH_DAVINCI || COMPILE_TEST
- depends on I2C
- select VIDEOBUF_DMA_CONTIG
- help
- Enables DM355 CCD hw module. DM355 CCDC hw interfaces
- with decoder modules such as TVP5146 over BT656 or
- sensor module such as MT9T001 over a raw interface. This
- module configures the interface and CCDC/ISIF to do
- video frame capture from a slave decoders
-
- To compile this driver as a module, choose M here. There will
- be three modules called vpfe_capture.ko, vpss.ko and dm355_ccdc.ko
-
-config VIDEO_DM365_ISIF
- tristate "TI DM365 ISIF video capture driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV
- depends on ARCH_DAVINCI || COMPILE_TEST
- depends on I2C
- select VIDEOBUF_DMA_CONTIG
- help
- Enables ISIF hw module. This is the hardware module for
- configuring ISIF in VPFE to capture Raw Bayer RGB data from
- a image sensor or YUV data from a YUV source.
-
- To compile this driver as a module, choose M here. There will
- be three modules called vpfe_capture.ko, vpss.ko and isif.ko
-
config VIDEO_DAVINCI_VPBE_DISPLAY
tristate "TI DaVinci VPBE V4L2-Display driver"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/ti/davinci/Makefile b/drivers/media/platform/ti/davinci/Makefile
index 05c45bf371aa..b20a91653162 100644
--- a/drivers/media/platform/ti/davinci/Makefile
+++ b/drivers/media/platform/ti/davinci/Makefile
@@ -8,9 +8,5 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o
#VPIF Capture driver
obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o
-# Capture: DM6446 and DM355
-obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o vpss.o dm644x_ccdc.o
-obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o vpss.o dm355_ccdc.o
-obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o vpss.o isif.o
obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o vpbe.o vpbe_osd.o \
vpbe_venc.o vpbe_display.o
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 7d5922a60dd5..d69b7e799471 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -62,6 +62,7 @@ source "drivers/staging/media/deprecated/fsl-viu/Kconfig"
source "drivers/staging/media/deprecated/meye/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
source "drivers/staging/media/deprecated/tm6000/Kconfig"
+source "drivers/staging/media/deprecated/vpfe_capture/Kconfig"
source "drivers/staging/media/deprecated/zr364xx/Kconfig"
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 0bbfdc269630..9ba5bd2ac621 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_VIDEO_VIU) += deprecated/fsl-viu/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
obj-$(CONFIG_DVB_AV7110) += av7110/
+obj-y += deprecated/vpfe_capture/
diff --git a/drivers/staging/media/deprecated/vpfe_capture/Kconfig b/drivers/staging/media/deprecated/vpfe_capture/Kconfig
new file mode 100644
index 000000000000..10250e7e566b
--- /dev/null
+++ b/drivers/staging/media/deprecated/vpfe_capture/Kconfig
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_DM6446_CCDC
+ tristate "TI DM6446 CCDC video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_DEV
+ depends on ARCH_DAVINCI || COMPILE_TEST
+ depends on I2C
+ select VIDEOBUF_DMA_CONTIG
+ help
+ Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
+ with decoder modules such as TVP5146 over BT656 or
+ sensor module such as MT9T001 over a raw interface. This
+ module configures the interface and CCDC/ISIF to do
+ video frame capture from slave decoders.
+
+ 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. There will
+ be two modules called vpfe_capture.ko and dm644x_ccdc.ko
+
+config VIDEO_DM355_CCDC
+ tristate "TI DM355 CCDC video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_DEV
+ depends on ARCH_DAVINCI || COMPILE_TEST
+ depends on I2C
+ select VIDEOBUF_DMA_CONTIG
+ help
+ Enables DM355 CCD hw module. DM355 CCDC hw interfaces
+ with decoder modules such as TVP5146 over BT656 or
+ sensor module such as MT9T001 over a raw interface. This
+ module configures the interface and CCDC/ISIF to do
+ video frame capture from a slave decoders
+
+ 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. There will
+ be two modules called vpfe_capture.ko and dm355_ccdc.ko
+
+config VIDEO_DM365_ISIF
+ tristate "TI DM365 ISIF video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_DEV
+ depends on ARCH_DAVINCI || COMPILE_TEST
+ depends on I2C
+ select VIDEOBUF_DMA_CONTIG
+ help
+ Enables ISIF hw module. This is the hardware module for
+ configuring ISIF in VPFE to capture Raw Bayer RGB data from
+ a image sensor or YUV data from a YUV source.
+
+ 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. There will
+ be two modules called vpfe_capture.ko and isif.ko
diff --git a/drivers/staging/media/deprecated/vpfe_capture/Makefile b/drivers/staging/media/deprecated/vpfe_capture/Makefile
new file mode 100644
index 000000000000..609e8dc09ce7
--- /dev/null
+++ b/drivers/staging/media/deprecated/vpfe_capture/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o dm644x_ccdc.o
+obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o dm355_ccdc.o
+obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o isif.o
diff --git a/drivers/staging/media/deprecated/vpfe_capture/TODO b/drivers/staging/media/deprecated/vpfe_capture/TODO
new file mode 100644
index 000000000000..68a6c3f3957d
--- /dev/null
+++ b/drivers/staging/media/deprecated/vpfe_capture/TODO
@@ -0,0 +1,8 @@
+These 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/media/platform/ti/davinci/ccdc_hw_device.h b/drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h
similarity index 100%
rename from drivers/media/platform/ti/davinci/ccdc_hw_device.h
rename to drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h
diff --git a/drivers/media/platform/ti/davinci/dm355_ccdc.c b/drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c
similarity index 99%
rename from drivers/media/platform/ti/davinci/dm355_ccdc.c
rename to drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c
index 8fe55d1b972c..da8db53e9498 100644
--- a/drivers/media/platform/ti/davinci/dm355_ccdc.c
+++ b/drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c
@@ -22,7 +22,7 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <media/davinci/dm355_ccdc.h>
+#include "dm355_ccdc.h"
#include <media/davinci/vpss.h>
#include "dm355_ccdc_regs.h"
diff --git a/include/media/davinci/dm355_ccdc.h b/drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h
similarity index 100%
rename from include/media/davinci/dm355_ccdc.h
rename to drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h
diff --git a/drivers/media/platform/ti/davinci/dm355_ccdc_regs.h b/drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h
similarity index 100%
rename from drivers/media/platform/ti/davinci/dm355_ccdc_regs.h
rename to drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h
diff --git a/drivers/media/platform/ti/davinci/dm644x_ccdc.c b/drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c
similarity index 99%
rename from drivers/media/platform/ti/davinci/dm644x_ccdc.c
rename to drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c
index e4073e99914c..4a93e5ad6415 100644
--- a/drivers/media/platform/ti/davinci/dm644x_ccdc.c
+++ b/drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c
@@ -24,7 +24,7 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <media/davinci/dm644x_ccdc.h>
+#include "dm644x_ccdc.h"
#include <media/davinci/vpss.h>
#include "dm644x_ccdc_regs.h"
diff --git a/include/media/davinci/dm644x_ccdc.h b/drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h
similarity index 100%
rename from include/media/davinci/dm644x_ccdc.h
rename to drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h
diff --git a/drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h b/drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h
similarity index 100%
rename from drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h
rename to drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h
diff --git a/drivers/media/platform/ti/davinci/isif.c b/drivers/staging/media/deprecated/vpfe_capture/isif.c
similarity index 99%
rename from drivers/media/platform/ti/davinci/isif.c
rename to drivers/staging/media/deprecated/vpfe_capture/isif.c
index 69e862de014f..4059891c2824 100644
--- a/drivers/media/platform/ti/davinci/isif.c
+++ b/drivers/staging/media/deprecated/vpfe_capture/isif.c
@@ -22,7 +22,7 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <media/davinci/isif.h>
+#include "isif.h"
#include <media/davinci/vpss.h>
#include "isif_regs.h"
diff --git a/include/media/davinci/isif.h b/drivers/staging/media/deprecated/vpfe_capture/isif.h
similarity index 100%
rename from include/media/davinci/isif.h
rename to drivers/staging/media/deprecated/vpfe_capture/isif.h
diff --git a/drivers/media/platform/ti/davinci/isif_regs.h b/drivers/staging/media/deprecated/vpfe_capture/isif_regs.h
similarity index 100%
rename from drivers/media/platform/ti/davinci/isif_regs.h
rename to drivers/staging/media/deprecated/vpfe_capture/isif_regs.h
diff --git a/drivers/media/platform/ti/davinci/vpfe_capture.c b/drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c
similarity index 100%
rename from drivers/media/platform/ti/davinci/vpfe_capture.c
rename to drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 8/9] saa7146: deprecate hexium_gemini/orion, mxb and ttpci
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
` (6 preceding siblings ...)
2022-08-11 9:17 ` [PATCH 7/9] davinci: deprecate dm644x_ccdc, dm355_cddc and dm365_isif Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
2022-08-11 9:17 ` [PATCH 9/9] av7110: move to staging/media/deprecated/saa7146 Hans Verkuil
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
Deprecate the hexium_gemini, hexium_orion, mxb and ttpci saa7146-based
drivers: these drivers do not use the vb2 framework for video streaming,
instead it uses the old videobuf framework.
We want to get rid of these old drivers, so deprecated these for future
removal.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/common/Kconfig | 1 -
drivers/media/common/Makefile | 2 +-
drivers/media/pci/Kconfig | 2 --
drivers/media/pci/Makefile | 4 +---
drivers/staging/media/Kconfig | 1 +
drivers/staging/media/Makefile | 1 +
drivers/staging/media/av7110/Makefile | 3 ++-
drivers/staging/media/av7110/av7110.h | 2 +-
.../staging/media/deprecated/saa7146/Kconfig | 4 ++++
.../staging/media/deprecated/saa7146/Makefile | 2 ++
.../media/deprecated/saa7146/common}/Kconfig | 0
.../media/deprecated/saa7146/common}/Makefile | 0
.../media/deprecated/saa7146/common}/saa7146.h | 0
.../deprecated/saa7146/common}/saa7146_core.c | 2 +-
.../deprecated/saa7146/common}/saa7146_fops.c | 2 +-
.../deprecated/saa7146/common}/saa7146_hlp.c | 2 +-
.../deprecated/saa7146/common}/saa7146_i2c.c | 2 +-
.../deprecated/saa7146/common}/saa7146_vbi.c | 2 +-
.../deprecated/saa7146/common}/saa7146_video.c | 2 +-
.../deprecated/saa7146/common}/saa7146_vv.h | 2 +-
.../media/deprecated/saa7146}/saa7146/Kconfig | 15 ++++++++++++---
.../media/deprecated/saa7146}/saa7146/Makefile | 0
.../media/deprecated/saa7146/saa7146/TODO | 7 +++++++
.../deprecated/saa7146}/saa7146/hexium_gemini.c | 2 +-
.../deprecated/saa7146}/saa7146/hexium_orion.c | 2 +-
.../media/deprecated/saa7146}/saa7146/mxb.c | 2 +-
.../media/deprecated/saa7146}/ttpci/Kconfig | 17 +++++++++++++----
.../media/deprecated/saa7146}/ttpci/Makefile | 0
.../staging/media/deprecated/saa7146/ttpci/TODO | 7 +++++++
.../media/deprecated/saa7146}/ttpci/budget-av.c | 2 +-
.../media/deprecated/saa7146}/ttpci/budget-ci.c | 0
.../deprecated/saa7146}/ttpci/budget-core.c | 0
.../media/deprecated/saa7146}/ttpci/budget.c | 0
.../media/deprecated/saa7146}/ttpci/budget.h | 2 +-
34 files changed, 64 insertions(+), 28 deletions(-)
create mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig
create mode 100644 drivers/staging/media/deprecated/saa7146/Makefile
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Kconfig (100%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Makefile (100%)
rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146.h (100%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_core.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_fops.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_hlp.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_i2c.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_vbi.c (99%)
rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_video.c (99%)
rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146_vv.h (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Kconfig (67%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_gemini.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_orion.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/mxb.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Kconfig (83%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-av.c (99%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-ci.c (100%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-core.c (100%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.c (100%)
rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.h (98%)
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index a2ae71270054..852b7d92fbdd 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -22,7 +22,6 @@ 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"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index ad0b1e95fb12..d78a0df15478 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
+obj-y += b2c2/ siano/ v4l2-tpg/ videobuf2/
# Please keep it alphabetically sorted by Kconfig name
# (e. g. LC_ALL=C sort Makefile)
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 84c927516c11..8529b56b8f33 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -26,7 +26,6 @@ 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,7 +56,6 @@ 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
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index 6ad7c4dff021..e19c8d4ed7f3 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -5,8 +5,7 @@
# Please keep it alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
-obj-y += ttpci/ \
- b2c2/ \
+obj-y += b2c2/ \
pluto2/ \
dm1105/ \
pt1/ \
@@ -14,7 +13,6 @@ obj-y += ttpci/ \
mantis/ \
ngene/ \
ddbridge/ \
- saa7146/ \
smipcie/ \
netup_unidvb/ \
intel/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index d69b7e799471..7fb9fc2fa923 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -60,6 +60,7 @@ if STAGING_MEDIA_DEPRECATED
source "drivers/staging/media/deprecated/cpia2/Kconfig"
source "drivers/staging/media/deprecated/fsl-viu/Kconfig"
source "drivers/staging/media/deprecated/meye/Kconfig"
+source "drivers/staging/media/deprecated/saa7146/Kconfig"
source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
source "drivers/staging/media/deprecated/tm6000/Kconfig"
source "drivers/staging/media/deprecated/vpfe_capture/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 9ba5bd2ac621..399b3c48d4d2 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_VIDEO_ZORAN) += zoran/
obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
obj-$(CONFIG_DVB_AV7110) += av7110/
obj-y += deprecated/vpfe_capture/
+obj-y += deprecated/saa7146/
diff --git a/drivers/staging/media/av7110/Makefile b/drivers/staging/media/av7110/Makefile
index 307b267598ea..c04cd0a59109 100644
--- a/drivers/staging/media/av7110/Makefile
+++ b/drivers/staging/media/av7110/Makefile
@@ -18,5 +18,6 @@ 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
diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h
index 809d938ae166..9fde69b38f1c 100644
--- a/drivers/staging/media/av7110/av7110.h
+++ b/drivers/staging/media/av7110/av7110.h
@@ -33,7 +33,7 @@
#include "stv0297.h"
#include "l64781.h"
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
#define ANALOG_TUNER_VES1820 1
diff --git a/drivers/staging/media/deprecated/saa7146/Kconfig b/drivers/staging/media/deprecated/saa7146/Kconfig
new file mode 100644
index 000000000000..d0cb52164ff8
--- /dev/null
+++ b/drivers/staging/media/deprecated/saa7146/Kconfig
@@ -0,0 +1,4 @@
+# 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
new file mode 100644
index 000000000000..9d99fdedf813
--- /dev/null
+++ b/drivers/staging/media/deprecated/saa7146/Makefile
@@ -0,0 +1,2 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+obj-y += common/ saa7146/ ttpci/
diff --git a/drivers/media/common/saa7146/Kconfig b/drivers/staging/media/deprecated/saa7146/common/Kconfig
similarity index 100%
rename from drivers/media/common/saa7146/Kconfig
rename to drivers/staging/media/deprecated/saa7146/common/Kconfig
diff --git a/drivers/media/common/saa7146/Makefile b/drivers/staging/media/deprecated/saa7146/common/Makefile
similarity index 100%
rename from drivers/media/common/saa7146/Makefile
rename to drivers/staging/media/deprecated/saa7146/common/Makefile
diff --git a/include/media/drv-intf/saa7146.h b/drivers/staging/media/deprecated/saa7146/common/saa7146.h
similarity index 100%
rename from include/media/drv-intf/saa7146.h
rename to drivers/staging/media/deprecated/saa7146/common/saa7146.h
diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/staging/media/deprecated/saa7146/common/saa7146_core.c
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_core.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_core.c
index e50fa0ff7c5d..da21d346b870 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_core.c
@@ -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;
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/staging/media/deprecated/saa7146/common/saa7146_fops.c
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_fops.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_fops.c
index e9a15de6126e..aa14698a9c54 100644
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_fops.c
@@ -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 */
diff --git a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/staging/media/deprecated/saa7146/common/saa7146_hlp.c
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_hlp.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_hlp.c
index 6c9946a402ee..b1222a4cfa4a 100644
--- a/drivers/media/common/saa7146/saa7146_hlp.c
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_hlp.c
@@ -3,7 +3,7 @@
#include <linux/kernel.h>
#include <linux/export.h>
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
{
diff --git a/drivers/media/common/saa7146/saa7146_i2c.c b/drivers/staging/media/deprecated/saa7146/common/saa7146_i2c.c
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_i2c.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_i2c.c
index df9ebe2a168c..7a33fe51775a 100644
--- a/drivers/media/common/saa7146/saa7146_i2c.c
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_i2c.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
{
diff --git a/drivers/media/common/saa7146/saa7146_vbi.c b/drivers/staging/media/deprecated/saa7146/common/saa7146_vbi.c
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_vbi.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_vbi.c
index bd442b984423..2d4a05d7bc5b 100644
--- a/drivers/media/common/saa7146/saa7146_vbi.c
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_vbi.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
static int vbi_pixel_to_capture = 720 * 2;
diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/staging/media/deprecated/saa7146/common/saa7146_video.c
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_video.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_video.c
index 2296765079a4..4598a44231fa 100644
--- a/drivers/media/common/saa7146/saa7146_video.c
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_video.c
@@ -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;
diff --git a/include/media/drv-intf/saa7146_vv.h b/drivers/staging/media/deprecated/saa7146/common/saa7146_vv.h
similarity index 99%
rename from include/media/drv-intf/saa7146_vv.h
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_vv.h
index 635805fb35e8..d7bd916fe3ad 100644
--- a/include/media/drv-intf/saa7146_vv.h
+++ b/drivers/staging/media/deprecated/saa7146/common/saa7146_vv.h
@@ -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 */
diff --git a/drivers/media/pci/saa7146/Kconfig b/drivers/staging/media/deprecated/saa7146/saa7146/Kconfig
similarity index 67%
rename from drivers/media/pci/saa7146/Kconfig
rename to drivers/staging/media/deprecated/saa7146/saa7146/Kconfig
index 3bbb68a0ed7b..228e8d3f8d2b 100644
--- a/drivers/media/pci/saa7146/Kconfig
+++ b/drivers/staging/media/deprecated/saa7146/saa7146/Kconfig
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_HEXIUM_GEMINI
- tristate "Hexium Gemini frame grabber"
+ tristate "Hexium Gemini frame grabber (DEPRECATED)"
depends on PCI && VIDEO_DEV && I2C
select VIDEO_SAA7146_VV
help
@@ -8,22 +8,28 @@ 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"
+ tristate "Hexium HV-PCI6 and Orion frame grabber (DEPRECATED)"
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'"
+ tristate "Siemens-Nixdorf 'Multimedia eXtension Board' (DEPRECATED)"
depends on PCI && VIDEO_DEV && I2C
select VIDEO_SAA7146_VV
select VIDEO_TUNER
@@ -35,5 +41,8 @@ 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.
diff --git a/drivers/media/pci/saa7146/Makefile b/drivers/staging/media/deprecated/saa7146/saa7146/Makefile
similarity index 100%
rename from drivers/media/pci/saa7146/Makefile
rename to drivers/staging/media/deprecated/saa7146/saa7146/Makefile
diff --git a/drivers/staging/media/deprecated/saa7146/saa7146/TODO b/drivers/staging/media/deprecated/saa7146/saa7146/TODO
new file mode 100644
index 000000000000..c9ae2ec79cea
--- /dev/null
+++ b/drivers/staging/media/deprecated/saa7146/saa7146/TODO
@@ -0,0 +1,7 @@
+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/media/pci/saa7146/hexium_gemini.c b/drivers/staging/media/deprecated/saa7146/saa7146/hexium_gemini.c
similarity index 99%
rename from drivers/media/pci/saa7146/hexium_gemini.c
rename to drivers/staging/media/deprecated/saa7146/saa7146/hexium_gemini.c
index 3947701cd6c7..124e82bd4507 100644
--- a/drivers/media/pci/saa7146/hexium_gemini.c
+++ b/drivers/staging/media/deprecated/saa7146/saa7146/hexium_gemini.c
@@ -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);
diff --git a/drivers/media/pci/saa7146/hexium_orion.c b/drivers/staging/media/deprecated/saa7146/saa7146/hexium_orion.c
similarity index 99%
rename from drivers/media/pci/saa7146/hexium_orion.c
rename to drivers/staging/media/deprecated/saa7146/saa7146/hexium_orion.c
index 2eb4bee16b71..ebd63998ac79 100644
--- a/drivers/media/pci/saa7146/hexium_orion.c
+++ b/drivers/staging/media/deprecated/saa7146/saa7146/hexium_orion.c
@@ -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);
diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/staging/media/deprecated/saa7146/saa7146/mxb.c
similarity index 99%
rename from drivers/media/pci/saa7146/mxb.c
rename to drivers/staging/media/deprecated/saa7146/saa7146/mxb.c
index 7ded8f5b05cb..3e568f952dae 100644
--- a/drivers/media/pci/saa7146/mxb.c
+++ b/drivers/staging/media/deprecated/saa7146/saa7146/mxb.c
@@ -13,13 +13,13 @@
#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"
diff --git a/drivers/media/pci/ttpci/Kconfig b/drivers/staging/media/deprecated/saa7146/ttpci/Kconfig
similarity index 83%
rename from drivers/media/pci/ttpci/Kconfig
rename to drivers/staging/media/deprecated/saa7146/ttpci/Kconfig
index 65a6832a6b96..8c85ed58e938 100644
--- a/drivers/media/pci/ttpci/Kconfig
+++ b/drivers/staging/media/deprecated/saa7146/ttpci/Kconfig
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
config DVB_BUDGET_CORE
- tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
+ tristate "SAA7146 DVB cards (aka Budget, Nova-PCI) (DEPRECATED)"
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"
+ tristate "Budget cards (DEPRECATED)"
depends on DVB_BUDGET_CORE && I2C
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT
@@ -30,13 +30,16 @@ 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"
+ tristate "Budget cards with onboard CI connector (DEPRECATED)"
depends on DVB_BUDGET_CORE && I2C
select DVB_STV0297 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@@ -57,13 +60,16 @@ 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"
+ tristate "Budget cards with analog video inputs (DEPRECATED)"
depends on DVB_BUDGET_CORE && I2C
select VIDEO_SAA7146_VV
depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV
@@ -80,6 +86,9 @@ 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
diff --git a/drivers/media/pci/ttpci/Makefile b/drivers/staging/media/deprecated/saa7146/ttpci/Makefile
similarity index 100%
rename from drivers/media/pci/ttpci/Makefile
rename to drivers/staging/media/deprecated/saa7146/ttpci/Makefile
diff --git a/drivers/staging/media/deprecated/saa7146/ttpci/TODO b/drivers/staging/media/deprecated/saa7146/ttpci/TODO
new file mode 100644
index 000000000000..c9ae2ec79cea
--- /dev/null
+++ b/drivers/staging/media/deprecated/saa7146/ttpci/TODO
@@ -0,0 +1,7 @@
+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/media/pci/ttpci/budget-av.c b/drivers/staging/media/deprecated/saa7146/ttpci/budget-av.c
similarity index 99%
rename from drivers/media/pci/ttpci/budget-av.c
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget-av.c
index 3cb83005cf09..0c61a2dec221 100644
--- a/drivers/media/pci/ttpci/budget-av.c
+++ b/drivers/staging/media/deprecated/saa7146/ttpci/budget-av.c
@@ -29,7 +29,7 @@
#include "tda1004x.h"
#include "tua6100.h"
#include "dvb-pll.h"
-#include <media/drv-intf/saa7146_vv.h>
+#include "../common/saa7146_vv.h"
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/slab.h>
diff --git a/drivers/media/pci/ttpci/budget-ci.c b/drivers/staging/media/deprecated/saa7146/ttpci/budget-ci.c
similarity index 100%
rename from drivers/media/pci/ttpci/budget-ci.c
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget-ci.c
diff --git a/drivers/media/pci/ttpci/budget-core.c b/drivers/staging/media/deprecated/saa7146/ttpci/budget-core.c
similarity index 100%
rename from drivers/media/pci/ttpci/budget-core.c
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget-core.c
diff --git a/drivers/media/pci/ttpci/budget.c b/drivers/staging/media/deprecated/saa7146/ttpci/budget.c
similarity index 100%
rename from drivers/media/pci/ttpci/budget.c
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget.c
diff --git a/drivers/media/pci/ttpci/budget.h b/drivers/staging/media/deprecated/saa7146/ttpci/budget.h
similarity index 98%
rename from drivers/media/pci/ttpci/budget.h
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget.h
index bd87432e6cde..82cc0df492b3 100644
--- a/drivers/media/pci/ttpci/budget.h
+++ b/drivers/staging/media/deprecated/saa7146/ttpci/budget.h
@@ -13,7 +13,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
-#include <media/drv-intf/saa7146.h>
+#include "../common/saa7146.h"
extern int budget_debug;
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 9/9] av7110: move to staging/media/deprecated/saa7146
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
` (7 preceding siblings ...)
2022-08-11 9:17 ` [PATCH 8/9] saa7146: deprecate hexium_gemini/orion, mxb and ttpci Hans Verkuil
@ 2022-08-11 9:17 ` Hans Verkuil
8 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2022-08-11 9:17 UTC (permalink / raw
To: linux-media; +Cc: Lad Prabhakar, Hans Verkuil
The av7110 driver depends on saa7146, so move it there.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/staging/media/Kconfig | 2 --
drivers/staging/media/Makefile | 1 -
drivers/staging/media/av7110/TODO | 3 ---
.../staging/media/deprecated/saa7146/Kconfig | 1 +
.../staging/media/deprecated/saa7146/Makefile | 2 +-
.../{ => deprecated/saa7146}/av7110/Kconfig | 20 +++++++++++++++----
.../{ => deprecated/saa7146}/av7110/Makefile | 0
.../media/deprecated/saa7146/av7110/TODO | 9 +++++++++
.../av7110/audio-bilingual-channel-select.rst | 0
.../saa7146}/av7110/audio-channel-select.rst | 0
.../saa7146}/av7110/audio-clear-buffer.rst | 0
.../saa7146}/av7110/audio-continue.rst | 0
.../saa7146}/av7110/audio-fclose.rst | 0
.../saa7146}/av7110/audio-fopen.rst | 0
.../saa7146}/av7110/audio-fwrite.rst | 0
.../av7110/audio-get-capabilities.rst | 0
.../saa7146}/av7110/audio-get-status.rst | 0
.../saa7146}/av7110/audio-pause.rst | 0
.../saa7146}/av7110/audio-play.rst | 0
.../saa7146}/av7110/audio-select-source.rst | 0
.../saa7146}/av7110/audio-set-av-sync.rst | 0
.../saa7146}/av7110/audio-set-bypass-mode.rst | 0
.../saa7146}/av7110/audio-set-id.rst | 0
.../saa7146}/av7110/audio-set-mixer.rst | 0
.../saa7146}/av7110/audio-set-mute.rst | 0
.../saa7146}/av7110/audio-set-streamtype.rst | 0
.../saa7146}/av7110/audio-stop.rst | 0
.../{ => deprecated/saa7146}/av7110/audio.rst | 0
.../saa7146}/av7110/audio_data_types.rst | 0
.../saa7146}/av7110/audio_function_calls.rst | 0
.../{ => deprecated/saa7146}/av7110/av7110.c | 0
.../{ => deprecated/saa7146}/av7110/av7110.h | 0
.../saa7146}/av7110/av7110_av.c | 0
.../saa7146}/av7110/av7110_av.h | 0
.../saa7146}/av7110/av7110_ca.c | 0
.../saa7146}/av7110/av7110_ca.h | 0
.../saa7146}/av7110/av7110_hw.c | 0
.../saa7146}/av7110/av7110_hw.h | 0
.../saa7146}/av7110/av7110_ipack.c | 0
.../saa7146}/av7110/av7110_ipack.h | 0
.../saa7146}/av7110/av7110_ir.c | 0
.../saa7146}/av7110/av7110_v4l.c | 0
.../saa7146}/av7110/budget-patch.c | 0
.../saa7146}/av7110/dvb_filter.c | 0
.../saa7146}/av7110/dvb_filter.h | 0
.../{ => deprecated/saa7146}/av7110/sp8870.c | 0
.../{ => deprecated/saa7146}/av7110/sp8870.h | 0
.../saa7146}/av7110/video-clear-buffer.rst | 0
.../saa7146}/av7110/video-command.rst | 0
.../saa7146}/av7110/video-continue.rst | 0
.../saa7146}/av7110/video-fast-forward.rst | 0
.../saa7146}/av7110/video-fclose.rst | 0
.../saa7146}/av7110/video-fopen.rst | 0
.../saa7146}/av7110/video-freeze.rst | 0
.../saa7146}/av7110/video-fwrite.rst | 0
.../av7110/video-get-capabilities.rst | 0
.../saa7146}/av7110/video-get-event.rst | 0
.../saa7146}/av7110/video-get-frame-count.rst | 0
.../saa7146}/av7110/video-get-pts.rst | 0
.../saa7146}/av7110/video-get-size.rst | 0
.../saa7146}/av7110/video-get-status.rst | 0
.../saa7146}/av7110/video-play.rst | 0
.../saa7146}/av7110/video-select-source.rst | 0
.../saa7146}/av7110/video-set-blank.rst | 0
.../av7110/video-set-display-format.rst | 0
.../saa7146}/av7110/video-set-format.rst | 0
.../saa7146}/av7110/video-set-streamtype.rst | 0
.../saa7146}/av7110/video-slowmotion.rst | 0
.../saa7146}/av7110/video-stillpicture.rst | 0
.../saa7146}/av7110/video-stop.rst | 0
.../saa7146}/av7110/video-try-command.rst | 0
.../{ => deprecated/saa7146}/av7110/video.rst | 0
.../saa7146}/av7110/video_function_calls.rst | 0
.../saa7146}/av7110/video_types.rst | 0
74 files changed, 27 insertions(+), 11 deletions(-)
delete mode 100644 drivers/staging/media/av7110/TODO
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Kconfig (82%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Makefile (100%)
create mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-bilingual-channel-select.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-channel-select.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-clear-buffer.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-continue.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fclose.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fopen.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fwrite.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-capabilities.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-status.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-pause.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-play.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-select-source.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-av-sync.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-bypass-mode.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-id.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mixer.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mute.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-streamtype.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-stop.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_data_types.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_function_calls.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ir.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_v4l.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/budget-patch.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.c (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.h (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-clear-buffer.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-command.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-continue.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fast-forward.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fclose.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fopen.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-freeze.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fwrite.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-capabilities.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-event.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-frame-count.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-pts.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-size.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-status.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-play.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-select-source.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-blank.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-display-format.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-format.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-streamtype.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-slowmotion.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stillpicture.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stop.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-try-command.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_function_calls.rst (100%)
rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_types.rst (100%)
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 7fb9fc2fa923..9886f77b6927 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -22,8 +22,6 @@ if STAGING_MEDIA && MEDIA_SUPPORT
# Please keep them in alphabetic order
source "drivers/staging/media/atomisp/Kconfig"
-source "drivers/staging/media/av7110/Kconfig"
-
source "drivers/staging/media/hantro/Kconfig"
source "drivers/staging/media/imx/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 399b3c48d4d2..b2646db2a0ce 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -16,6 +16,5 @@ obj-$(CONFIG_VIDEO_TM6000) += deprecated/tm6000/
obj-$(CONFIG_VIDEO_VIU) += deprecated/fsl-viu/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
-obj-$(CONFIG_DVB_AV7110) += av7110/
obj-y += deprecated/vpfe_capture/
obj-y += deprecated/saa7146/
diff --git a/drivers/staging/media/av7110/TODO b/drivers/staging/media/av7110/TODO
deleted file mode 100644
index 60062d8441b3..000000000000
--- a/drivers/staging/media/av7110/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- This driver is too old and relies on a different API.
- Drop it from Kernel on a couple of versions.
-- Cleanup patches for the drivers here won't be accepted.
diff --git a/drivers/staging/media/deprecated/saa7146/Kconfig b/drivers/staging/media/deprecated/saa7146/Kconfig
index d0cb52164ff8..54154da79f59 100644
--- a/drivers/staging/media/deprecated/saa7146/Kconfig
+++ b/drivers/staging/media/deprecated/saa7146/Kconfig
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
source "drivers/staging/media/deprecated/saa7146/common/Kconfig"
+source "drivers/staging/media/deprecated/saa7146/av7110/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
index 9d99fdedf813..68e7aa10c639 100644
--- a/drivers/staging/media/deprecated/saa7146/Makefile
+++ b/drivers/staging/media/deprecated/saa7146/Makefile
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-y += common/ saa7146/ ttpci/
+obj-y += common/ av7110/ saa7146/ ttpci/
diff --git a/drivers/staging/media/av7110/Kconfig b/drivers/staging/media/deprecated/saa7146/av7110/Kconfig
similarity index 82%
rename from drivers/staging/media/av7110/Kconfig
rename to drivers/staging/media/deprecated/saa7146/av7110/Kconfig
index 9faf9d2d4001..1571eab31926 100644
--- a/drivers/staging/media/av7110/Kconfig
+++ b/drivers/staging/media/deprecated/saa7146/av7110/Kconfig
@@ -5,7 +5,7 @@ config DVB_AV7110_IR
default DVB_AV7110
config DVB_AV7110
- tristate "AV7110 cards"
+ tristate "AV7110 cards (DEPRECATED)"
depends on DVB_CORE && PCI && I2C
select TTPCI_EEPROM
select VIDEO_SAA7146_VV
@@ -35,10 +35,13 @@ config DVB_AV7110
kernel image by adding the filename to the EXTRA_FIRMWARE
configuration option string.
+ 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.
config DVB_AV7110_OSD
- bool "AV7110 OSD support"
+ bool "AV7110 OSD support (DEPRECATED)"
depends on DVB_AV7110
default y if DVB_AV7110=y || DVB_AV7110=m
help
@@ -49,10 +52,13 @@ config DVB_AV7110_OSD
Anyway, some popular DVB software like VDR uses this OSD to render
its menus, so say Y if you want to use this software.
+ This driver is deprecated and is scheduled for removal by
+ the beginning of 2023. See the TODO file for more information.
+
All other people say N.
config DVB_BUDGET_PATCH
- tristate "AV7110 cards with Budget Patch"
+ tristate "AV7110 cards with Budget Patch (DEPRECATED)"
depends on DVB_BUDGET_CORE && I2C
depends on DVB_AV7110
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@@ -68,6 +74,9 @@ config DVB_BUDGET_PATCH
standard AV7110 driver prior to loading this
driver.
+ 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
@@ -80,7 +89,7 @@ if DVB_AV7110
# it if we drop support for AV7110, as no other driver will use it.
config DVB_SP8870
- tristate "Spase sp8870 based"
+ tristate "Spase sp8870 based (DEPRECATED)"
depends on DVB_CORE && I2C
default m if !MEDIA_SUBDRV_AUTOSELECT
help
@@ -91,4 +100,7 @@ config DVB_SP8870
download/extract it, and then copy it to /usr/lib/hotplug/firmware
or /lib/firmware (depending on configuration of firmware hotplug).
+ This driver is deprecated and is scheduled for removal by
+ the beginning of 2023. See the TODO file for more information.
+
endif
diff --git a/drivers/staging/media/av7110/Makefile b/drivers/staging/media/deprecated/saa7146/av7110/Makefile
similarity index 100%
rename from drivers/staging/media/av7110/Makefile
rename to drivers/staging/media/deprecated/saa7146/av7110/Makefile
diff --git a/drivers/staging/media/deprecated/saa7146/av7110/TODO b/drivers/staging/media/deprecated/saa7146/av7110/TODO
new file mode 100644
index 000000000000..38817e04bb67
--- /dev/null
+++ b/drivers/staging/media/deprecated/saa7146/av7110/TODO
@@ -0,0 +1,9 @@
+- This driver is too old and relies on a different API.
+ Drop it from Kernel on a couple of versions.
+- Cleanup patches for the drivers here won't be accepted.
+
+These drivers are now deprecated with the intent of
+removing them altogether by the beginning of 2023.
+
+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/av7110/audio-bilingual-channel-select.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-bilingual-channel-select.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-bilingual-channel-select.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-bilingual-channel-select.rst
diff --git a/drivers/staging/media/av7110/audio-channel-select.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-channel-select.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-channel-select.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-channel-select.rst
diff --git a/drivers/staging/media/av7110/audio-clear-buffer.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-clear-buffer.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-clear-buffer.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-clear-buffer.rst
diff --git a/drivers/staging/media/av7110/audio-continue.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-continue.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-continue.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-continue.rst
diff --git a/drivers/staging/media/av7110/audio-fclose.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-fclose.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-fclose.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-fclose.rst
diff --git a/drivers/staging/media/av7110/audio-fopen.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-fopen.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-fopen.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-fopen.rst
diff --git a/drivers/staging/media/av7110/audio-fwrite.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-fwrite.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-fwrite.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-fwrite.rst
diff --git a/drivers/staging/media/av7110/audio-get-capabilities.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-get-capabilities.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-get-capabilities.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-get-capabilities.rst
diff --git a/drivers/staging/media/av7110/audio-get-status.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-get-status.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-get-status.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-get-status.rst
diff --git a/drivers/staging/media/av7110/audio-pause.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-pause.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-pause.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-pause.rst
diff --git a/drivers/staging/media/av7110/audio-play.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-play.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-play.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-play.rst
diff --git a/drivers/staging/media/av7110/audio-select-source.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-select-source.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-select-source.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-select-source.rst
diff --git a/drivers/staging/media/av7110/audio-set-av-sync.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-set-av-sync.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-set-av-sync.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-set-av-sync.rst
diff --git a/drivers/staging/media/av7110/audio-set-bypass-mode.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-set-bypass-mode.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-set-bypass-mode.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-set-bypass-mode.rst
diff --git a/drivers/staging/media/av7110/audio-set-id.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-set-id.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-set-id.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-set-id.rst
diff --git a/drivers/staging/media/av7110/audio-set-mixer.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-set-mixer.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-set-mixer.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-set-mixer.rst
diff --git a/drivers/staging/media/av7110/audio-set-mute.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-set-mute.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-set-mute.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-set-mute.rst
diff --git a/drivers/staging/media/av7110/audio-set-streamtype.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-set-streamtype.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-set-streamtype.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-set-streamtype.rst
diff --git a/drivers/staging/media/av7110/audio-stop.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio-stop.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio-stop.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio-stop.rst
diff --git a/drivers/staging/media/av7110/audio.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio.rst
diff --git a/drivers/staging/media/av7110/audio_data_types.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio_data_types.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio_data_types.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio_data_types.rst
diff --git a/drivers/staging/media/av7110/audio_function_calls.rst b/drivers/staging/media/deprecated/saa7146/av7110/audio_function_calls.rst
similarity index 100%
rename from drivers/staging/media/av7110/audio_function_calls.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/audio_function_calls.rst
diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110.c
diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/deprecated/saa7146/av7110/av7110.h
similarity index 100%
rename from drivers/staging/media/av7110/av7110.h
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110.h
diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110_av.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110_av.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_av.c
diff --git a/drivers/staging/media/av7110/av7110_av.h b/drivers/staging/media/deprecated/saa7146/av7110/av7110_av.h
similarity index 100%
rename from drivers/staging/media/av7110/av7110_av.h
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_av.h
diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110_ca.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110_ca.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_ca.c
diff --git a/drivers/staging/media/av7110/av7110_ca.h b/drivers/staging/media/deprecated/saa7146/av7110/av7110_ca.h
similarity index 100%
rename from drivers/staging/media/av7110/av7110_ca.h
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_ca.h
diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110_hw.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110_hw.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_hw.c
diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/deprecated/saa7146/av7110/av7110_hw.h
similarity index 100%
rename from drivers/staging/media/av7110/av7110_hw.h
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_hw.h
diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110_ipack.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110_ipack.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_ipack.c
diff --git a/drivers/staging/media/av7110/av7110_ipack.h b/drivers/staging/media/deprecated/saa7146/av7110/av7110_ipack.h
similarity index 100%
rename from drivers/staging/media/av7110/av7110_ipack.h
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_ipack.h
diff --git a/drivers/staging/media/av7110/av7110_ir.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110_ir.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110_ir.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_ir.c
diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/deprecated/saa7146/av7110/av7110_v4l.c
similarity index 100%
rename from drivers/staging/media/av7110/av7110_v4l.c
rename to drivers/staging/media/deprecated/saa7146/av7110/av7110_v4l.c
diff --git a/drivers/staging/media/av7110/budget-patch.c b/drivers/staging/media/deprecated/saa7146/av7110/budget-patch.c
similarity index 100%
rename from drivers/staging/media/av7110/budget-patch.c
rename to drivers/staging/media/deprecated/saa7146/av7110/budget-patch.c
diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/deprecated/saa7146/av7110/dvb_filter.c
similarity index 100%
rename from drivers/staging/media/av7110/dvb_filter.c
rename to drivers/staging/media/deprecated/saa7146/av7110/dvb_filter.c
diff --git a/drivers/staging/media/av7110/dvb_filter.h b/drivers/staging/media/deprecated/saa7146/av7110/dvb_filter.h
similarity index 100%
rename from drivers/staging/media/av7110/dvb_filter.h
rename to drivers/staging/media/deprecated/saa7146/av7110/dvb_filter.h
diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/deprecated/saa7146/av7110/sp8870.c
similarity index 100%
rename from drivers/staging/media/av7110/sp8870.c
rename to drivers/staging/media/deprecated/saa7146/av7110/sp8870.c
diff --git a/drivers/staging/media/av7110/sp8870.h b/drivers/staging/media/deprecated/saa7146/av7110/sp8870.h
similarity index 100%
rename from drivers/staging/media/av7110/sp8870.h
rename to drivers/staging/media/deprecated/saa7146/av7110/sp8870.h
diff --git a/drivers/staging/media/av7110/video-clear-buffer.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-clear-buffer.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-clear-buffer.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-clear-buffer.rst
diff --git a/drivers/staging/media/av7110/video-command.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-command.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-command.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-command.rst
diff --git a/drivers/staging/media/av7110/video-continue.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-continue.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-continue.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-continue.rst
diff --git a/drivers/staging/media/av7110/video-fast-forward.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-fast-forward.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-fast-forward.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-fast-forward.rst
diff --git a/drivers/staging/media/av7110/video-fclose.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-fclose.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-fclose.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-fclose.rst
diff --git a/drivers/staging/media/av7110/video-fopen.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-fopen.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-fopen.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-fopen.rst
diff --git a/drivers/staging/media/av7110/video-freeze.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-freeze.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-freeze.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-freeze.rst
diff --git a/drivers/staging/media/av7110/video-fwrite.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-fwrite.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-fwrite.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-fwrite.rst
diff --git a/drivers/staging/media/av7110/video-get-capabilities.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-get-capabilities.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-get-capabilities.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-get-capabilities.rst
diff --git a/drivers/staging/media/av7110/video-get-event.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-get-event.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-get-event.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-get-event.rst
diff --git a/drivers/staging/media/av7110/video-get-frame-count.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-get-frame-count.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-get-frame-count.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-get-frame-count.rst
diff --git a/drivers/staging/media/av7110/video-get-pts.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-get-pts.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-get-pts.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-get-pts.rst
diff --git a/drivers/staging/media/av7110/video-get-size.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-get-size.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-get-size.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-get-size.rst
diff --git a/drivers/staging/media/av7110/video-get-status.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-get-status.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-get-status.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-get-status.rst
diff --git a/drivers/staging/media/av7110/video-play.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-play.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-play.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-play.rst
diff --git a/drivers/staging/media/av7110/video-select-source.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-select-source.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-select-source.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-select-source.rst
diff --git a/drivers/staging/media/av7110/video-set-blank.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-set-blank.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-set-blank.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-set-blank.rst
diff --git a/drivers/staging/media/av7110/video-set-display-format.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-set-display-format.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-set-display-format.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-set-display-format.rst
diff --git a/drivers/staging/media/av7110/video-set-format.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-set-format.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-set-format.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-set-format.rst
diff --git a/drivers/staging/media/av7110/video-set-streamtype.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-set-streamtype.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-set-streamtype.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-set-streamtype.rst
diff --git a/drivers/staging/media/av7110/video-slowmotion.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-slowmotion.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-slowmotion.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-slowmotion.rst
diff --git a/drivers/staging/media/av7110/video-stillpicture.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-stillpicture.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-stillpicture.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-stillpicture.rst
diff --git a/drivers/staging/media/av7110/video-stop.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-stop.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-stop.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-stop.rst
diff --git a/drivers/staging/media/av7110/video-try-command.rst b/drivers/staging/media/deprecated/saa7146/av7110/video-try-command.rst
similarity index 100%
rename from drivers/staging/media/av7110/video-try-command.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video-try-command.rst
diff --git a/drivers/staging/media/av7110/video.rst b/drivers/staging/media/deprecated/saa7146/av7110/video.rst
similarity index 100%
rename from drivers/staging/media/av7110/video.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video.rst
diff --git a/drivers/staging/media/av7110/video_function_calls.rst b/drivers/staging/media/deprecated/saa7146/av7110/video_function_calls.rst
similarity index 100%
rename from drivers/staging/media/av7110/video_function_calls.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video_function_calls.rst
diff --git a/drivers/staging/media/av7110/video_types.rst b/drivers/staging/media/deprecated/saa7146/av7110/video_types.rst
similarity index 100%
rename from drivers/staging/media/av7110/video_types.rst
rename to drivers/staging/media/deprecated/saa7146/av7110/video_types.rst
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-08-11 9:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-11 9:17 [PATCH 0/9] Deprecate old non-vb2 drivers Hans Verkuil
2022-08-11 9:17 ` [PATCH 1/9] staging/media: add a STAGING_MEDIA_DEPRECATED option Hans Verkuil
2022-08-11 9:17 ` [PATCH 2/9] cpia2: deprecate this driver Hans Verkuil
2022-08-11 9:17 ` [PATCH 3/9] meye: " Hans Verkuil
2022-08-11 9:17 ` [PATCH 4/9] zr364xx: " Hans Verkuil
2022-08-11 9:17 ` [PATCH 5/9] tm6000: " Hans Verkuil
2022-08-11 9:17 ` [PATCH 6/9] fsl-viu: " Hans Verkuil
2022-08-11 9:17 ` [PATCH 7/9] davinci: deprecate dm644x_ccdc, dm355_cddc and dm365_isif Hans Verkuil
2022-08-11 9:17 ` [PATCH 8/9] saa7146: deprecate hexium_gemini/orion, mxb and ttpci Hans Verkuil
2022-08-11 9:17 ` [PATCH 9/9] av7110: move to staging/media/deprecated/saa7146 Hans Verkuil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.