video: move zynqmp files to subdirectory

Place zynqmp files and headers in custom driver subdirectory.

Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/9aae6d217f0673c310818e3de38bb239c79c060c.1684312924.git.michal.simek@amd.com

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1e2f4e6de4a578b45633808862e4e7ebb21bc2b5..49762950719ebd78e20ddffff6a685ba4eb10624 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -740,14 +740,7 @@ config VIDEO_SEPS525
          Enable support for the Syncoam PM-OLED display driver (RGB 160x128).
          Currently driver is supporting only SPI interface.
 
-config VIDEO_ZYNQMP_DPSUB
-       bool "Enable video support for ZynqMP Display Port"
-       depends on ZYNQMP_POWER_DOMAIN
-       help
-         Enable support for Xilinx ZynqMP Display Port. Currently this file
-         is used as placeholder for driver. The main reason is to record
-         compatible string and calling power domain driver.
-
+source "drivers/video/zynqmp/Kconfig"
 source "drivers/video/nexell/Kconfig"
 
 config CONSOLE_SCROLL_LINES

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9a53cd141875c2d01216cd38e31bdaf2ea1b5bce..f99d7e3c3d9087ee2c17c47124567d2ca3a86506 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -73,7 +73,7 @@ obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
 obj-$(CONFIG_VIDEO_SIMPLE) += simplefb.o
 obj-$(CONFIG_VIDEO_VESA) += vesa.o
 obj-$(CONFIG_VIDEO_SEPS525) += seps525.o
-obj-$(CONFIG_VIDEO_ZYNQMP_DPSUB) += zynqmp_dpsub.o
+obj-$(CONFIG_VIDEO_ZYNQMP_DPSUB) += zynqmp/
 
 obj-y += bridge/
 obj-y += sunxi/

diff --git a/drivers/video/zynqmp/Kconfig b/drivers/video/zynqmp/Kconfig
new file mode 100644 (file)
index 0000000..b35cd1f
--- /dev/null
+++ b/drivers/video/zynqmp/Kconfig
@@ -0,0 +1,8 @@
+
+config VIDEO_ZYNQMP_DPSUB
+       bool "Enable video support for ZynqMP Display Port"
+       depends on ZYNQMP_POWER_DOMAIN
+       help
+       Enable support for Xilinx ZynqMP Display Port. Currently this file
+       is used as placeholder for driver. The main reason is to record
+       compatible string and calling power domain driver.

diff --git a/drivers/video/zynqmp/Makefile b/drivers/video/zynqmp/Makefile
new file mode 100644 (file)
index 0000000..cc057f5
--- /dev/null
+++ b/drivers/video/zynqmp/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (C) 2023, Advanced Micro Devices, Inc.
+
+obj-y += zynqmp_dpsub.o

diff --git a/drivers/video/zynqmp/zynqmp_dpsub.c b/drivers/video/zynqmp/zynqmp_dpsub.c
new file mode 100644 (file)
index 0000000..4ead663
--- /dev/null
+++ b/drivers/video/zynqmp/zynqmp_dpsub.c
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021 Xilinx Inc.
+ */
+
+#include <common.h>
+#include <cpu_func.h>
+#include <dm.h>
+#include <errno.h>
+#include <video.h>
+#include <dm/device_compat.h>
+
+#define WIDTH  640
+#define HEIGHT 480
+
+/**
+ * struct zynqmp_dpsub_priv - Private structure
+ * @dev: Device uclass for video_ops
+ */
+struct zynqmp_dpsub_priv {
+       struct udevice *dev;
+};
+
+static int zynqmp_dpsub_probe(struct udevice *dev)
+{
+       struct video_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct zynqmp_dpsub_priv *priv = dev_get_priv(dev);
+
+       uc_priv->bpix = VIDEO_BPP16;
+       uc_priv->xsize = WIDTH;
+       uc_priv->ysize = HEIGHT;
+       uc_priv->rot = 0;
+
+       priv->dev = dev;
+
+       /* Only placeholder for power domain driver */
+       return 0;
+}
+
+static int zynqmp_dpsub_bind(struct udevice *dev)
+{
+       struct video_uc_plat *plat = dev_get_uclass_plat(dev);
+
+       plat->size = WIDTH * HEIGHT * 16;
+
+       return 0;
+}
+
+static const struct video_ops zynqmp_dpsub_ops = {
+};
+
+static const struct udevice_id zynqmp_dpsub_ids[] = {
+       { .compatible = "xlnx,zynqmp-dpsub-1.7" },
+       { }
+};
+
+U_BOOT_DRIVER(zynqmp_dpsub_video) = {
+       .name = "zynqmp_dpsub_video",
+       .id = UCLASS_VIDEO,
+       .of_match = zynqmp_dpsub_ids,
+       .ops = &zynqmp_dpsub_ops,
+       .plat_auto = sizeof(struct video_uc_plat),
+       .bind = zynqmp_dpsub_bind,
+       .probe = zynqmp_dpsub_probe,
+       .priv_auto = sizeof(struct zynqmp_dpsub_priv),
+};

diff --git a/drivers/video/zynqmp_dpsub.c b/drivers/video/zynqmp_dpsub.c
deleted file mode 100644 (file)
index 4ead663..0000000
--- a/drivers/video/zynqmp_dpsub.c
+++ /dev/null
@@ -1,66 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2021 Xilinx Inc.
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <dm.h>
-#include <errno.h>
-#include <video.h>
-#include <dm/device_compat.h>
-
-#define WIDTH  640
-#define HEIGHT 480
-
-/**
- * struct zynqmp_dpsub_priv - Private structure
- * @dev: Device uclass for video_ops
- */
-struct zynqmp_dpsub_priv {
-       struct udevice *dev;
-};
-
-static int zynqmp_dpsub_probe(struct udevice *dev)
-{
-       struct video_priv *uc_priv = dev_get_uclass_priv(dev);
-       struct zynqmp_dpsub_priv *priv = dev_get_priv(dev);
-
-       uc_priv->bpix = VIDEO_BPP16;
-       uc_priv->xsize = WIDTH;
-       uc_priv->ysize = HEIGHT;
-       uc_priv->rot = 0;
-
-       priv->dev = dev;
-
-       /* Only placeholder for power domain driver */
-       return 0;
-}
-
-static int zynqmp_dpsub_bind(struct udevice *dev)
-{
-       struct video_uc_plat *plat = dev_get_uclass_plat(dev);
-
-       plat->size = WIDTH * HEIGHT * 16;
-
-       return 0;
-}
-
-static const struct video_ops zynqmp_dpsub_ops = {
-};
-
-static const struct udevice_id zynqmp_dpsub_ids[] = {
-       { .compatible = "xlnx,zynqmp-dpsub-1.7" },
-       { }
-};
-
-U_BOOT_DRIVER(zynqmp_dpsub_video) = {
-       .name = "zynqmp_dpsub_video",
-       .id = UCLASS_VIDEO,
-       .of_match = zynqmp_dpsub_ids,
-       .ops = &zynqmp_dpsub_ops,
-       .plat_auto = sizeof(struct video_uc_plat),
-       .bind = zynqmp_dpsub_bind,
-       .probe = zynqmp_dpsub_probe,
-       .priv_auto = sizeof(struct zynqmp_dpsub_priv),
-};