Remove PLL from calibration clock source

diff --git a/releases/tdc_v2.3/trb3_periph_32PinAddOn.vhd b/releases/tdc_v2.3/trb3_periph_32PinAddOn.vhd
index e9d68ed8d1f0bd4c2c725d1a51d1d0b0be338a1a..3a9ca8d0a393e6f4176e9e9900ee6c6695bb612a 100644 (file)
--- a/releases/tdc_v2.3/trb3_periph_32PinAddOn.vhd
+++ b/releases/tdc_v2.3/trb3_periph_32PinAddOn.vhd
@@ -93,7 +93,6 @@ architecture trb3_periph_32PinAddOn_arch of trb3_periph_32PinAddOn is
   --Clock / Reset
   signal clk_100_i                : std_logic;  --clock for main logic, 100 MHz, via Clock Manager and internal PLL
   signal clk_200_i                : std_logic;  --clock for logic at 200 MHz, via Clock Manager and bypassed PLL
-  signal osc_int                  : std_logic;  -- clock for calibrating the tdc, 2.5 MHz, via internal osscilator
   signal pll_lock                 : std_logic;  --Internal PLL locked. E.g. used to reset all internal logic.
   signal clear_i                  : std_logic;
   signal reset_i                  : std_logic;
@@ -166,11 +165,6 @@ begin
       LOCK  => pll_lock
       );
 
-  pll_calibration : entity work.pll_in125_out33
-    port map (
-      CLK   => CLK_GPLL_LEFT,
-      CLKOP => osc_int,
-      LOCK  => open);
 
 ---------------------------------------------------------------------------
 -- The TrbNet media interface (to other FPGA)
@@ -408,7 +402,7 @@ begin
       CLK_READOUT        => clk_100_i,  -- Clock for the readout
       REFERENCE_TIME     => timing_trg_received_i,  -- Reference time input
       HIT_IN             => hit_in_i(NUM_TDC_CHANNELS-1 downto 1),  -- Channel start signals
-      HIT_CAL_IN         => osc_int,    -- Hits for calibrating the TDC
+      HIT_CAL_IN         => CLK_GPLL_LEFT,    -- Hits for calibrating the TDC
       -- Trigger signals from handler
       BUSRDO_RX          => readout_rx,
       BUSRDO_TX          => readout_tx(0),

diff --git a/releases/tdc_v2.3/trb3_periph_ADA.vhd b/releases/tdc_v2.3/trb3_periph_ADA.vhd
index 6d03c533d0f635628f486827d19a2690956ddf8c..84074a45570efd9af7a2d3e0a85c523dee5c1da6 100644 (file)
--- a/releases/tdc_v2.3/trb3_periph_ADA.vhd
+++ b/releases/tdc_v2.3/trb3_periph_ADA.vhd
@@ -104,7 +104,6 @@ architecture trb3_periph_ADA_arch of trb3_periph_ADA is
   signal clk_100_i                : std_logic;  --clock for main logic, 100 MHz, via Clock Manager and internal PLL
   signal clk_200_i                : std_logic;  --clock for logic at 200 MHz, via Clock Manager and bypassed PLL
   signal clk_20                   : std_logic;  --clock for calibration at 20 MHz, via PLL
-  signal osc_int                  : std_logic;  --clock for calibration at 20 MHz, via internal osscilator
   signal pll_lock                 : std_logic;  --Internal PLL locked. E.g. used to reset all internal logic.
   signal clear_i                  : std_logic;
   signal reset_i                  : std_logic;
@@ -185,17 +184,6 @@ begin
       LOCK  => pll_lock);
 
 
-  --pll_calibration: entity work.pll_in125_out100
-  --  port map (
-  --    CLK   => CLK_GPLL_LEFT,
-  --    CLKOP => osc_int,
-  --    LOCK  => open);
-  
-  pll_calibration: entity work.pll_in125_out33
-    port map (
-      CLK   => CLK_GPLL_LEFT,
-      CLKOP => osc_int,
-      LOCK  => open);
 
 ---------------------------------------------------------------------------
 -- The TrbNet media interface (to other FPGA)
@@ -425,7 +413,7 @@ begin
       CLK_READOUT        => clk_100_i,  -- Clock for the readout
       REFERENCE_TIME     => timing_trg_received_i,  -- Reference time input
       HIT_IN             => hit_in_i(NUM_TDC_CHANNELS-1 downto 1),  -- Channel start signals
-      HIT_CAL_IN         => osc_int,    -- Hits for calibrating the TDC
+      HIT_CAL_IN         => CLK_GPLL_LEFT,    -- Hits for calibrating the TDC
       -- Trigger signals from handler
       BUSRDO_RX          => readout_rx,
       BUSRDO_TX          => readout_tx(0),

diff --git a/releases/tdc_v2.3/trb3_periph_gpin.vhd b/releases/tdc_v2.3/trb3_periph_gpin.vhd
index a18d5542e051b2d19f5358a045c14d3584c1f698..d6c13b22259f12283d3dcd60856a3d24470b7063 100644 (file)
--- a/releases/tdc_v2.3/trb3_periph_gpin.vhd
+++ b/releases/tdc_v2.3/trb3_periph_gpin.vhd
@@ -95,7 +95,6 @@ architecture trb3_periph_gpin_arch of trb3_periph_gpin is
   --Clock / Reset
   signal clk_100_i                : std_logic;  --clock for main logic, 100 MHz, via Clock Manager and internal PLL
   signal clk_200_i                : std_logic;  --clock for logic at 200 MHz, via Clock Manager and bypassed PLL
-  signal clk_cal                  : std_logic;  -- clock for calibrating the tdc, 2.5 MHz, via internal osscilator
   signal pll_lock                 : std_logic;  --Internal PLL locked. E.g. used to reset all internal logic.
   signal clear_i                  : std_logic;
   signal reset_i                  : std_logic;
@@ -243,11 +242,6 @@ begin
       LOCK  => pll_lock
       );
 
-  pll_calibration : entity work.pll_in125_out33
-    port map (
-      CLK   => CLK_GPLL_LEFT,
-      CLKOP => clk_cal,
-      LOCK  => open);
 
 ---------------------------------------------------------------------------
 -- The TrbNet media interface (to other FPGA)
@@ -662,7 +656,7 @@ begin
       CLK_READOUT        => clk_100_i,  -- Clock for the readout
       REFERENCE_TIME     => timing_trg_received_i,  -- Reference time input
       HIT_IN             => hit_in_i(NUM_TDC_CHANNELS-1 downto 1),  -- Channel start signals
-      HIT_CAL_IN         => clk_cal,    -- Hits for calibrating the TDC
+      HIT_CAL_IN         => CLK_GPLL_LEFT,    -- Hits for calibrating the TDC
       -- Trigger signals from handler
       BUSRDO_RX          => readout_rx,
       BUSRDO_TX          => readout_tx(0),

diff --git a/releases/tdc_v2.3/trb3_periph_padiwa.vhd b/releases/tdc_v2.3/trb3_periph_padiwa.vhd
index d02e5010f39ee8417cd5e06c9337018f6d56a15d..569c98e785a8dcecae32503085bd79b6b8837eb4 100644 (file)
--- a/releases/tdc_v2.3/trb3_periph_padiwa.vhd
+++ b/releases/tdc_v2.3/trb3_periph_padiwa.vhd
@@ -104,7 +104,6 @@ architecture trb3_periph_padiwa_arch of trb3_periph_padiwa is
   --Clock / Reset
   signal clk_100_i                   : std_logic;  --clock for main logic, 100 MHz, via Clock Manager and internal PLL
   signal clk_200_i                   : std_logic;  --clock for logic at 200 MHz, via Clock Manager and bypassed PLL
-  signal osc_int                     : std_logic;  -- clock for calibrating the tdc, 2.5 MHz, via internal osscilator
   signal pll_lock                    : std_logic;  --Internal PLL locked. E.g. used to reset all internal logic.
   signal clear_i                     : std_logic;
   signal reset_i                     : std_logic;
@@ -268,11 +267,6 @@ begin
       LOCK  => pll_lock
       );
 
-  pll_calibration: entity work.pll_in125_out33
-    port map (
-      CLK   => CLK_GPLL_LEFT,
-      CLKOP => osc_int,
-      LOCK  => open);
 
   gen_sync_clocks : if SYNC_MODE = c_YES generate
     clk_100_i <= rx_clock_100;
@@ -726,7 +720,7 @@ begin
       CLK_READOUT        => clk_100_i,  -- Clock for the readout
       REFERENCE_TIME     => timing_trg_received_i,  -- Reference time input
       HIT_IN             => hit_in_i(NUM_TDC_CHANNELS-1 downto 1),  -- Channel start signals
-      HIT_CAL_IN         => osc_int,    -- Hits for calibrating the TDC
+      HIT_CAL_IN         => CLK_GPLL_LEFT,    -- Hits for calibrating the TDC
       -- Trigger signals from handler
       BUSRDO_RX          => readout_rx,
       BUSRDO_TX          => readout_tx(0),