From 31e6997e7037c05824763760058327a92129b63f Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 1 Jul 2020 12:58:48 +0200 Subject: [PATCH] sdcard: rename cd_sdcard to cd_sd to avoid unnecessary clock domain. --- litex_boards/targets/arty.py | 4 ++-- litex_boards/targets/logicbone.py | 6 +++--- litex_boards/targets/nexys4ddr.py | 4 ++-- litex_boards/targets/nexys_video.py | 4 ++-- litex_boards/targets/trellisboard.py | 6 +++--- litex_boards/targets/ulx3s.py | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/litex_boards/targets/arty.py b/litex_boards/targets/arty.py index 2dc0338b..df472467 100755 --- a/litex_boards/targets/arty.py +++ b/litex_boards/targets/arty.py @@ -31,7 +31,7 @@ class _CRG(Module): self.clock_domains.cd_sys4x_dqs = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() self.clock_domains.cd_eth = ClockDomain() - self.clock_domains.cd_sdcard = ClockDomain() + self.clock_domains.cd_sd = ClockDomain() # # # @@ -43,7 +43,7 @@ class _CRG(Module): pll.create_clkout(self.cd_sys4x_dqs, 4*sys_clk_freq, phase=90) pll.create_clkout(self.cd_clk200, 200e6) pll.create_clkout(self.cd_eth, 25e6) - pll.create_clkout(self.cd_sdcard, 10e6) + pll.create_clkout(self.cd_sd, 10e6) self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_clk200) diff --git a/litex_boards/targets/logicbone.py b/litex_boards/targets/logicbone.py index efc2f30b..8f656116 100755 --- a/litex_boards/targets/logicbone.py +++ b/litex_boards/targets/logicbone.py @@ -33,7 +33,7 @@ class _CRG(Module): self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys2x = ClockDomain() self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True) - self.clock_domains.cd_sdcard = ClockDomain() + self.clock_domains.cd_sd = ClockDomain() # # # @@ -57,7 +57,7 @@ class _CRG(Module): pll.register_clkin(clk25, 25e6) pll.create_clkout(self.cd_sys2x_i, 2*sys_clk_freq) pll.create_clkout(self.cd_init, 24e6) - pll.create_clkout(self.cd_sdcard, 10e6) + pll.create_clkout(self.cd_sd, 10e6) self.specials += [ Instance("ECLKBRIDGECS", i_CLK0 = self.cd_sys2x_i.clk, @@ -74,7 +74,7 @@ class _CRG(Module): i_RST = self.reset, o_CDIVX = self.cd_sys.clk), AsyncResetSynchronizer(self.cd_init, ~por_done | ~pll.locked), - AsyncResetSynchronizer(self.cd_sdcard, ~por_done | ~pll.locked), + AsyncResetSynchronizer(self.cd_sd , ~por_done | ~pll.locked), AsyncResetSynchronizer(self.cd_sys, ~por_done | ~pll.locked | self.reset), AsyncResetSynchronizer(self.cd_sys2x, ~por_done | ~pll.locked | self.reset), ] diff --git a/litex_boards/targets/nexys4ddr.py b/litex_boards/targets/nexys4ddr.py index 32e8fde2..05db98ca 100755 --- a/litex_boards/targets/nexys4ddr.py +++ b/litex_boards/targets/nexys4ddr.py @@ -30,7 +30,7 @@ class _CRG(Module): self.clock_domains.cd_sys2x_dqs = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() self.clock_domains.cd_eth = ClockDomain() - self.clock_domains.cd_sdcard = ClockDomain() + self.clock_domains.cd_sd = ClockDomain() # # # @@ -42,7 +42,7 @@ class _CRG(Module): pll.create_clkout(self.cd_sys2x_dqs, 2*sys_clk_freq, phase=90) pll.create_clkout(self.cd_clk200, 200e6) pll.create_clkout(self.cd_eth, 50e6) - pll.create_clkout(self.cd_sdcard, 10e6) + pll.create_clkout(self.cd_sd, 10e6) self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_clk200) diff --git a/litex_boards/targets/nexys_video.py b/litex_boards/targets/nexys_video.py index b267e3cd..1d01704b 100755 --- a/litex_boards/targets/nexys_video.py +++ b/litex_boards/targets/nexys_video.py @@ -30,7 +30,7 @@ class _CRG(Module): self.clock_domains.cd_sys4x_dqs = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() self.clock_domains.cd_clk100 = ClockDomain() - self.clock_domains.cd_sdcard = ClockDomain() + self.clock_domains.cd_sd = ClockDomain() # # # @@ -42,7 +42,7 @@ class _CRG(Module): pll.create_clkout(self.cd_sys4x_dqs, 4*sys_clk_freq, phase=90) pll.create_clkout(self.cd_clk200, 200e6) pll.create_clkout(self.cd_clk100, 100e6) - pll.create_clkout(self.cd_sdcard, 10e6) + pll.create_clkout(self.cd_sd, 10e6) self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_clk200) diff --git a/litex_boards/targets/trellisboard.py b/litex_boards/targets/trellisboard.py index a0c49383..39383e1a 100755 --- a/litex_boards/targets/trellisboard.py +++ b/litex_boards/targets/trellisboard.py @@ -33,7 +33,7 @@ class _CRG(Module): self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys2x = ClockDomain() self.clock_domains.cd_sys2x_i = ClockDomain(reset_less=True) - self.clock_domains.cd_sdcard = ClockDomain() + self.clock_domains.cd_sd = ClockDomain() # # # @@ -57,7 +57,7 @@ class _CRG(Module): pll.register_clkin(clk12, 12e6) pll.create_clkout(self.cd_sys2x_i, 2*sys_clk_freq) pll.create_clkout(self.cd_init, 25e6) - pll.create_clkout(self.cd_sdcard, 10e6) + pll.create_clkout(self.cd_sd, 16e6) self.specials += [ Instance("ECLKBRIDGECS", i_CLK0 = self.cd_sys2x_i.clk, @@ -75,7 +75,7 @@ class _CRG(Module): i_RST = self.reset, o_CDIVX = self.cd_sys.clk), AsyncResetSynchronizer(self.cd_init, ~por_done | ~pll.locked | rst), - AsyncResetSynchronizer(self.cd_sdcard, ~por_done | ~pll.locked | rst), + AsyncResetSynchronizer(self.cd_sd, ~por_done | ~pll.locked | rst), AsyncResetSynchronizer(self.cd_sys, ~por_done | ~pll.locked | rst | self.reset), AsyncResetSynchronizer(self.cd_sys2x, ~por_done | ~pll.locked | rst | self.reset), ] diff --git a/litex_boards/targets/ulx3s.py b/litex_boards/targets/ulx3s.py index 3a4b3222..2c0be93e 100755 --- a/litex_boards/targets/ulx3s.py +++ b/litex_boards/targets/ulx3s.py @@ -32,7 +32,7 @@ class _CRG(Module): def __init__(self, platform, sys_clk_freq, with_usb_pll=False): self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys_ps = ClockDomain(reset_less=True) - self.clock_domains.cd_sdcard = ClockDomain() + self.clock_domains.cd_sd = ClockDomain() # # # @@ -46,9 +46,9 @@ class _CRG(Module): pll.register_clkin(clk25, 25e6) pll.create_clkout(self.cd_sys, sys_clk_freq) pll.create_clkout(self.cd_sys_ps, sys_clk_freq, phase=90) - pll.create_clkout(self.cd_sdcard, 10e6) + pll.create_clkout(self.cd_sd, 10e6) self.specials += AsyncResetSynchronizer(self.cd_sys, ~pll.locked | rst) - self.specials += AsyncResetSynchronizer(self.cd_sdcard, ~pll.locked | rst) + self.specials += AsyncResetSynchronizer(self.cd_sd, ~pll.locked | rst) # USB PLL if with_usb_pll: