Merge branch 'usrp_e100_devel' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e100_devel

2 files changed, 106 insertions, 96 deletions

diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt
index 1330aed75..96842a684 100644
--- a/host/usrp_e_utils/CMakeLists.txt
+++ b/host/usrp_e_utils/CMakeLists.txt
@@ -28,6 +28,7 @@ IF(ENABLE_USRP_E_UTILS)
     ENABLE_LANGUAGE(C)
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100)
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/include)
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/lib/ic_reg_maps)
 
     SET(usrp_e_utils_sources
         fpga-downloader.cpp
diff --git a/host/usrp_e_utils/clkgen-config.cpp b/host/usrp_e_utils/clkgen-config.cpp
index e8279b4ae..8d29efff1 100644
--- a/host/usrp_e_utils/clkgen-config.cpp
+++ b/host/usrp_e_utils/clkgen-config.cpp
@@ -30,97 +30,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include "ad9522_regs.hpp"
 
 #include <linux/spi/spidev.h>
 
 
-// Programming data for clock gen chip
-static const unsigned int config_data[] = {
-	0x000024,
-	0x023201,
-	0x000081,
-	0x000400,
-	0x00104c,
-	0x001101,
-	0x001200,
-	0x001300,
-	0x001414,
-	0x001500,
-	0x001604,
-	0x001704,
-	0x001807,
-	0x001900,
-	//0x001a00,//for debug
-	0x001a32,
-	0x001b12,
-	0x001c44,
-	0x001d00,
-	0x001e00,
-	0x00f062,
-	0x00f162,
-	0x00f262,
-	0x00f362,
-	0x00f462,
-	0x00f562,
-	0x00f662,
-	0x00f762,
-	0x00f862,
-	0x00f962,
-	0x00fa62,
-	0x00fb62,
-	0x00fc00,
-	0x00fd00,
-	0x019021,
-	0x019100,
-	0x019200,
-	0x019333,
-	0x019400,
-	0x019500,
-	0x019611,
-	0x019700,
-	0x019800,
-	0x019900,
-	0x019a00,
-	0x019b00,
-	0x01e003,
-	0x01e102,
-	0x023000,
-	0x023201,
-	0x0b0201,
-	0x0b0300,
-	0x001fff,
-	0x0a0000,
-	0x0a0100,
-	0x0a0200,
-	0x0a0302,
-	0x0a0400,
-	0x0a0504,
-	0x0a060e,
-	0x0a0700,
-	0x0a0810,
-	0x0a090e,
-	0x0a0a00,
-	0x0a0bf0,
-	0x0a0c0b,
-	0x0a0d01,
-	0x0a0e90,
-	0x0a0f01,
-	0x0a1001,
-	0x0a11e0,
-	0x0a1201,
-	0x0a1302,
-	0x0a1430,
-	0x0a1580,
-	0x0a16ff,
-	0x023201,
-	0x0b0301,
-	0x023201,
-};
-
-
 const unsigned int CLKGEN_SELECT = 145;
 
-
 enum gpio_direction {IN, OUT};
 
 class gpio {
@@ -271,26 +187,119 @@ void spidev::send(char *buf, char *rbuf, unsigned int nbytes)
 
 }
 
-static void send_config_to_clkgen(gpio &chip_select, const unsigned int data[], unsigned int data_size)
+static void spi_write_word(spidev spi, gpio &chip_select, const unsigned int addr, const unsigned char data) {
+	unsigned char out_data[3], in_data[3];
+    unsigned char rw_w1_w0 = 0; //write one byte
+    out_data[0] = (rw_w1_w0 << 5) | (addr >> 8);
+    out_data[1] = addr & 0xff;
+    out_data[2] = data;
+	
+	chip_select.set_value(0);
+	spi.send((char *)out_data, (char *)in_data, 4);
+	chip_select.set_value(1);
+}
+
+static void send_config_to_clkgen(gpio &chip_select)
 {
 	spidev spi("/dev/spidev1.0");
-	unsigned int rbuf;
 
-	for (unsigned int i = 0; i < data_size; i++) {
+	//do a soft reset
+    spi_write_word(spi, chip_select, 0x000, 1 << 5 | 1 << 2);
+    spi_write_word(spi, chip_select, 0x232, 0x1);
+
+    // init some registers;
+    ad9522_regs_t ad9522_regs;
+    ad9522_regs.sdo_active = ad9522_regs_t::SDO_ACTIVE_SDO_SDIO; //use sdo and sdi
+    ad9522_regs.mirror = 1; //mirror sdo active
+    ad9522_regs.io_update = 1; //latch the registers
+    ad9522_regs.status_pin_control = 0x1; //n divider
+    ad9522_regs.ld_pin_control = 0x32; //show ref2
+    ad9522_regs.refmon_pin_control = 0x12; //show ref2
+    ad9522_regs.enb_stat_eeprom_at_stat_pin = 0; //use status pin as debug
+
+    ad9522_regs.enable_ref2 = 0x1;
+    ad9522_regs.enable_ref1 = 0x0;
+    ad9522_regs.select_ref = ad9522_regs_t::SELECT_REF_REF2;
+
+    ad9522_regs.set_r_counter(1);
+    ad9522_regs.a_counter = 0;
+    ad9522_regs.set_b_counter(20);
+    ad9522_regs.prescaler_p = ad9522_regs_t::PRESCALER_P_DIV8_9;
+
+    ad9522_regs.pll_power_down = ad9522_regs_t::PLL_POWER_DOWN_NORMAL; //normal mode
+    ad9522_regs.cp_current = ad9522_regs_t::CP_CURRENT_1_2MA;
+
+    ad9522_regs.vco_calibration_now = 1; //calibrate it!
+    ad9522_regs.vco_divider = ad9522_regs_t::VCO_DIVIDER_DIV5;
+    ad9522_regs.select_vco_or_clock = ad9522_regs_t::SELECT_VCO_OR_CLOCK_VCO;
+
+    ad9522_regs.out0_format = ad9522_regs_t::OUT0_FORMAT_LVDS;
+    ad9522_regs.divider0_low_cycles = 2; //3 low
+    ad9522_regs.divider0_high_cycles = 1; //2 high
+    ad9522_regs.divider1_low_cycles = 2; //3 low
+    ad9522_regs.divider1_high_cycles = 1; //2 high
+
+    ad9522_regs.enable_eeprom_write = 1;
+
+    //write the registers
+    int reg_list[] = 			{0, 4, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+                                 25, 26, 27, 28, 29, 30, 240, 241, 242, 243,
+                                 244, 245, 246, 247, 248, 249, 250, 251, 252,
+                                 253, 400, 401, 402, 403, 404, 405, 406, 407,
+                                 408, 409, 410, 411, 480, 481, 560, 562, 2818,
+                                 2819};
+                                 
+    for(int i=0; i<49; i++) { //blame std::vector for this (no static initialization bs)
+		spi_write_word(spi, chip_select, reg_list[i], ad9522_regs.get_reg(reg_list[i]));
+	}
+
+    sleep(1);
+
+    if (1){//write settings to eeprom
+
+        //load the register buffs
+        spi_write_word(spi, chip_select, 0xa00, 0x0);
+        spi_write_word(spi, chip_select, 0xa01, 0x0);
+        spi_write_word(spi, chip_select, 0xa02, 0x0);
+        spi_write_word(spi, chip_select, 0xa03, 0x2);
+        spi_write_word(spi, chip_select, 0xa04, 0x0);
+        spi_write_word(spi, chip_select, 0xa05, 0x4);
+        spi_write_word(spi, chip_select, 0xa06, 0xe);
+        spi_write_word(spi, chip_select, 0xa07, 0x0);
+        spi_write_word(spi, chip_select, 0xa08, 0x10);
+        spi_write_word(spi, chip_select, 0xa09, 0xe);
+        spi_write_word(spi, chip_select, 0xa0a, 0x0);
+        spi_write_word(spi, chip_select, 0xa0b, 0xf0);
+        spi_write_word(spi, chip_select, 0xa0c, 0xb);
+        spi_write_word(spi, chip_select, 0xa0d, 0x1);
+        spi_write_word(spi, chip_select, 0xa0e, 0x90);
+        spi_write_word(spi, chip_select, 0xa0f, 0x1);
+        spi_write_word(spi, chip_select, 0xa10, 0x1);
+        spi_write_word(spi, chip_select, 0xa11, 0xe0);
+        spi_write_word(spi, chip_select, 0xa12, 0x1);
+        spi_write_word(spi, chip_select, 0xa13, 0x2);
+        spi_write_word(spi, chip_select, 0xa14, 0x30);
+        spi_write_word(spi, chip_select, 0xa15, 0x80);
+        spi_write_word(spi, chip_select, 0xa16, 0xff);
+
+        spi_write_word(spi, chip_select, 0x232, 0x01); //latch
+        sleep(1);
+        ////////////////////////////////////////////////////////////////
+        
+        ad9522_regs.reg2eeprom = 1;
+        //write to eeprom
+        spi_write_word(spi, chip_select, 0xB03, ad9522_regs.get_reg(0xB03));
+        //io update
+        spi_write_word(spi, chip_select, 0x232, ad9522_regs.get_reg(0x232)); //latch
+        sleep(1);
+    }
 
-		std::cout << "sending " << std::hex << data[i] << std::endl;
-		chip_select.set_value(0);
-		spi.send((char *)&data[i], (char *)&rbuf, 4);
-		chip_select.set_value(1);
-
-	};
 }
 
 int main(int argc, char *argv[])
 {
-
 	gpio clkgen_select(CLKGEN_SELECT, OUT, true);
 
-	send_config_to_clkgen(clkgen_select, config_data, sizeof(config_data)/sizeof(unsigned int));
+	send_config_to_clkgen(clkgen_select);
 }