[U-Boot] [PATCH 02/17] video: move ipuv3 files to subdirectory

Anatolij Gustschin
2019-03-18T22:29:32Z

Place ipuv3 files and headers in custom driver subdirectory.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
drivers/video/Kconfig | 7 +------
drivers/video/Makefile | 2 +-
drivers/video/imx/Kconfig | 8 ++++++++
drivers/video/imx/Makefile | 6 ++++++
drivers/video/{ => imx}/ipu.h | 0
drivers/video/{ => imx}/ipu_common.c | 0
drivers/video/{ => imx}/ipu_disp.c | 0
drivers/video/{ => imx}/ipu_regs.h | 0
drivers/video/{ => imx}/mxc_ipuv3_fb.c | 2 +-
drivers/video/{ => imx}/mxcfb.h | 0
10 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 drivers/video/imx/Kconfig
create mode 100644 drivers/video/imx/Makefile
rename drivers/video/{ => imx}/ipu.h (100%)
rename drivers/video/{ => imx}/ipu_common.c (100%)
rename drivers/video/{ => imx}/ipu_disp.c (100%)
rename drivers/video/{ => imx}/ipu_regs.h (100%)
rename drivers/video/{ => imx}/mxc_ipuv3_fb.c (99%)
rename drivers/video/{ => imx}/mxcfb.h (100%)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 73a2402f41..53871f864f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -538,12 +538,7 @@ config VIDEO_TEGRA124

source "drivers/video/bridge/Kconfig"

-config VIDEO_IPUV3
- bool "i.MX IPUv3 Core video support"
- depends on (VIDEO || DM_VIDEO) && (MX5 || MX6)
- help
- This enables framebuffer driver for i.MX processors working
- on the IPUv3(Image Processing Unit) internal graphic processor.
+source "drivers/video/imx/Kconfig"

config VIDEO
bool "Enable legacy video support"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 671f037c35..349a207035 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -46,7 +46,7 @@ obj-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o
obj-$(CONFIG_VIDEO_DW_HDMI) += dw_hdmi.o
obj-$(CONFIG_VIDEO_EFI) += efi.o
obj-$(CONFIG_VIDEO_FSL_DCU_FB) += fsl_dcu_fb.o videomodes.o
-obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
+obj-$(CONFIG_VIDEO_IPUV3) += imx/
obj-$(CONFIG_VIDEO_IVYBRIDGE_IGD) += ivybridge_igd.o
obj-$(CONFIG_VIDEO_LCD_ANX9804) += anx9804.o
obj-$(CONFIG_VIDEO_LCD_HITACHI_TX18D42VM) += hitachi_tx18d42vm_lcd.o
diff --git a/drivers/video/imx/Kconfig b/drivers/video/imx/Kconfig
new file mode 100644
index 0000000000..c33620e075
--- /dev/null
+++ b/drivers/video/imx/Kconfig
@@ -0,0 +1,8 @@
+
+config VIDEO_IPUV3
+ bool "i.MX IPUv3 Core video support"
+ depends on (VIDEO || DM_VIDEO) && (MX5 || MX6)
+ help
+ This enables framebuffer driver for i.MX processors working
+ on the IPUv3(Image Processing Unit) internal graphic processor.
+
diff --git a/drivers/video/imx/Makefile b/drivers/video/imx/Makefile
new file mode 100644
index 0000000000..179ea651fe
--- /dev/null
+++ b/drivers/video/imx/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2000-2007
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+
+obj-y += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
diff --git a/drivers/video/ipu.h b/drivers/video/imx/ipu.h
similarity index 100%
rename from drivers/video/ipu.h
rename to drivers/video/imx/ipu.h
diff --git a/drivers/video/ipu_common.c b/drivers/video/imx/ipu_common.c
similarity index 100%
rename from drivers/video/ipu_common.c
rename to drivers/video/imx/ipu_common.c
diff --git a/drivers/video/ipu_disp.c b/drivers/video/imx/ipu_disp.c
similarity index 100%
rename from drivers/video/ipu_disp.c
rename to drivers/video/imx/ipu_disp.c
diff --git a/drivers/video/ipu_regs.h b/drivers/video/imx/ipu_regs.h
similarity index 100%
rename from drivers/video/ipu_regs.h
rename to drivers/video/imx/ipu_regs.h
diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
similarity index 99%
rename from drivers/video/mxc_ipuv3_fb.c
rename to drivers/video/imx/mxc_ipuv3_fb.c
index 5b3ba7b3a9..3e38d4bdcc 100644
--- a/drivers/video/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -20,7 +20,7 @@
#include <asm/mach-imx/video.h>
#include <malloc.h>
#include <video_fb.h>
-#include "videomodes.h"
+#include "../videomodes.h"
#include "ipu.h"
#include "mxcfb.h"
#include "ipu_regs.h"
diff --git a/drivers/video/mxcfb.h b/drivers/video/imx/mxcfb.h
similarity index 100%
rename from drivers/video/mxcfb.h
rename to drivers/video/imx/mxcfb.h
--
2.17.1