Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[oweals/u-boot.git] / drivers / net / fsl-mc / dpmng.c

diff --git a/drivers/net/fsl-mc/dpmng.c b/drivers/net/fsl-mc/dpmng.c
index cc14c7b7559c97ecf50f17a58bdd0886d0c1c459..d96e26b757c01ef85a8089a9eb4b14fb576adcb2 100644 (file)
--- a/drivers/net/fsl-mc/dpmng.c
+++ b/drivers/net/fsl-mc/dpmng.c
@@ -1,4 +1,4 @@
-/* Copyright 2014 Freescale Semiconductor Inc.
+/* Copyright 2013-2015 Freescale Semiconductor Inc.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -7,14 +7,17 @@
 #include <fsl-mc/fsl_dpmng.h>
 #include "fsl_dpmng_cmd.h"
 
-int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info)
+int mc_get_version(struct fsl_mc_io *mc_io,
+                  uint32_t cmd_flags,
+                  struct mc_version *mc_ver_info)
 {
        struct mc_command cmd = { 0 };
        int err;
 
        /* prepare command */
        cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_VERSION,
-                                         MC_CMD_PRI_LOW, 0);
+                                         cmd_flags,
+                                         0);
 
        /* send command to mc*/
        err = mc_send_command(mc_io, &cmd);
@@ -26,66 +29,3 @@ int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info)
 
        return 0;
 }
-
-int dpmng_reset_aiop(struct fsl_mc_io *mc_io, int container_id,
-                    int aiop_tile_id)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPMNG_CMDID_RESET_AIOP,
-                                         MC_CMD_PRI_LOW, 0);
-       DPMNG_CMD_RESET_AIOP(cmd, container_id, aiop_tile_id);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}
-
-int dpmng_load_aiop(struct fsl_mc_io *mc_io,
-                   int container_id,
-                   int aiop_tile_id,
-                   uint64_t img_iova,
-                   uint32_t img_size)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPMNG_CMDID_LOAD_AIOP,
-                                         MC_CMD_PRI_LOW,
-                                         0);
-       DPMNG_CMD_LOAD_AIOP(cmd, container_id, aiop_tile_id, img_size,
-                           img_iova);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}
-
-int dpmng_run_aiop(struct fsl_mc_io *mc_io,
-                  int container_id,
-                  int aiop_tile_id,
-                  const struct dpmng_aiop_run_cfg *cfg)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPMNG_CMDID_RUN_AIOP,
-                                         MC_CMD_PRI_LOW,
-                                         0);
-       DPMNG_CMD_RUN_AIOP(cmd, container_id, aiop_tile_id, cfg);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}
-
-int dpmng_reset_mc_portal(struct fsl_mc_io *mc_io)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPMNG_CMDID_RESET_MC_PORTAL,
-                                         MC_CMD_PRI_LOW,
-                                         0);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}