diff --git a/README b/README
index 2d084b2cbbffc26f071a673316b050d7e7067076..0ac01363f7a55638b43f0b7ede102093adeeff71 100644
--- a/README
+++ b/README
@@ -826,7 +826,6 @@ The following options need to be configured:
 		CONFIG_CMD_BOOTD	  bootd
 		CONFIG_CMD_BOOTI	* ARM64 Linux kernel Image support
 		CONFIG_CMD_CACHE	* icache, dcache
-		CONFIG_CMD_CLK   	* clock command support
 		CONFIG_CMD_CONSOLE	  coninfo
 		CONFIG_CMD_CRC32	* crc32
 		CONFIG_CMD_DATE		* support for RTC, date/time...
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0b70c4740705d945c44e39711ee1d1de01ce1dec..513a35fc4e999aadbd4e344a194cd14f85fae623 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -676,6 +676,7 @@ config ARCH_ZYNQ
 	select CLK
 	select SPL_CLK
 	select CLK_ZYNQ
+	imply CMD_CLK
 
 config ARCH_ZYNQMP
 	bool "Support Xilinx ZynqMP Platform"
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7a124415ed25a4a67aea7f1fd7d5f4088d7c5eb0..9eb6a353cb10969b8a9f549e4bbd6af228d974ab 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -387,6 +387,15 @@ endmenu
 
 menu "Device access commands"
 
+config CMD_CLK
+	bool "clk - Show clock frequencies"
+	help
+	  (deprecated)
+	  Shows clock frequences by calling a sock_clk_dump() hook function.
+	  This is depreated in favour of using the CLK uclass and accessing
+	  clock values from associated drivers. However currently no command
+	  exists for this.
+
 config CMD_DM
 	bool "dm - Access to driver model information"
 	depends on DM
diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig
index e1676643d5b47093a4b0e4e956cb6b60cffe6c0c..9eb80766ed41868633fa9b8342fc23daf345da54 100644
--- a/configs/pic32mzdask_defconfig
+++ b/configs/pic32mzdask_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="dask # "
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_CLK=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 38c960014211d5b6d7e927d300583d980a1f278f..d40e18f65d404f73395639afae22a32ec3837bf0 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_CLK		/* Clock support		*/
 #define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DIAG		/* Diagnostics			*/
 #define CONFIG_CMD_DISPLAY	/* Display support		*/
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 9042dc269e0efd31eaea5d8e484bd01bb6c191dc..2dcc6c4539cead26ecd71c0e716a26017f8c8a66 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -53,7 +53,6 @@
  * Commands
  */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_CMD_CLK
 
 /*------------------------------------------------------------
  * Console Configuration
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1fa55998655fbbb7ee7bc831980f6e85998efe35..51edd463a150798e14fbf7e55fb46acfeae781ad 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -236,7 +236,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CLOCKS
-#define CONFIG_CMD_CLK
 #define CONFIG_SYS_MAXARGS		32 /* max number of command args */
 #define CONFIG_SYS_CBSIZE		256 /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index af81d25d917b01174e33976eb307e295502bbe4d..0f72fc430c7aff5188b7a486fb349181b5d6f568 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -393,7 +393,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_CLK
 CONFIG_CMD_CRAMFS
 CONFIG_CMD_DATE
 CONFIG_CMD_DEFAULTENV_VARS