MLK-17375 video: imx: hdp: fix "n" arg for strncmp call

Renaming hdpload to hdp_load for consistancy.
Correcting the strncmp to use only 4 characters to match "load" argument

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>

diff --git a/drivers/video/imx/Makefile b/drivers/video/imx/Makefile
index 0ec6e0e..93d6deb 100644 (file)
--- a/drivers/video/imx/Makefile
+++ b/drivers/video/imx/Makefile
@@ -5,4 +5,4 @@
 #
 
 UBOOTINCLUDE += -I$(srctree)/drivers/video/imx/hdp
-obj-$(CONFIG_VIDEO_IMX_HDP_LOAD) += hdpload.o hdp/
+obj-$(CONFIG_VIDEO_IMX_HDP_LOAD) += hdp_load.o hdp/

diff --git a/drivers/video/imx/hdp_load.c b/drivers/video/imx/hdp_load.c
new file mode 100644 (file)
index 0000000..66eb3e9
--- /dev/null
+++ b/drivers/video/imx/hdp_load.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2017-2018 NXP
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <command.h>
+
+#include "API_General.h"
+#include "scfw_utils.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define ON  1
+#define OFF 0
+
+static void display_set_power(int onoff)
+{
+       sc_ipc_t ipcHndl = gd->arch.ipc_channel_handle;
+
+       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl, SC_R_DC_0, onoff);
+       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl, SC_R_HDMI, onoff);
+}
+
+static void display_set_clocks(void)
+{
+       sc_ipc_t ipcHndl = gd->arch.ipc_channel_handle;
+       const sc_pm_clock_rate_t pll = 1188000000;
+       const sc_pm_clock_rate_t hdmi_core_clock = pll / 10;
+       const sc_pm_clock_rate_t hdmi_bus_clock = pll / 14;
+
+       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl,
+                                     SC_R_HDMI_PLL_0, SC_PM_PW_MODE_OFF);
+       SC_PM_SET_CLOCK_RATE(ipcHndl,
+                            SC_R_HDMI_PLL_0, SC_PM_CLK_PLL, pll);
+       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl,
+                                     SC_R_HDMI_PLL_0, SC_PM_PW_MODE_ON);
+
+       /* HDMI DI Bus Clock  */
+       SC_PM_SET_CLOCK_RATE(ipcHndl,
+                            SC_R_HDMI, SC_PM_CLK_MISC4, hdmi_bus_clock);
+       /* HDMI DI Core Clock  */
+       SC_PM_SET_CLOCK_RATE(ipcHndl,
+                            SC_R_HDMI, SC_PM_CLK_MISC2, hdmi_core_clock);
+}
+
+static void display_enable_clocks(int enable)
+{
+       sc_ipc_t ipcHndl = gd->arch.ipc_channel_handle;
+
+       SC_PM_CLOCK_ENABLE(ipcHndl, SC_R_HDMI_PLL_0, SC_PM_CLK_PLL, enable);
+       SC_PM_CLOCK_ENABLE(ipcHndl, SC_R_HDMI, SC_PM_CLK_MISC2, enable);
+       SC_PM_CLOCK_ENABLE(ipcHndl, SC_R_HDMI, SC_PM_CLK_MISC4, enable);
+}
+
+int do_hdp(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+       if (argc < 2)
+               return 0;
+
+       if (strncmp(argv[1], "tracescfw", 9) == 0) {
+               g_debug_scfw = 1;
+               printf("Enabled SCFW API tracing\n");
+       } else if (strncmp(argv[1], "load", 4) == 0) {
+               unsigned long address = 0;
+               unsigned long offset  = 0x2000;
+               const int iram_size   = 0x10000;
+               const int dram_size   = 0x8000;
+
+               if (argc > 2) {
+                       address = simple_strtoul(argv[2], NULL, 0);
+                       if (argc > 3)
+                               offset = simple_strtoul(argv[3], NULL, 0);
+               } else
+                       printf("Missing address\n");
+
+               printf("Loading hdp firmware from 0x%016lx offset 0x%016lx\n",
+                       address, offset);
+               display_set_power(SC_PM_PW_MODE_ON);
+               display_set_clocks();
+               display_enable_clocks(ON);
+               cdn_api_loadfirmware((unsigned char *)(address + offset),
+                                    iram_size,
+                                    (unsigned char *)(address + offset +
+                                                      iram_size),
+                                    dram_size);
+               display_enable_clocks(OFF);
+               printf("Loading hdp firmware Complete\n");
+               /* do not turn off hdmi power or firmware load will be lost */
+       } else {
+               printf("test error argc %d\n", argc);
+       }
+
+       return 0;
+}
+/***************************************************/
+
+U_BOOT_CMD(
+       hdp,  CONFIG_SYS_MAXARGS, 1, do_hdp,
+       "load hdmi firmware ",
+       "[<command>] ...\n"
+       "hdpload [address] [<offset>]\n"
+       "        address - address where the binary image starts\n"
+       "        <offset> - IRAM offset in the binary image (8192 default)\n"
+       "tracescfw - Trace SCFW API calls for video commands\n"
+       );

diff --git a/drivers/video/imx/hdpload.c b/drivers/video/imx/hdpload.c
deleted file mode 100644 (file)
index 0ffc960..0000000
--- a/drivers/video/imx/hdpload.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-
-#include "API_General.h"
-#include "scfw_utils.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define ON  1
-#define OFF 0
-
-static void display_set_power(int onoff)
-{
-       sc_ipc_t ipcHndl = gd->arch.ipc_channel_handle;
-
-       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl, SC_R_DC_0, onoff);
-       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl, SC_R_HDMI, onoff);
-}
-
-static void display_set_clocks(void)
-{
-       sc_ipc_t ipcHndl = gd->arch.ipc_channel_handle;
-       const sc_pm_clock_rate_t pll = 1188000000;
-       const sc_pm_clock_rate_t hdmi_core_clock = pll / 10;
-       const sc_pm_clock_rate_t hdmi_bus_clock = pll / 14;
-
-       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl,
-                                     SC_R_HDMI_PLL_0, SC_PM_PW_MODE_OFF);
-       SC_PM_SET_CLOCK_RATE(ipcHndl,
-                            SC_R_HDMI_PLL_0, SC_PM_CLK_PLL, pll);
-       SC_PM_SET_RESOURCE_POWER_MODE(ipcHndl,
-                                     SC_R_HDMI_PLL_0, SC_PM_PW_MODE_ON);
-
-       /* HDMI DI Bus Clock  */
-       SC_PM_SET_CLOCK_RATE(ipcHndl,
-                            SC_R_HDMI, SC_PM_CLK_MISC4, hdmi_bus_clock);
-       /* HDMI DI Core Clock  */
-       SC_PM_SET_CLOCK_RATE(ipcHndl,
-                            SC_R_HDMI, SC_PM_CLK_MISC2, hdmi_core_clock);
-}
-
-static void display_enable_clocks(int enable)
-{
-       sc_ipc_t ipcHndl = gd->arch.ipc_channel_handle;
-
-       SC_PM_CLOCK_ENABLE(ipcHndl, SC_R_HDMI_PLL_0, SC_PM_CLK_PLL, enable);
-       SC_PM_CLOCK_ENABLE(ipcHndl, SC_R_HDMI, SC_PM_CLK_MISC2, enable);
-       SC_PM_CLOCK_ENABLE(ipcHndl, SC_R_HDMI, SC_PM_CLK_MISC4, enable);
-}
-
-int do_hdp(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
-{
-       if (argc < 2)
-               return 0;
-
-       if (strncmp(argv[1], "tracescfw", 9) == 0) {
-               g_debug_scfw = 1;
-               printf("Enabled SCFW API tracing\n");
-       } else if (strncmp(argv[1], "load", 7) == 0) {
-               unsigned long address = 0;
-               unsigned long offset  = 0x2000;
-               const int iram_size   = 0x10000;
-               const int dram_size   = 0x8000;
-
-               if (argc > 2) {
-                       address = simple_strtoul(argv[2], NULL, 0);
-                       if (argc > 3)
-                               offset = simple_strtoul(argv[3], NULL, 0);
-               } else
-                       printf("Missing address\n");
-
-               printf("Loading hdp firmware from 0x%016lx offset 0x%016lx\n",
-                       address, offset);
-               display_set_power(SC_PM_PW_MODE_ON);
-               display_set_clocks();
-               display_enable_clocks(ON);
-               cdn_api_loadfirmware((unsigned char *)(address + offset),
-                                    iram_size,
-                                    (unsigned char *)(address + offset +
-                                                      iram_size),
-                                    dram_size);
-               display_enable_clocks(OFF);
-               printf("Loading hdp firmware Complete\n");
-               /* do not turn off hdmi power or firmware load will be lost */
-       } else {
-               printf("test error argc %d\n", argc);
-       }
-
-       return 0;
-}
-/***************************************************/
-
-U_BOOT_CMD(
-       hdp,  CONFIG_SYS_MAXARGS, 1, do_hdp,
-       "load hdmi firmware ",
-       "[<command>] ...\n"
-       "hdpload [address] [<offset>]\n"
-       "        address - address where the binary image starts\n"
-       "        <offset> - IRAM offset in the binary image (8192 default)\n"
-       "tracescfw - Trace SCFW API calls for video commands\n"
-       );