Revert "clk: microchip: core: allow driver to be compiled with COMPILE_TEST"

This reverts commit 026d70dcfe5de1543bb8edb8e50d22dc16863e6b.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/drivers/clk/microchip/Kconfig b/drivers/clk/microchip/Kconfig
index 1e56a057319d97e20440fe4e107d26fa85c95ab1..1b9e43eb54976b219a0277cc971f353fd6af226a 100644 (file)
--- a/drivers/clk/microchip/Kconfig
+++ b/drivers/clk/microchip/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
 config COMMON_CLK_PIC32
-       def_bool (COMMON_CLK && MACH_PIC32) || COMPILE_TEST
+       def_bool COMMON_CLK && MACH_PIC32
 
 config MCHP_CLK_MPFS
        bool "Clk driver for PolarFire SoC"

diff --git a/drivers/clk/microchip/clk-core.c b/drivers/clk/microchip/clk-core.c
index ce3a24e061d145934c84843008efadc3b0e2cffa..891bec5fe1bedea826ff9c3bd4099c90e2528ff9 100644 (file)
--- a/drivers/clk/microchip/clk-core.c
+++ b/drivers/clk/microchip/clk-core.c
@@ -75,7 +75,6 @@
 /* SoC specific clock needed during SPLL clock rate switch */
 static struct clk_hw *pic32_sclk_hw;
 
-#ifdef CONFIG_MATCH_PIC32
 /* add instruction pipeline delay while CPU clock is in-transition. */
 #define cpu_nop5()                     \
 do {                                   \
@@ -85,9 +84,6 @@ do {                                  \
        __asm__ __volatile__("nop");    \
        __asm__ __volatile__("nop");    \
 } while (0)
-#else
-#define cpu_nop5()
-#endif
 
 /* Perpheral bus clocks */
 struct pic32_periph_clk {