fpga: cyclon2: Use logging feature instead of FPGA_DEBUG
authorAlexander Dahl <ada@thorsis.com>
Fri, 7 Oct 2022 12:19:59 +0000 (14:19 +0200)
committerMichal Simek <michal.simek@amd.com>
Mon, 10 Oct 2022 10:28:08 +0000 (12:28 +0200)
Instead of using DEBUG or LOG_DEBUG the driver still had its own
definition for debug output.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20221007122003.11239-7-ada@thorsis.com
drivers/fpga/cyclon2.c

index 3b008fa..f264ff8 100644 (file)
@@ -5,18 +5,14 @@
  * Based on ACE1XK.c
  */
 
+#define LOG_CATEGORY UCLASS_FPGA
+
 #include <common.h>            /* core U-Boot definitions */
+#include <log.h>
 #include <altera.h>
 #include <ACEX1K.h>            /* ACEX device family */
 #include <linux/delay.h>
 
-/* Define FPGA_DEBUG to get debug printf's */
-#ifdef FPGA_DEBUG
-#define PRINTF(fmt, args...)   printf(fmt, ##args)
-#else
-#define PRINTF(fmt, args...)
-#endif
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
@@ -42,7 +38,7 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
 
        switch (desc->iface) {
        case passive_serial:
-               PRINTF("%s: Launching Passive Serial Loader\n", __func__);
+               log_debug("Launching Passive Serial Loader\n");
                ret_val = CYC2_ps_load(desc, buf, bsize);
                break;
 
@@ -51,8 +47,7 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
                 * done in the write() callback. Use the existing PS load
                 * function for FPP, too.
                 */
-               PRINTF("%s: Launching Fast Passive Parallel Loader\n",
-                      __func__);
+               log_debug("Launching Fast Passive Parallel Loader\n");
                ret_val = CYC2_ps_load(desc, buf, bsize);
                break;
 
@@ -72,7 +67,7 @@ int CYC2_dump(Altera_desc *desc, const void *buf, size_t bsize)
 
        switch (desc->iface) {
        case passive_serial:
-               PRINTF("%s: Launching Passive Serial Dump\n", __func__);
+               log_debug("Launching Passive Serial Dump\n");
                ret_val = CYC2_ps_dump(desc, buf, bsize);
                break;
 
@@ -99,22 +94,21 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
        Altera_CYC2_Passive_Serial_fns *fn = desc->iface_fns;
        int     ret = 0;
 
-       PRINTF("%s: start with interface functions @ 0x%p\n",
-              __func__, fn);
+       log_debug("start with interface functions @ 0x%p\n", fn);
 
        if (fn) {
                int cookie = desc->cookie;      /* make a local copy */
                unsigned long ts;               /* timestamp */
 
-               PRINTF("%s: Function Table:\n"
-                               "ptr:\t0x%p\n"
-                               "struct: 0x%p\n"
-                               "config:\t0x%p\n"
-                               "status:\t0x%p\n"
-                               "write:\t0x%p\n"
-                               "done:\t0x%p\n\n",
-                               __func__, &fn, fn, fn->config, fn->status,
-                               fn->write, fn->done);
+               log_debug("Function Table:\n"
+                         "ptr:\t0x%p\n"
+                         "struct: 0x%p\n"
+                         "config:\t0x%p\n"
+                         "status:\t0x%p\n"
+                         "write:\t0x%p\n"
+                         "done:\t0x%p\n\n",
+                         &fn, fn, fn->config, fn->status,
+                         fn->write, fn->done);
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
                printf("Loading FPGA Device %d...", cookie);
 #endif