cmd: mvebu: Rename rx_training to mvebu_comphy_rx_training

Rename the misleading cmd "rx_training" to "mvebu_comphy_rx_training" to
avoid confusion and mixup with DDR3/4 training. This makes it clear,
that this command is platform specific and handles the COMPHY RX
training.

Also depend this cmd on ARMADA_8K and not TARGET_MVEBU_ARMADA_8K to make
is available for OcteonTX2 CN913x.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pali Rohár <pali@kernel.org>
Cc: Marek Behun <marek.behun@nic.cz>
Cc: Kostya Porotchkin <kostap@marvell.com>
Cc: Nadav Haklai <nadavh@marvell.com>
Acked-by: Marek Behún <marek.behun@nic.cz>
Acked-by: Pali Rohár <pali@kernel.org>

diff --git a/cmd/mvebu/Kconfig b/cmd/mvebu/Kconfig
index f0e4f884d703f87107a50e1caead13f0024f9e2a..7c42c75afbe2d9b6519f88d3a4d96ee6a94d65ac 100644 (file)
--- a/cmd/mvebu/Kconfig
+++ b/cmd/mvebu/Kconfig
@@ -49,11 +49,10 @@ config MVEBU_UBOOT_DFLT_NAME
          This option should contain a default file name to be used with
          MVEBU "bubt" command if the source file name is omitted
 
-config CMD_MVEBU_RX_TRAINING
-       bool "rx_training"
-       depends on TARGET_MVEBU_ARMADA_8K
-       default n
+config CMD_MVEBU_COMPHY_RX_TRAINING
+       bool "mvebu_comphy_rx_training"
+       depends on ARMADA_8K
        help
-         Perform RX training sequence
+         Perform COMPHY RX training sequence
 
 endmenu

diff --git a/cmd/mvebu/Makefile b/cmd/mvebu/Makefile
index 79299b0814f4cd8980827f392f34cbfed7d3719e..ca96ad01d9110b8c4f440843706253a02a6143fd 100644 (file)
--- a/cmd/mvebu/Makefile
+++ b/cmd/mvebu/Makefile
@@ -5,4 +5,4 @@
 # https://spdx.org/licenses
 
 obj-$(CONFIG_CMD_MVEBU_BUBT) += bubt.o
-obj-$(CONFIG_CMD_MVEBU_RX_TRAINING) += rx_training.o
+obj-$(CONFIG_CMD_MVEBU_COMPHY_RX_TRAINING) += comphy_rx_training.o

diff --git a/cmd/mvebu/comphy_rx_training.c b/cmd/mvebu/comphy_rx_training.c
new file mode 100644 (file)
index 0000000..0798dec
--- /dev/null
+++ b/cmd/mvebu/comphy_rx_training.c
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017 Marvell International Ltd.
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#include <common.h>
+#include <command.h>
+#include <console.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <dm/device-internal.h>
+#include <mvebu/comphy.h>
+
+int mvebu_comphy_rx_training_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
+                                char * const argv[])
+{
+       struct udevice *dev;
+       struct uclass *uc;
+       int ret, cp_index, comphy_index, i = 0;
+
+       if (argc != 3) {
+               printf("missing arguments\n");
+               return -1;
+       }
+
+       cp_index = simple_strtoul(argv[1], NULL, 16);
+       comphy_index = simple_strtoul(argv[2], NULL, 16);
+
+       ret = uclass_get(UCLASS_MISC, &uc);
+       if (ret) {
+               printf("Couldn't find UCLASS_MISC\n");
+               return ret;
+       }
+
+       uclass_foreach_dev(dev, uc) {
+               if (!(memcmp(dev->name, "comphy", 5))) {
+                       if (i == cp_index) {
+                               comphy_rx_training(dev, comphy_index);
+                               return 0;
+                       }
+
+                       i++;
+               }
+       }
+
+       printf("Coudn't find comphy %d\n", cp_index);
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       mvebu_comphy_rx_training, 3, 0, mvebu_comphy_rx_training_cmd,
+       "mvebu_comphy_rx_training <cp id> <comphy id>\n",
+       "\n\tRun COMPHY RX training sequence, the user must state CP index (0/1) and comphy ID (0/5)"
+);

diff --git a/cmd/mvebu/rx_training.c b/cmd/mvebu/rx_training.c
deleted file mode 100644 (file)
index 4bae765..0000000
--- a/cmd/mvebu/rx_training.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 Marvell International Ltd.
- *
- * SPDX-License-Identifier:    GPL-2.0
- */
-
-#include <common.h>
-#include <command.h>
-#include <console.h>
-#include <dm.h>
-#include <fdtdec.h>
-#include <dm/device-internal.h>
-#include <mvebu/comphy.h>
-
-int rx_training_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
-                   char * const argv[])
-{
-       struct udevice *dev;
-       struct uclass *uc;
-       int ret, cp_index, comphy_index, i = 0;
-
-       if (argc != 3) {
-               printf("missing arguments\n");
-               return -1;
-       }
-
-       cp_index = simple_strtoul(argv[1], NULL, 16);
-       comphy_index = simple_strtoul(argv[2], NULL, 16);
-
-       ret = uclass_get(UCLASS_MISC, &uc);
-       if (ret) {
-               printf("Couldn't find UCLASS_MISC\n");
-               return ret;
-       }
-
-       uclass_foreach_dev(dev, uc) {
-               if (!(memcmp(dev->name, "comphy", 5))) {
-                       if (i == cp_index) {
-                               comphy_rx_training(dev, comphy_index);
-                               return 0;
-                       }
-
-                       i++;
-               }
-       }
-
-       printf("Coudn't find comphy %d\n", cp_index);
-
-       return 0;
-}
-
-U_BOOT_CMD(
-       rx_training, 3, 0, rx_training_cmd,
-       "rx_training <cp id> <comphy id>\n",
-       "\n\tRun RX training sequence, the user must state CP index (0/1) and comphy ID (0/5)"
-);