The Tegra Video Input drivers are mature and developed enough to be moved from staging into the media subsystem. No other changes are introduced.
Signed-off-by: Svyatoslav Ryhel <[email protected]> --- drivers/media/platform/nvidia/Kconfig | 2 ++ drivers/media/platform/nvidia/Makefile | 1 + .../media => media/platform/nvidia}/tegra-video/Kconfig | 0 .../media => media/platform/nvidia}/tegra-video/Makefile | 0 .../{staging/media => media/platform/nvidia}/tegra-video/TODO | 0 .../{staging/media => media/platform/nvidia}/tegra-video/csi.c | 0 .../{staging/media => media/platform/nvidia}/tegra-video/csi.h | 0 .../media => media/platform/nvidia}/tegra-video/tegra20.c | 0 .../media => media/platform/nvidia}/tegra-video/tegra210.c | 0 .../{staging/media => media/platform/nvidia}/tegra-video/vi.c | 0 .../{staging/media => media/platform/nvidia}/tegra-video/vi.h | 0 .../media => media/platform/nvidia}/tegra-video/video.c | 0 .../media => media/platform/nvidia}/tegra-video/video.h | 0 .../{staging/media => media/platform/nvidia}/tegra-video/vip.c | 0 .../{staging/media => media/platform/nvidia}/tegra-video/vip.h | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - 17 files changed, 3 insertions(+), 3 deletions(-) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/Kconfig (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/Makefile (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/TODO (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/csi.c (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/csi.h (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/tegra20.c (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/tegra210.c (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/vi.c (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/vi.h (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/video.c (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/video.h (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/vip.c (100%) rename drivers/{staging/media => media/platform/nvidia}/tegra-video/vip.h (100%) diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig index b211b46877f63..53f34308f5aff 100644 --- a/drivers/media/platform/nvidia/Kconfig +++ b/drivers/media/platform/nvidia/Kconfig @@ -3,3 +3,5 @@ comment "NVidia media platform drivers" source "drivers/media/platform/nvidia/tegra-vde/Kconfig" + +source "drivers/media/platform/nvidia/tegra-video/Kconfig" diff --git a/drivers/media/platform/nvidia/Makefile b/drivers/media/platform/nvidia/Makefile index 428415ff83de1..97a94b60fee93 100644 --- a/drivers/media/platform/nvidia/Makefile +++ b/drivers/media/platform/nvidia/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += tegra-vde/ +obj-y += tegra-video/ diff --git a/drivers/staging/media/tegra-video/Kconfig b/drivers/media/platform/nvidia/tegra-video/Kconfig similarity index 100% rename from drivers/staging/media/tegra-video/Kconfig rename to drivers/media/platform/nvidia/tegra-video/Kconfig diff --git a/drivers/staging/media/tegra-video/Makefile b/drivers/media/platform/nvidia/tegra-video/Makefile similarity index 100% rename from drivers/staging/media/tegra-video/Makefile rename to drivers/media/platform/nvidia/tegra-video/Makefile diff --git a/drivers/staging/media/tegra-video/TODO b/drivers/media/platform/nvidia/tegra-video/TODO similarity index 100% rename from drivers/staging/media/tegra-video/TODO rename to drivers/media/platform/nvidia/tegra-video/TODO diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/media/platform/nvidia/tegra-video/csi.c similarity index 100% rename from drivers/staging/media/tegra-video/csi.c rename to drivers/media/platform/nvidia/tegra-video/csi.c diff --git a/drivers/staging/media/tegra-video/csi.h b/drivers/media/platform/nvidia/tegra-video/csi.h similarity index 100% rename from drivers/staging/media/tegra-video/csi.h rename to drivers/media/platform/nvidia/tegra-video/csi.h diff --git a/drivers/staging/media/tegra-video/tegra20.c b/drivers/media/platform/nvidia/tegra-video/tegra20.c similarity index 100% rename from drivers/staging/media/tegra-video/tegra20.c rename to drivers/media/platform/nvidia/tegra-video/tegra20.c diff --git a/drivers/staging/media/tegra-video/tegra210.c b/drivers/media/platform/nvidia/tegra-video/tegra210.c similarity index 100% rename from drivers/staging/media/tegra-video/tegra210.c rename to drivers/media/platform/nvidia/tegra-video/tegra210.c diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/media/platform/nvidia/tegra-video/vi.c similarity index 100% rename from drivers/staging/media/tegra-video/vi.c rename to drivers/media/platform/nvidia/tegra-video/vi.c diff --git a/drivers/staging/media/tegra-video/vi.h b/drivers/media/platform/nvidia/tegra-video/vi.h similarity index 100% rename from drivers/staging/media/tegra-video/vi.h rename to drivers/media/platform/nvidia/tegra-video/vi.h diff --git a/drivers/staging/media/tegra-video/video.c b/drivers/media/platform/nvidia/tegra-video/video.c similarity index 100% rename from drivers/staging/media/tegra-video/video.c rename to drivers/media/platform/nvidia/tegra-video/video.c diff --git a/drivers/staging/media/tegra-video/video.h b/drivers/media/platform/nvidia/tegra-video/video.h similarity index 100% rename from drivers/staging/media/tegra-video/video.h rename to drivers/media/platform/nvidia/tegra-video/video.h diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/media/platform/nvidia/tegra-video/vip.c similarity index 100% rename from drivers/staging/media/tegra-video/vip.c rename to drivers/media/platform/nvidia/tegra-video/vip.c diff --git a/drivers/staging/media/tegra-video/vip.h b/drivers/media/platform/nvidia/tegra-video/vip.h similarity index 100% rename from drivers/staging/media/tegra-video/vip.h rename to drivers/media/platform/nvidia/tegra-video/vip.h diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 644aefdb9d41e..8a5f6dcc49adf 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -34,8 +34,6 @@ source "drivers/staging/media/meson/vdec/Kconfig" source "drivers/staging/media/sunxi/Kconfig" -source "drivers/staging/media/tegra-video/Kconfig" - menuconfig STAGING_MEDIA_DEPRECATED bool "Media staging drivers (DEPRECATED)" default n diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 584720e91327c..b8d874766371e 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -3,7 +3,6 @@ obj-$(CONFIG_INTEL_ATOMISP) += atomisp/ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/ -obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/ obj-$(CONFIG_VIDEO_INTEL_IPU7) += ipu7/ obj-$(CONFIG_DVB_AV7110) += av7110/ -- 2.53.0
