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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a9fb06..1b6f48a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3026,7 +3026,7 @@ L:        linux-media@vger.kernel.org
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/aspeed-video.txt
-F:     drivers/media/platform/aspeed-video.c
+F:     drivers/media/platform/aspeed/
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 1446a99..10f453f 100644 (file)
--- 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 e319044..18ec3d2 100644 (file)
--- 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 (file)
index 0000000..5025e89
--- /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 (file)
index 0000000..1979af6
--- /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
similarity index 100%
rename from drivers/media/platform/aspeed-video.c
rename to drivers/media/platform/aspeed/aspeed-video.c