common: rename lcd_simplefb.c file to fdt_simplefb.c

Rename the file lcd_simplefb.c to fdt_simplefb.c to be aligned
with the configuration name and with the associated include file
./include/fdt_simplefb.h

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/common/Makefile b/common/Makefile
index fed7e482e673210a0eb0b675d9fc2b9b8a81ee7f..24be05c368d096b65fc2e894bc14e3f297a86cec 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
 obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
 
 obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
+obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 obj-$(CONFIG_MII) += miiphyutil.o
 obj-$(CONFIG_CMD_MII) += miiphyutil.o
@@ -40,7 +41,6 @@ ifndef CONFIG_DM_VIDEO
 obj-$(CONFIG_LCD) += lcd.o lcd_console.o
 endif
 obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
-obj-$(CONFIG_FDT_SIMPLEFB) += lcd_simplefb.o
 obj-$(CONFIG_MENU) += menu.o
 obj-$(CONFIG_UPDATE_COMMON) += update.o
 obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o

diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c
new file mode 100644 (file)
index 0000000..1650615
--- /dev/null
+++ b/common/fdt_simplefb.c
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Simplefb device tree support
+ *
+ * (C) Copyright 2015
+ * Stephen Warren <swarren@wwwdotorg.org>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <lcd.h>
+#include <fdt_support.h>
+#include <asm/global_data.h>
+#include <linux/libfdt.h>
+#include <video.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int lcd_dt_simplefb_configure_node(void *blob, int off)
+{
+       int xsize, ysize;
+       int bpix; /* log2 of bits per pixel */
+       const char *name;
+       ulong fb_base;
+#ifdef CONFIG_DM_VIDEO
+       struct video_uc_plat *plat;
+       struct video_priv *uc_priv;
+       struct udevice *dev;
+       int ret;
+
+       ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
+       if (ret)
+               return ret;
+       uc_priv = dev_get_uclass_priv(dev);
+       plat = dev_get_uclass_plat(dev);
+       xsize = uc_priv->xsize;
+       ysize = uc_priv->ysize;
+       bpix = uc_priv->bpix;
+       fb_base = plat->base;
+#else
+       xsize = lcd_get_pixel_width();
+       ysize = lcd_get_pixel_height();
+       bpix = LCD_BPP;
+       fb_base = gd->fb_base;
+#endif
+       switch (bpix) {
+       case 4: /* VIDEO_BPP16 */
+               name = "r5g6b5";
+               break;
+       case 5: /* VIDEO_BPP32 */
+               name = "a8r8g8b8";
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return fdt_setup_simplefb_node(blob, off, fb_base, xsize, ysize,
+                                      xsize * (1 << bpix) / 8, name);
+}
+
+int lcd_dt_simplefb_add_node(void *blob)
+{
+       static const char compat[] = "simple-framebuffer";
+       static const char disabled[] = "disabled";
+       int off, ret;
+
+       off = fdt_add_subnode(blob, 0, "framebuffer");
+       if (off < 0)
+               return -1;
+
+       ret = fdt_setprop(blob, off, "status", disabled, sizeof(disabled));
+       if (ret < 0)
+               return -1;
+
+       ret = fdt_setprop(blob, off, "compatible", compat, sizeof(compat));
+       if (ret < 0)
+               return -1;
+
+       return lcd_dt_simplefb_configure_node(blob, off);
+}
+
+int lcd_dt_simplefb_enable_existing_node(void *blob)
+{
+       int off;
+
+       off = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
+       if (off < 0)
+               return -1;
+
+       return lcd_dt_simplefb_configure_node(blob, off);
+}

diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
deleted file mode 100644 (file)
index 1650615..0000000
--- a/common/lcd_simplefb.c
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Simplefb device tree support
- *
- * (C) Copyright 2015
- * Stephen Warren <swarren@wwwdotorg.org>
- */
-
-#include <common.h>
-#include <dm.h>
-#include <lcd.h>
-#include <fdt_support.h>
-#include <asm/global_data.h>
-#include <linux/libfdt.h>
-#include <video.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static int lcd_dt_simplefb_configure_node(void *blob, int off)
-{
-       int xsize, ysize;
-       int bpix; /* log2 of bits per pixel */
-       const char *name;
-       ulong fb_base;
-#ifdef CONFIG_DM_VIDEO
-       struct video_uc_plat *plat;
-       struct video_priv *uc_priv;
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
-       if (ret)
-               return ret;
-       uc_priv = dev_get_uclass_priv(dev);
-       plat = dev_get_uclass_plat(dev);
-       xsize = uc_priv->xsize;
-       ysize = uc_priv->ysize;
-       bpix = uc_priv->bpix;
-       fb_base = plat->base;
-#else
-       xsize = lcd_get_pixel_width();
-       ysize = lcd_get_pixel_height();
-       bpix = LCD_BPP;
-       fb_base = gd->fb_base;
-#endif
-       switch (bpix) {
-       case 4: /* VIDEO_BPP16 */
-               name = "r5g6b5";
-               break;
-       case 5: /* VIDEO_BPP32 */
-               name = "a8r8g8b8";
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return fdt_setup_simplefb_node(blob, off, fb_base, xsize, ysize,
-                                      xsize * (1 << bpix) / 8, name);
-}
-
-int lcd_dt_simplefb_add_node(void *blob)
-{
-       static const char compat[] = "simple-framebuffer";
-       static const char disabled[] = "disabled";
-       int off, ret;
-
-       off = fdt_add_subnode(blob, 0, "framebuffer");
-       if (off < 0)
-               return -1;
-
-       ret = fdt_setprop(blob, off, "status", disabled, sizeof(disabled));
-       if (ret < 0)
-               return -1;
-
-       ret = fdt_setprop(blob, off, "compatible", compat, sizeof(compat));
-       if (ret < 0)
-               return -1;
-
-       return lcd_dt_simplefb_configure_node(blob, off);
-}
-
-int lcd_dt_simplefb_enable_existing_node(void *blob)
-{
-       int off;
-
-       off = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
-       if (off < 0)
-               return -1;
-
-       return lcd_dt_simplefb_configure_node(blob, off);
-}