ADC: Use 65MHz sampling rate

diff --git a/ADC/config.vhd b/ADC/config.vhd
index 11086202730fbf524224997253d5b2e3daa0e869..abb7dea04d56568398b027e8e6fdcbdcd66fec35 100644 (file)
--- a/ADC/config.vhd
+++ b/ADC/config.vhd
@@ -24,8 +24,8 @@ package config is
     constant INIT_ADDRESS           : std_logic_vector := x"F30a";
     constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"4b";
    
---ADC sampling frequency (only 40 MHz supported a.t.m.)
-    constant ADC_SAMPLING_RATE      : integer := 40;
+--ADC sampling frequency: 40 or 65 MHz supported
+    constant ADC_SAMPLING_RATE      : integer := 65;
     
 --These are currently used for the included features table only
     constant ADC_PROCESSING_TYPE    : integer := 0;

diff --git a/ADC/source/adc_ad9219.vhd b/ADC/source/adc_ad9219.vhd
index 3a1d16b4f3f75585b4585609cfcce9fe2fe2d12f..54d52e60e7b86a3c02fd60bbe2f4c9034089d4e2 100644 (file)
--- a/ADC/source/adc_ad9219.vhd
+++ b/ADC/source/adc_ad9219.vhd
@@ -6,6 +6,7 @@ library work;
 use work.trb_net_std.all;
 use work.trb3_components.all;
 use work.adc_package.all;
+use work.config.all;
 
 entity adc_ad9219 is
   generic(
@@ -63,12 +64,24 @@ signal lock            : std_logic_vector(1 downto 0);
 
 begin
 
+gen_40MHz : if ADC_SAMPLING_RATE = 40 generate
   THE_ADC_REF : entity work.pll_in200_out40
     port map(
       CLK   => CLK_ADCRAW,
       CLKOP => ADCCLK_OUT,
       LOCK  => lock(0)
       );
+end generate;
+
+gen_65MHz : if ADC_SAMPLING_RATE = 65 generate
+  THE_ADC_REF : entity work.pll_in200_out65
+    port map(
+      CLK   => CLK_ADCRAW,
+      CLKOP => ADCCLK_OUT,
+      LOCK  => lock(0)
+      );
+end generate;
+
 
   THE_ADC_PLL_0 : entity work.pll_adc10bit
     port map(