diff --git a/litex/build/efinix/common.py b/litex/build/efinix/common.py
index b5c0b59af3..c6e997a772 100644
--- a/litex/build/efinix/common.py
+++ b/litex/build/efinix/common.py
@@ -35,13 +35,8 @@
 
 # Helpers ------------------------------------------------------------------------------------------
 
-def _to_signal(obj):
-    if isinstance(obj, str):
-        return ClockSignal(obj)
-    elif isinstance(obj, Signal):
-        return obj
-    else:
-        raise ValueError
+def assert_is_signal_or_clocksignal(obj):
+    assert isinstance(obj, (ClockSignal, Signal)), f"Object {obj} is not a ClockSignal or Signal"
 
 # Efinix AsyncResetSynchronizer --------------------------------------------------------------------
 
@@ -114,12 +109,13 @@ def lower(dr):
 
 class EfinixClkOutputImpl(Module):
     def __init__(self, platform, i, o):
+        assert_is_signal_or_clocksignal(i)
         block = {
             "type"       : "GPIO",
             "size"       : 1,
             "location"   : platform.get_pin_location(o)[0],
             "properties" : platform.get_pin_properties(o),
-            "name"       : _to_signal(i),
+            "name"       : i,
             "mode"       : "OUTPUT_CLK",
         }
         platform.toolchain.ifacewriter.blocks.append(block)
@@ -278,6 +274,7 @@ def lower(dr):
 class EfinixDDRTristateImpl(Module):
     def __init__(self, platform, io, o1, o2, oe1, oe2, i1, i2, clk):
         assert oe1 == oe2
+        assert_is_signal_or_clocksignal(clk)
         io_name = platform.get_pin_name(io)
         io_pad  = platform.get_pin_location(io)
         io_prop = platform.get_pin_properties(io)
@@ -300,9 +297,9 @@ def __init__(self, platform, io, o1, o2, oe1, oe2, i1, i2, clk):
             "properties"        : io_prop,
             "size"              : 1,
             "in_reg"            : "DDIO_RESYNC",
-            "in_clk_pin"        : _to_signal(clk),
+            "in_clk_pin"        : clk,
             "out_reg"           : "DDIO_RESYNC",
-            "out_clk_pin"       : _to_signal(clk),
+            "out_clk_pin"       : clk,
             "oe_reg"            : "REG",
             "is_inclk_inverted" : False,
             "drive_strength"    : io_prop_dict.get("DRIVE_STRENGTH", "4")
@@ -319,6 +316,7 @@ def lower(dr):
 
 class EfinixSDRTristateImpl(EfinixDDRTristateImpl):
     def __init__(self, platform, io, o, oe, i, clk):
+        assert_is_signal_or_clocksignal(clk)
         io_name = platform.get_pin_name(io)
         io_pad  = platform.get_pin_location(io)
         io_prop = platform.get_pin_properties(io)
@@ -337,9 +335,9 @@ def __init__(self, platform, io, o, oe, i, clk):
             "properties"        : io_prop,
             "size"              : 1,
             "in_reg"            : "REG",
-            "in_clk_pin"        : _to_signal(clk),
+            "in_clk_pin"        : clk,
             "out_reg"           : "REG",
-            "out_clk_pin"       : _to_signal(clk),
+            "out_clk_pin"       : clk,
             "oe_reg"            : "REG",
             "is_inclk_inverted" : False,
             "drive_strength"    : io_prop_dict.get("DRIVE_STRENGTH", "4")
@@ -357,6 +355,7 @@ def lower(dr):
 
 class EfinixSDROutputImpl(Module):
     def __init__(self, platform, i, o, clk):
+        assert_is_signal_or_clocksignal(clk)
         io_name = platform.get_pin_name(o)
         io_pad  = platform.get_pin_location(o)
         io_prop = platform.get_pin_properties(o)
@@ -371,7 +370,7 @@ def __init__(self, platform, i, o, clk):
             "properties"        : io_prop,
             "size"              : 1,
             "out_reg"           : "REG",
-            "out_clk_pin"       : _to_signal(clk),
+            "out_clk_pin"       : clk,
             "is_inclk_inverted" : False,
             "drive_strength"    : io_prop_dict.get("DRIVE_STRENGTH", "4")
         }
@@ -389,6 +388,7 @@ def lower(dr):
 
 class EfinixDDROutputImpl(Module):
     def __init__(self, platform, i1, i2, o, clk):
+        assert_is_signal_or_clocksignal(clk)
         io_name = platform.get_pin_name(o)
         io_pad  = platform.get_pin_location(o)
         io_prop = platform.get_pin_properties(o)
@@ -405,7 +405,7 @@ def __init__(self, platform, i1, i2, o, clk):
             "properties"        : io_prop,
             "size"              : 1,
             "out_reg"           : "DDIO_RESYNC",
-            "out_clk_pin"       : _to_signal(clk),
+            "out_clk_pin"       : clk,
             "is_inclk_inverted" : False,
             "drive_strength"    : io_prop_dict.get("DRIVE_STRENGTH", "4")
         }
@@ -421,6 +421,7 @@ def lower(dr):
 
 class EfinixDDRInputImpl(Module):
     def __init__(self, platform, i, o1, o2, clk):
+        assert_is_signal_or_clocksignal(clk)
         io_name   = platform.get_pin_name(i)
         io_pad    = platform.get_pin_location(i)
         io_prop   = platform.get_pin_properties(i)
@@ -436,7 +437,7 @@ def __init__(self, platform, i, o1, o2, clk):
             "properties"        : io_prop,
             "size"              : 1,
             "in_reg"            : "DDIO_RESYNC",
-            "in_clk_pin"        : _to_signal(clk),
+            "in_clk_pin"        : clk,
             "is_inclk_inverted" : False
         }
         platform.toolchain.ifacewriter.blocks.append(block)