From 044cbf5264d280164889c3b039bdd991f8bf85bd Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Tue, 22 Jan 2019 17:08:01 +0800 Subject: [PATCH] gpu: Move ipu-v3 to imx folder The new imx folder may contain ipu-v3 and dpu common drivers. Signed-off-by: Liu Ying [ Aisheng: fix source path ] Signed-off-by: Dong Aisheng --- drivers/gpu/Makefile | 2 +- drivers/gpu/imx/Kconfig | 1 + drivers/gpu/imx/Makefile | 1 + drivers/gpu/{ => imx}/ipu-v3/Kconfig | 0 drivers/gpu/{ => imx}/ipu-v3/Makefile | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-common.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-cpmem.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-csi.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-dc.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-di.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-dmfc.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-dp.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-ic.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-image-convert.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-pre.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-prg.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-prv.h | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-smfc.c | 0 drivers/gpu/{ => imx}/ipu-v3/ipu-vdi.c | 0 drivers/video/Kconfig | 2 +- 20 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/imx/Kconfig create mode 100644 drivers/gpu/imx/Makefile rename drivers/gpu/{ => imx}/ipu-v3/Kconfig (100%) rename drivers/gpu/{ => imx}/ipu-v3/Makefile (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-common.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-cpmem.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-csi.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-dc.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-di.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-dmfc.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-dp.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-ic.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-image-convert.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-pre.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-prg.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-prv.h (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-smfc.c (100%) rename drivers/gpu/{ => imx}/ipu-v3/ipu-vdi.c (100%) diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index f17d01f076c7..a6ac74a9f4b1 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -3,5 +3,5 @@ # taken to initialize them in the correct order. Link order is the only way # to ensure this currently. obj-$(CONFIG_TEGRA_HOST1X) += host1x/ +obj-y += imx/ obj-y += drm/ vga/ -obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ diff --git a/drivers/gpu/imx/Kconfig b/drivers/gpu/imx/Kconfig new file mode 100644 index 000000000000..57277de697dd --- /dev/null +++ b/drivers/gpu/imx/Kconfig @@ -0,0 +1 @@ +source "drivers/gpu/imx/ipu-v3/Kconfig" diff --git a/drivers/gpu/imx/Makefile b/drivers/gpu/imx/Makefile new file mode 100644 index 000000000000..c3cb11425cf5 --- /dev/null +++ b/drivers/gpu/imx/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ diff --git a/drivers/gpu/ipu-v3/Kconfig b/drivers/gpu/imx/ipu-v3/Kconfig similarity index 100% rename from drivers/gpu/ipu-v3/Kconfig rename to drivers/gpu/imx/ipu-v3/Kconfig diff --git a/drivers/gpu/ipu-v3/Makefile b/drivers/gpu/imx/ipu-v3/Makefile similarity index 100% rename from drivers/gpu/ipu-v3/Makefile rename to drivers/gpu/imx/ipu-v3/Makefile diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/imx/ipu-v3/ipu-common.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-common.c rename to drivers/gpu/imx/ipu-v3/ipu-common.c diff --git a/drivers/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/imx/ipu-v3/ipu-cpmem.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-cpmem.c rename to drivers/gpu/imx/ipu-v3/ipu-cpmem.c diff --git a/drivers/gpu/ipu-v3/ipu-csi.c b/drivers/gpu/imx/ipu-v3/ipu-csi.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-csi.c rename to drivers/gpu/imx/ipu-v3/ipu-csi.c diff --git a/drivers/gpu/ipu-v3/ipu-dc.c b/drivers/gpu/imx/ipu-v3/ipu-dc.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-dc.c rename to drivers/gpu/imx/ipu-v3/ipu-dc.c diff --git a/drivers/gpu/ipu-v3/ipu-di.c b/drivers/gpu/imx/ipu-v3/ipu-di.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-di.c rename to drivers/gpu/imx/ipu-v3/ipu-di.c diff --git a/drivers/gpu/ipu-v3/ipu-dmfc.c b/drivers/gpu/imx/ipu-v3/ipu-dmfc.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-dmfc.c rename to drivers/gpu/imx/ipu-v3/ipu-dmfc.c diff --git a/drivers/gpu/ipu-v3/ipu-dp.c b/drivers/gpu/imx/ipu-v3/ipu-dp.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-dp.c rename to drivers/gpu/imx/ipu-v3/ipu-dp.c diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/imx/ipu-v3/ipu-ic.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-ic.c rename to drivers/gpu/imx/ipu-v3/ipu-ic.c diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/imx/ipu-v3/ipu-image-convert.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-image-convert.c rename to drivers/gpu/imx/ipu-v3/ipu-image-convert.c diff --git a/drivers/gpu/ipu-v3/ipu-pre.c b/drivers/gpu/imx/ipu-v3/ipu-pre.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-pre.c rename to drivers/gpu/imx/ipu-v3/ipu-pre.c diff --git a/drivers/gpu/ipu-v3/ipu-prg.c b/drivers/gpu/imx/ipu-v3/ipu-prg.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-prg.c rename to drivers/gpu/imx/ipu-v3/ipu-prg.c diff --git a/drivers/gpu/ipu-v3/ipu-prv.h b/drivers/gpu/imx/ipu-v3/ipu-prv.h similarity index 100% rename from drivers/gpu/ipu-v3/ipu-prv.h rename to drivers/gpu/imx/ipu-v3/ipu-prv.h diff --git a/drivers/gpu/ipu-v3/ipu-smfc.c b/drivers/gpu/imx/ipu-v3/ipu-smfc.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-smfc.c rename to drivers/gpu/imx/ipu-v3/ipu-smfc.c diff --git a/drivers/gpu/ipu-v3/ipu-vdi.c b/drivers/gpu/imx/ipu-v3/ipu-vdi.c similarity index 100% rename from drivers/gpu/ipu-v3/ipu-vdi.c rename to drivers/gpu/imx/ipu-v3/ipu-vdi.c diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 427a993c7f57..df9bd4b452f9 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -15,7 +15,7 @@ source "drivers/char/agp/Kconfig" source "drivers/gpu/vga/Kconfig" source "drivers/gpu/host1x/Kconfig" -source "drivers/gpu/ipu-v3/Kconfig" +source "drivers/gpu/imx/Kconfig" source "drivers/gpu/drm/Kconfig"