diff options
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | drivers/media/platform/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/platform/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/Makefile | 3 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/Kconfig (renamed from drivers/media/platform/tegra/vde/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/Makefile (renamed from drivers/media/platform/tegra/vde/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c (renamed from drivers/media/platform/tegra/vde/dmabuf-cache.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/h264.c (renamed from drivers/media/platform/tegra/vde/h264.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/iommu.c (renamed from drivers/media/platform/tegra/vde/iommu.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/trace.h (renamed from drivers/media/platform/tegra/vde/trace.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/v4l2.c (renamed from drivers/media/platform/tegra/vde/v4l2.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/vde.c (renamed from drivers/media/platform/tegra/vde/vde.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/nvidia/tegra-vde/vde.h (renamed from drivers/media/platform/tegra/vde/vde.h) | 0 |
13 files changed, 7 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 58e0d42b1278..5077b8e2d0c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11964,7 +11964,7 @@ L: linux-tegra@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt -F: drivers/media/platform/tegra/vde/ +F: drivers/media/platform/nvidia/tegra-vde/ MEDIA DRIVERS FOR RENESAS - CEU M: Jacopo Mondi <jacopo@jmondi.org> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a9ad0c3bd0cc..0cf0c9f31542 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -82,6 +82,7 @@ source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" @@ -95,7 +96,6 @@ source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/Kconfig" -source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 954ad8f2cde1..599f4f5ec4f7 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -22,6 +22,7 @@ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ obj-y += mediatek/mtk-vcodec/ obj-y += mediatek/mtk-vpu/ +obj-y += nvidia/tegra-vde/ obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ @@ -40,7 +41,6 @@ obj-y += sti/delta/ obj-y += sti/hva/ obj-y += stm32/ obj-y += sunxi/ -obj-y += tegra/vde/ obj-y += ti-vpe/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/nvidia/Makefile b/drivers/media/platform/nvidia/Makefile new file mode 100644 index 000000000000..428415ff83de --- /dev/null +++ b/drivers/media/platform/nvidia/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y += tegra-vde/ diff --git a/drivers/media/platform/tegra/vde/Kconfig b/drivers/media/platform/nvidia/tegra-vde/Kconfig index 584b78d8d66c..584b78d8d66c 100644 --- a/drivers/media/platform/tegra/vde/Kconfig +++ b/drivers/media/platform/nvidia/tegra-vde/Kconfig diff --git a/drivers/media/platform/tegra/vde/Makefile b/drivers/media/platform/nvidia/tegra-vde/Makefile index 4e96f3305567..4e96f3305567 100644 --- a/drivers/media/platform/tegra/vde/Makefile +++ b/drivers/media/platform/nvidia/tegra-vde/Makefile diff --git a/drivers/media/platform/tegra/vde/dmabuf-cache.c b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c index 69c346148070..69c346148070 100644 --- a/drivers/media/platform/tegra/vde/dmabuf-cache.c +++ b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c diff --git a/drivers/media/platform/tegra/vde/h264.c b/drivers/media/platform/nvidia/tegra-vde/h264.c index d8e5534e80c8..d8e5534e80c8 100644 --- a/drivers/media/platform/tegra/vde/h264.c +++ b/drivers/media/platform/nvidia/tegra-vde/h264.c diff --git a/drivers/media/platform/tegra/vde/iommu.c b/drivers/media/platform/nvidia/tegra-vde/iommu.c index 5521ed3e465f..5521ed3e465f 100644 --- a/drivers/media/platform/tegra/vde/iommu.c +++ b/drivers/media/platform/nvidia/tegra-vde/iommu.c diff --git a/drivers/media/platform/tegra/vde/trace.h b/drivers/media/platform/nvidia/tegra-vde/trace.h index 77358ddfdb8f..7853ab095ca4 100644 --- a/drivers/media/platform/tegra/vde/trace.h +++ b/drivers/media/platform/nvidia/tegra-vde/trace.h @@ -90,6 +90,6 @@ TRACE_EVENT(vde_ref_l1, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/tegra/vde +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/nvidia/tegra-vde #define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h> diff --git a/drivers/media/platform/tegra/vde/v4l2.c b/drivers/media/platform/nvidia/tegra-vde/v4l2.c index bd8c207d5b54..bd8c207d5b54 100644 --- a/drivers/media/platform/tegra/vde/v4l2.c +++ b/drivers/media/platform/nvidia/tegra-vde/v4l2.c diff --git a/drivers/media/platform/tegra/vde/vde.c b/drivers/media/platform/nvidia/tegra-vde/vde.c index f3e863a94c5a..f3e863a94c5a 100644 --- a/drivers/media/platform/tegra/vde/vde.c +++ b/drivers/media/platform/nvidia/tegra-vde/vde.c diff --git a/drivers/media/platform/tegra/vde/vde.h b/drivers/media/platform/nvidia/tegra-vde/vde.h index 0fbb1f3d2c88..0fbb1f3d2c88 100644 --- a/drivers/media/platform/tegra/vde/vde.h +++ b/drivers/media/platform/nvidia/tegra-vde/vde.h |