Prepare the folder structure for a second Chips&Media driver.
Move the Coda driver to a sub-directory.
Signed-off-by: Sebastian Fricke <[email protected]>
---
MAINTAINERS | 2 +-
drivers/media/platform/chips-media/Kconfig | 17 +----------------
drivers/media/platform/chips-media/Makefile | 5 +----
.../media/platform/chips-media/coda/Kconfig | 18 ++++++++++++++++++
.../media/platform/chips-media/coda/Makefile | 6 ++++++
.../platform/chips-media/{ => coda}/coda-bit.c | 0
.../chips-media/{ => coda}/coda-common.c | 0
.../platform/chips-media/{ => coda}/coda-gdi.c | 0
.../chips-media/{ => coda}/coda-h264.c | 0
.../chips-media/{ => coda}/coda-jpeg.c | 0
.../chips-media/{ => coda}/coda-mpeg2.c | 0
.../chips-media/{ => coda}/coda-mpeg4.c | 0
.../platform/chips-media/{ => coda}/coda.h | 0
.../chips-media/{ => coda}/coda_regs.h | 0
.../platform/chips-media/{ => coda}/imx-vdoa.c | 0
.../platform/chips-media/{ => coda}/imx-vdoa.h | 0
.../platform/chips-media/{ => coda}/trace.h | 0
17 files changed, 27 insertions(+), 21 deletions(-)
create mode 100644 drivers/media/platform/chips-media/coda/Kconfig
create mode 100644 drivers/media/platform/chips-media/coda/Makefile
rename drivers/media/platform/chips-media/{ => coda}/coda-bit.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda-common.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda-gdi.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda-h264.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda-jpeg.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda-mpeg2.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda-mpeg4.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda.h (100%)
rename drivers/media/platform/chips-media/{ => coda}/coda_regs.h (100%)
rename drivers/media/platform/chips-media/{ => coda}/imx-vdoa.c (100%)
rename drivers/media/platform/chips-media/{ => coda}/imx-vdoa.h (100%)
rename drivers/media/platform/chips-media/{ => coda}/trace.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2bde5e62748a..83801ff3507d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5158,7 +5158,7 @@ M: Philipp Zabel <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/media/coda.yaml
-F: drivers/media/platform/chips-media/
+F: drivers/media/platform/chips-media/coda
CODE OF CONDUCT
M: Greg Kroah-Hartman <[email protected]>
diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig
index 57f8f8a22df8..f87a0d693df7 100644
--- a/drivers/media/platform/chips-media/Kconfig
+++ b/drivers/media/platform/chips-media/Kconfig
@@ -2,19 +2,4 @@
comment "Chips&Media media platform drivers"
-config VIDEO_CODA
- tristate "Chips&Media Coda multi-standard codec IP"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && OF && (ARCH_MXC || COMPILE_TEST)
- select SRAM
- select VIDEOBUF2_DMA_CONTIG
- select VIDEOBUF2_VMALLOC
- select V4L2_JPEG_HELPER
- select V4L2_MEM2MEM_DEV
- select GENERIC_ALLOCATOR
- help
- Coda is a range of video codec IPs that supports
- H.264, MPEG-4, and other video formats.
-
-config VIDEO_IMX_VDOA
- def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
+source "drivers/media/platform/chips-media/coda/Kconfig"
diff --git a/drivers/media/platform/chips-media/Makefile b/drivers/media/platform/chips-media/Makefile
index bbb16425a875..5ee693f651c1 100644
--- a/drivers/media/platform/chips-media/Makefile
+++ b/drivers/media/platform/chips-media/Makefile
@@ -1,6 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-coda-vpu-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o
-
-obj-$(CONFIG_VIDEO_CODA) += coda-vpu.o
-obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o
+obj-y += coda/
diff --git a/drivers/media/platform/chips-media/coda/Kconfig b/drivers/media/platform/chips-media/coda/Kconfig
new file mode 100644
index 000000000000..cb7b66c71380
--- /dev/null
+++ b/drivers/media/platform/chips-media/coda/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config VIDEO_CODA
+ tristate "Chips&Media Coda multi-standard codec IP"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && OF && (ARCH_MXC || COMPILE_TEST)
+ select SRAM
+ select VIDEOBUF2_DMA_CONTIG
+ select VIDEOBUF2_VMALLOC
+ select V4L2_JPEG_HELPER
+ select V4L2_MEM2MEM_DEV
+ select GENERIC_ALLOCATOR
+ help
+ Coda is a range of video codec IPs that supports
+ H.264, MPEG-4, and other video formats.
+
+config VIDEO_IMX_VDOA
+ def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
diff --git a/drivers/media/platform/chips-media/coda/Makefile b/drivers/media/platform/chips-media/coda/Makefile
new file mode 100644
index 000000000000..bbb16425a875
--- /dev/null
+++ b/drivers/media/platform/chips-media/coda/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+coda-vpu-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o
+
+obj-$(CONFIG_VIDEO_CODA) += coda-vpu.o
+obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o
diff --git a/drivers/media/platform/chips-media/coda-bit.c b/drivers/media/platform/chips-media/coda/coda-bit.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-bit.c
rename to drivers/media/platform/chips-media/coda/coda-bit.c
diff --git a/drivers/media/platform/chips-media/coda-common.c b/drivers/media/platform/chips-media/coda/coda-common.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-common.c
rename to drivers/media/platform/chips-media/coda/coda-common.c
diff --git a/drivers/media/platform/chips-media/coda-gdi.c b/drivers/media/platform/chips-media/coda/coda-gdi.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-gdi.c
rename to drivers/media/platform/chips-media/coda/coda-gdi.c
diff --git a/drivers/media/platform/chips-media/coda-h264.c b/drivers/media/platform/chips-media/coda/coda-h264.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-h264.c
rename to drivers/media/platform/chips-media/coda/coda-h264.c
diff --git a/drivers/media/platform/chips-media/coda-jpeg.c b/drivers/media/platform/chips-media/coda/coda-jpeg.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-jpeg.c
rename to drivers/media/platform/chips-media/coda/coda-jpeg.c
diff --git a/drivers/media/platform/chips-media/coda-mpeg2.c b/drivers/media/platform/chips-media/coda/coda-mpeg2.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-mpeg2.c
rename to drivers/media/platform/chips-media/coda/coda-mpeg2.c
diff --git a/drivers/media/platform/chips-media/coda-mpeg4.c b/drivers/media/platform/chips-media/coda/coda-mpeg4.c
similarity index 100%
rename from drivers/media/platform/chips-media/coda-mpeg4.c
rename to drivers/media/platform/chips-media/coda/coda-mpeg4.c
diff --git a/drivers/media/platform/chips-media/coda.h b/drivers/media/platform/chips-media/coda/coda.h
similarity index 100%
rename from drivers/media/platform/chips-media/coda.h
rename to drivers/media/platform/chips-media/coda/coda.h
diff --git a/drivers/media/platform/chips-media/coda_regs.h b/drivers/media/platform/chips-media/coda/coda_regs.h
similarity index 100%
rename from drivers/media/platform/chips-media/coda_regs.h
rename to drivers/media/platform/chips-media/coda/coda_regs.h
diff --git a/drivers/media/platform/chips-media/imx-vdoa.c b/drivers/media/platform/chips-media/coda/imx-vdoa.c
similarity index 100%
rename from drivers/media/platform/chips-media/imx-vdoa.c
rename to drivers/media/platform/chips-media/coda/imx-vdoa.c
diff --git a/drivers/media/platform/chips-media/imx-vdoa.h b/drivers/media/platform/chips-media/coda/imx-vdoa.h
similarity index 100%
rename from drivers/media/platform/chips-media/imx-vdoa.h
rename to drivers/media/platform/chips-media/coda/imx-vdoa.h
diff --git a/drivers/media/platform/chips-media/trace.h b/drivers/media/platform/chips-media/coda/trace.h
similarity index 100%
rename from drivers/media/platform/chips-media/trace.h
rename to drivers/media/platform/chips-media/coda/trace.h
--
2.25.1
Hi Sebastian,
On Mi, 2022-12-07 at 13:13 +0100, Sebastian Fricke wrote:
> Prepare the folder structure for a second Chips&Media driver.
> Move the Coda driver to a sub-directory.
>
> Signed-off-by: Sebastian Fricke <[email protected]>
> ---
> MAINTAINERS | 2 +-
> drivers/media/platform/chips-media/Kconfig | 17 +----------------
> drivers/media/platform/chips-media/Makefile | 5 +----
> .../media/platform/chips-media/coda/Kconfig | 18 ++++++++++++++++++
> .../media/platform/chips-media/coda/Makefile | 6 ++++++
> .../platform/chips-media/{ => coda}/coda-bit.c | 0
> .../chips-media/{ => coda}/coda-common.c | 0
> .../platform/chips-media/{ => coda}/coda-gdi.c | 0
> .../chips-media/{ => coda}/coda-h264.c | 0
> .../chips-media/{ => coda}/coda-jpeg.c | 0
> .../chips-media/{ => coda}/coda-mpeg2.c | 0
> .../chips-media/{ => coda}/coda-mpeg4.c | 0
> .../platform/chips-media/{ => coda}/coda.h | 0
> .../chips-media/{ => coda}/coda_regs.h | 0
> .../platform/chips-media/{ => coda}/imx-vdoa.c | 0
> .../platform/chips-media/{ => coda}/imx-vdoa.h | 0
> .../platform/chips-media/{ => coda}/trace.h | 0
TRACE_INCLUDE_PATH in trace.h needs to be updated. For reference, see
commit 64441979bda6 ("media: platform: rename coda/ to chips-media/").
regards
Philipp
Hi Sebastian,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on media-tree/master]
[also build test ERROR on robh/for-next linus/master sailus-media-tree/streams v6.1-rc8 next-20221207]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sebastian-Fricke/Wave5-codec-driver/20221207-201618
base: git://linuxtv.org/media_tree.git master
patch link: https://lore.kernel.org/r/20221207121350.66217-2-sebastian.fricke%40collabora.com
patch subject: [PATCH v11 1/6] media: platform: chips-media: Move Coda to separate folder
config: ia64-allmodconfig
compiler: ia64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/011f0f8174292005830e2a8b709faa6028c03361
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Sebastian-Fricke/Wave5-codec-driver/20221207-201618
git checkout 011f0f8174292005830e2a8b709faa6028c03361
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 SHELL=/bin/bash drivers/media/platform/chips-media/coda/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
In file included from drivers/media/platform/chips-media/coda/trace.h:175,
from drivers/media/platform/chips-media/coda/coda-bit.c:32:
>> include/trace/define_trace.h:95:42: fatal error: ../../drivers/media/platform/chips-media/trace.h: No such file or directory
95 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
| ^
compilation terminated.
vim +95 include/trace/define_trace.h
a8d154b0091683 Steven Rostedt 2009-04-10 94
a8d154b0091683 Steven Rostedt 2009-04-10 @95 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
a8d154b0091683 Steven Rostedt 2009-04-10 96
--
0-DAY CI Kernel Test Service
https://01.org/lkp