| Message ID | 20190725073023.2573613-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: staging: davinci: remove vpfe driver | expand |
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 534d85d6c5e3..b1bfc51131de 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -24,8 +24,6 @@ source "drivers/staging/media/allegro-dvt/Kconfig" source "drivers/staging/media/bcm2048/Kconfig" -source "drivers/staging/media/davinci_vpfe/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 c486298194da..b93c5819549f 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -2,7 +2,6 @@ obj-$(CONFIG_VIDEO_ALLEGRO_DVT) += allegro-dvt/ obj-$(CONFIG_I2C_BCM2048) += bcm2048/ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ -obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/ diff --git a/drivers/staging/media/davinci_vpfe/Kconfig b/drivers/staging/media/davinci_vpfe/Kconfig deleted file mode 100644 index 94bf6746c03f..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/Makefile b/drivers/staging/media/davinci_vpfe/Makefile deleted file mode 100644 index 0ae8c5014f74..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/TODO b/drivers/staging/media/davinci_vpfe/TODO deleted file mode 100644 index cc8bd9306f2a..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt b/drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt deleted file mode 100644 index a1e91778aa9b..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h b/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h deleted file mode 100644 index 8d772029c91d..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c deleted file mode 100644 index 52397ad0e3e2..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.h b/drivers/staging/media/davinci_vpfe/dm365_ipipe.h deleted file mode 100644 index 866ae12aeb07..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c deleted file mode 100644 index 110473c30577..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h deleted file mode 100644 index 16b6a14b7058..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c b/drivers/staging/media/davinci_vpfe/dm365_ipipeif.c deleted file mode 100644 index 51d4cd1bdb97..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h b/drivers/staging/media/davinci_vpfe/dm365_ipipeif.h deleted file mode 100644 index 4d126fc871f3..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h b/drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h deleted file mode 100644 index 046dbdec67d8..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif.c b/drivers/staging/media/davinci_vpfe/dm365_isif.c deleted file mode 100644 index 05a997f7aa5d..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif.h b/drivers/staging/media/davinci_vpfe/dm365_isif.h deleted file mode 100644 index 0e1fe472fb2b..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif_regs.h b/drivers/staging/media/davinci_vpfe/dm365_isif_regs.h deleted file mode 100644 index 6695680817b9..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c b/drivers/staging/media/davinci_vpfe/dm365_resizer.c deleted file mode 100644 index 7adf1fae43f6..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.h b/drivers/staging/media/davinci_vpfe/dm365_resizer.h deleted file mode 100644 index 5e31de96b2c9..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/vpfe.h b/drivers/staging/media/davinci_vpfe/vpfe.h deleted file mode 100644 index 1f8e011fc162..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c deleted file mode 100644 index 9dc28ffe38d5..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h deleted file mode 100644 index fe4a421b5dba..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c deleted file mode 100644 index ab6bc452d9f6..000000000000 diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.h b/drivers/staging/media/davinci_vpfe/vpfe_video.h deleted file mode 100644 index 5d01c4883ab4..000000000000
The davinci_vpfe driver was merged into staging back in 2012 by Manjunath Hadli from TI, with a long TODO list. For all I can tell, since then it has only seen fixes for compile-time issues and global cleanups, but nobody has actually worked on the items on the TODO list. To make things worse, the driver in its current form is incompatible with the platform code in arch/arm/mach-davinci, i.e. the driver expects to get its platform_data passed to the device as a 'struct vpfe_config', but uses a differnet definition for that structure compared to what the platform uses. Finally, there is another driver for the same device in drivers/media/platform/davinci/vpfe_capture.c. From all I can tell, the staging version was originally a copy of a more featureful driver in TI's downstream kernels. However, that kernel no longer supports dm365 after linux-2.6.37, and the mainline version moved in a different direction. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- resending once more with 'git format-patch -D' to get below the size limit for linux-media drivers/staging/media/Kconfig | 2 - drivers/staging/media/Makefile | 1 - drivers/staging/media/davinci_vpfe/Kconfig | 13 - drivers/staging/media/davinci_vpfe/Makefile | 11 - drivers/staging/media/davinci_vpfe/TODO | 38 - .../media/davinci_vpfe/davinci-vpfe-mc.txt | 154 -- .../media/davinci_vpfe/davinci_vpfe_user.h | 1287 ---------- .../staging/media/davinci_vpfe/dm365_ipipe.c | 1852 --------------- .../staging/media/davinci_vpfe/dm365_ipipe.h | 174 -- .../media/davinci_vpfe/dm365_ipipe_hw.c | 1038 -------- .../media/davinci_vpfe/dm365_ipipe_hw.h | 556 ----- .../media/davinci_vpfe/dm365_ipipeif.c | 1070 --------- .../media/davinci_vpfe/dm365_ipipeif.h | 228 -- .../media/davinci_vpfe/dm365_ipipeif_user.h | 90 - .../staging/media/davinci_vpfe/dm365_isif.c | 2097 ----------------- .../staging/media/davinci_vpfe/dm365_isif.h | 200 -- .../media/davinci_vpfe/dm365_isif_regs.h | 291 --- .../media/davinci_vpfe/dm365_resizer.c | 1995 ---------------- .../media/davinci_vpfe/dm365_resizer.h | 241 -- drivers/staging/media/davinci_vpfe/vpfe.h | 83 - .../media/davinci_vpfe/vpfe_mc_capture.c | 716 ------ .../media/davinci_vpfe/vpfe_mc_capture.h | 90 - .../staging/media/davinci_vpfe/vpfe_video.c | 1646 ------------- .../staging/media/davinci_vpfe/vpfe_video.h | 150 -- 24 files changed, 14023 deletions(-) delete mode 100644 drivers/staging/media/davinci_vpfe/Kconfig delete mode 100644 drivers/staging/media/davinci_vpfe/Makefile delete mode 100644 drivers/staging/media/davinci_vpfe/TODO delete mode 100644 drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt delete mode 100644 drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif_regs.h delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.c delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.h delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe.h delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.c delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.h