diff options
| author |   Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-11 10:01:12 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-14 09:42:59 +0100 |
| commit | 69c5ee8aae03bb9f9a8a825175a1cd0644eaf20c (patch) | |
| tree | d2347f2d1ea14a9461b89f96ee0dc09ef3ff5c53 /drivers/media/platform | |
| parent | media: platform: move platform menu dependencies to drivers (diff) | |
| download | linux-dev-69c5ee8aae03bb9f9a8a825175a1cd0644eaf20c.tar.xz linux-dev-69c5ee8aae03bb9f9a8a825175a1cd0644eaf20c.zip | |
media: platform: place Aspeed driver on a separate dir
In order to cleanup the main platform media directory, move Aspeed
driver to its own directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/media/platform/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/platform/aspeed/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/media/platform/aspeed/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/platform/aspeed/aspeed-video.c (renamed from drivers/media/platform/aspeed-video.c) | 0 |
5 files changed, 14 insertions, 10 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1446a99159c5..10f453ff2717 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -50,15 +50,7 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/omap/Kconfig" -config VIDEO_ASPEED - tristate "Aspeed AST2400 and AST2500 Video Engine driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 - select VIDEOBUF2_DMA_CONTIG - help - Support for the Aspeed Video Engine (VE) embedded in the Aspeed - AST2400 and AST2500 SOCs. The VE can capture and compress video data - from digital or analog sources. +source "drivers/media/platform/aspeed/Kconfig" config VIDEO_SH_VOU tristate "SuperH VOU video output driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index e319044c57e9..18ec3d208483 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,6 +6,7 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ +obj-y += aspeed/ obj-y += am437x/ obj-y += amphion/ obj-y += atmel/ @@ -47,7 +48,6 @@ obj-y += xilinx/ # Please place here only ancillary drivers that aren't SoC-specific # Please keep it alphabetically sorted by Kconfig name # (e. g. LC_ALL=C sort Makefile) -obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) += video-mux.o diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig new file mode 100644 index 000000000000..5025e892844c --- /dev/null +++ b/drivers/media/platform/aspeed/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_ASPEED + tristate "Aspeed AST2400 and AST2500 Video Engine driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 + select VIDEOBUF2_DMA_CONTIG + help + Support for the Aspeed Video Engine (VE) embedded in the Aspeed + AST2400 and AST2500 SOCs. The VE can capture and compress video data + from digital or analog sources. diff --git a/drivers/media/platform/aspeed/Makefile b/drivers/media/platform/aspeed/Makefile new file mode 100644 index 000000000000..1979af63dadd --- /dev/null +++ b/drivers/media/platform/aspeed/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c index b937dbcbe9e0..b937dbcbe9e0 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed/aspeed-video.c |