diff --git a/targets/atlys_base.py b/targets/atlys_base.py
index e5da0881..952776ea 100644
--- a/targets/atlys_base.py
+++ b/targets/atlys_base.py
@@ -131,7 +131,7 @@ class BaseSoC(SDRAMSoC):
 
     csr_peripherals = (
         "ddrphy",
-        "dna"
+        "dna",
     )
     csr_map_update(SDRAMSoC.csr_map, csr_peripherals)
 
diff --git a/targets/atlys_edid_debug.py b/targets/atlys_edid_debug.py
index f032fad4..86483731 100644
--- a/targets/atlys_edid_debug.py
+++ b/targets/atlys_edid_debug.py
@@ -27,7 +27,7 @@ def __init__(self):
 
 class EDIDDebugSoC(VideomixerSoC):
     csr_peripherals = (
-        "logic_analyzer"
+        "logic_analyzer",
     )
     csr_map_update(VideomixerSoC.csr_map, csr_peripherals)
 
diff --git a/targets/atlys_hdmi2eth.py b/targets/atlys_hdmi2eth.py
index 3364bddf..fa30c842 100644
--- a/targets/atlys_hdmi2eth.py
+++ b/targets/atlys_hdmi2eth.py
@@ -59,7 +59,7 @@ class VideomixerSoC(EtherboneSoC):
         "hdmi_in0",
         "hdmi_in0_edid_mem",
         "hdmi_in1",
-        "hdmi_in1_edid_mem"
+        "hdmi_in1_edid_mem",
     )
     csr_map_update(EtherboneSoC.csr_map, csr_peripherals)
 
@@ -103,7 +103,7 @@ def __init__(self, platform, **kwargs):
 class HDMI2ETHSoC(VideomixerSoC):
     csr_peripherals = (
         "encoder_reader",
-        "encoder"
+        "encoder",
     )
     csr_map_update(VideomixerSoC.csr_map, csr_peripherals)
     mem_map = {
diff --git a/targets/atlys_hdmi2usb.py b/targets/atlys_hdmi2usb.py
index d823bf83..ddf89fd5 100644
--- a/targets/atlys_hdmi2usb.py
+++ b/targets/atlys_hdmi2usb.py
@@ -13,7 +13,7 @@ class VideomixerSoC(BaseSoC):
         "hdmi_in0",
         "hdmi_in0_edid_mem",
         "hdmi_in1",
-        "hdmi_in1_edid_mem"
+        "hdmi_in1_edid_mem",
     )
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
@@ -57,7 +57,7 @@ def __init__(self, platform, **kwargs):
 class HDMI2USBSoC(VideomixerSoC):
     csr_peripherals = (
         "encoder_reader",
-        "encoder"
+        "encoder",
     )
     csr_map_update(VideomixerSoC.csr_map, csr_peripherals)
     mem_map = {
diff --git a/targets/opsis_base.py b/targets/opsis_base.py
index 2d1e6d51..77d23a2b 100644
--- a/targets/opsis_base.py
+++ b/targets/opsis_base.py
@@ -153,7 +153,7 @@ class BaseSoC(SDRAMSoC):
         "fx2_reset",
         "fx2_hack",
 #        "opsis_eeprom_i2c",
-        "tofe_eeprom_i2c"
+        "tofe_eeprom_i2c",
     )
     csr_map_update(SDRAMSoC.csr_map, csr_peripherals)
 
@@ -205,7 +205,7 @@ def __init__(self, platform,
 class MiniSoC(BaseSoC):
     csr_peripherals = (
         "ethphy",
-        "ethmac"
+        "ethmac",
     )
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
diff --git a/targets/opsis_hdmi2usb.py b/targets/opsis_hdmi2usb.py
index c47fe544..b67bf16e 100644
--- a/targets/opsis_hdmi2usb.py
+++ b/targets/opsis_hdmi2usb.py
@@ -7,15 +7,15 @@
 from gateware.streamer import USBStreamer
 
 class VideomixerSoC(BaseSoC):
-    csr_map = {
-        "hdmi_out0":         21,
-        "hdmi_out1":         22,
-        "hdmi_in0":          23,
-        "hdmi_in0_edid_mem": 24,
-        "hdmi_in1":          25,
-        "hdmi_in1_edid_mem": 26,
-    }
-    csr_map.update(BaseSoC.csr_map)
+    csr_peripherals = (
+        "hdmi_out0",
+        "hdmi_out1",
+        "hdmi_in0",
+        "hdmi_in0_edid_mem",
+        "hdmi_in1",
+        "hdmi_in1_edid_mem",
+    )
+    csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
         "hdmi_in0": 3,
@@ -57,7 +57,7 @@ def __init__(self, platform, **kwargs):
 class HDMI2USBSoC(VideomixerSoC):
     csr_peripherals = (
         "encoder_reader",
-        "encoder"
+        "encoder",
     )
     csr_map_update(VideomixerSoC.csr_map, csr_peripherals)
     mem_map = {
diff --git a/targets/pipistrello_base.py b/targets/pipistrello_base.py
index 61a0c013..127e8880 100644
--- a/targets/pipistrello_base.py
+++ b/targets/pipistrello_base.py
@@ -137,7 +137,7 @@ class BaseSoC(SDRAMSoC):
         "ddrphy",
         "dna",
         "fx2_reset",
-        "fx2_hack"
+        "fx2_hack",
     )
     csr_map_update(SDRAMSoC.csr_map, csr_peripherals)
 
@@ -195,7 +195,7 @@ def __init__(self, platform, clk_freq=(83 + Fraction(1, 3))*1000*1000,
 class VideomixerSoC(BaseSoC):
 
     csr_peripherals = (
-        "hdmi_out0"
+        "hdmi_out0",
     )
     csr_map_update(BaseSoC.csr_map, csr_peripherals)