From 03c83b59bf735e54a1547e1401217698c2cace24 Mon Sep 17 00:00:00 2001
From: dbogdan <dragos.bogdan@analog.com>
Date: Wed, 17 Aug 2016 19:03:53 +0300
Subject: [PATCH] adrv9371x/a10soc: Export axi_ad9371_s and xcvr_reconfig_avmm

---
 projects/adrv9371x/a10soc/system_bd.qsys    | 38 +++++++++++++++++++--
 projects/adrv9371x/common/adrv9371x_bd.qsys | 25 ++++++++++++--
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/projects/adrv9371x/a10soc/system_bd.qsys b/projects/adrv9371x/a10soc/system_bd.qsys
index a900e1ab1..beb1b1e66 100644
--- a/projects/adrv9371x/a10soc/system_bd.qsys
+++ b/projects/adrv9371x/a10soc/system_bd.qsys
@@ -73,6 +73,14 @@
          type = "String";
       }
    }
+   element adrv9371x.avl_rx_xcvr_reconfig_avmm
+   {
+      datum baseAddress
+      {
+         value = "229376";
+         type = "String";
+      }
+   }
    element adrv9371x.avl_spi
    {
       datum baseAddress
@@ -105,6 +113,14 @@
          type = "String";
       }
    }
+   element adrv9371x.axi_ad9371_s
+   {
+      datum baseAddress
+      {
+         value = "262144";
+         type = "String";
+      }
+   }
    element adrv9371x.axi_adc_dma_s
    {
       datum baseAddress
@@ -480,8 +496,8 @@
   <parameter name="AUTO_SYS_CLK_CLOCK_DOMAIN" value="5" />
   <parameter name="AUTO_SYS_CLK_CLOCK_RATE" value="100000000" />
   <parameter name="AUTO_SYS_CLK_RESET_DOMAIN" value="5" />
-  <parameter name="AUTO_SYS_CPU_M_AVL_ADDRESS_MAP"><![CDATA[<address-map><slave name='adrv9371x_axi_os_jesd_xcvr.s_axi' start='0x0' end='0x10000' /><slave name='adrv9371x_axi_jesd_xcvr.s_axi' start='0x10000' end='0x20000' /><slave name='adrv9371x_axi_dac_dma.s_axi' start='0x20000' end='0x24000' /><slave name='adrv9371x_axi_os_adc_dma.s_axi' start='0x24000' end='0x28000' /><slave name='adrv9371x_axi_adc_dma.s_axi' start='0x28000' end='0x2C000' /><slave name='adrv9371x_xcvr_tx_lane_pll.reconfig_avmm0' start='0x34000' end='0x35000' /><slave name='adrv9371x_xcvr_pll_reconfig.mgmt_avalon_slave' start='0x35000' end='0x35800' /><slave name='adrv9371x_xcvr_tx_core.jesd204_tx_avs' start='0x35800' end='0x35C00' /><slave name='adrv9371x_xcvr_rx_os_core.jesd204_rx_avs' start='0x35C00' end='0x36000' /><slave name='adrv9371x_xcvr_rx_core.jesd204_rx_avs' start='0x36000' end='0x36400' /><slave name='adrv9371x_ad9371_gpio.s1' start='0x36400' end='0x36420' /><slave name='adrv9371x_gpio_i.s1' start='0x36500' end='0x36510' /><slave name='adrv9371x_gpio_o.s1' start='0x36600' end='0x36620' /><slave name='adrv9371x_spi.spi_control_port' start='0x36700' end='0x36720' /></address-map>]]></parameter>
-  <parameter name="AUTO_SYS_CPU_M_AVL_ADDRESS_WIDTH" value="AddressWidth = 18" />
+  <parameter name="AUTO_SYS_CPU_M_AVL_ADDRESS_MAP"><![CDATA[<address-map><slave name='adrv9371x_axi_os_jesd_xcvr.s_axi' start='0x0' end='0x10000' /><slave name='adrv9371x_axi_jesd_xcvr.s_axi' start='0x10000' end='0x20000' /><slave name='adrv9371x_axi_dac_dma.s_axi' start='0x20000' end='0x24000' /><slave name='adrv9371x_axi_os_adc_dma.s_axi' start='0x24000' end='0x28000' /><slave name='adrv9371x_axi_adc_dma.s_axi' start='0x28000' end='0x2C000' /><slave name='adrv9371x_xcvr_tx_lane_pll.reconfig_avmm0' start='0x34000' end='0x35000' /><slave name='adrv9371x_xcvr_pll_reconfig.mgmt_avalon_slave' start='0x35000' end='0x35800' /><slave name='adrv9371x_xcvr_tx_core.jesd204_tx_avs' start='0x35800' end='0x35C00' /><slave name='adrv9371x_xcvr_rx_os_core.jesd204_rx_avs' start='0x35C00' end='0x36000' /><slave name='adrv9371x_xcvr_rx_core.jesd204_rx_avs' start='0x36000' end='0x36400' /><slave name='adrv9371x_ad9371_gpio.s1' start='0x36400' end='0x36420' /><slave name='adrv9371x_gpio_i.s1' start='0x36500' end='0x36510' /><slave name='adrv9371x_gpio_o.s1' start='0x36600' end='0x36620' /><slave name='adrv9371x_spi.spi_control_port' start='0x36700' end='0x36720' /><slave name='adrv9371x_xcvr_rx_core.reconfig_avmm' start='0x38000' end='0x3A000' /><slave name='adrv9371x_axi_ad9371.s_axi' start='0x40000' end='0x50000' /></address-map>]]></parameter>
+  <parameter name="AUTO_SYS_CPU_M_AVL_ADDRESS_WIDTH" value="AddressWidth = 19" />
   <parameter name="AUTO_UNIQUE_ID" value="$${FILENAME}_a10soc" />
  </module>
  <module name="adrv9371x" kind="adrv9371x_bd" version="1.0" enabled="1">
@@ -581,6 +597,15 @@
   <parameter name="baseAddress" value="0x00035c00" />
   <parameter name="defaultConnection" value="false" />
  </connection>
+ <connection
+   kind="avalon"
+   version="15.1"
+   start="a10soc.sys_cpu_m_avl"
+   end="adrv9371x.avl_rx_xcvr_reconfig_avmm">
+  <parameter name="arbitrationPriority" value="1" />
+  <parameter name="baseAddress" value="0x00038000" />
+  <parameter name="defaultConnection" value="false" />
+ </connection>
  <connection
    kind="avalon"
    version="15.1"
@@ -617,6 +642,15 @@
   <parameter name="baseAddress" value="0x00035000" />
   <parameter name="defaultConnection" value="false" />
  </connection>
+ <connection
+   kind="avalon"
+   version="15.1"
+   start="a10soc.sys_cpu_m_avl"
+   end="adrv9371x.axi_ad9371_s">
+  <parameter name="arbitrationPriority" value="1" />
+  <parameter name="baseAddress" value="0x00040000" />
+  <parameter name="defaultConnection" value="false" />
+ </connection>
  <connection
    kind="avalon"
    version="15.1"
diff --git a/projects/adrv9371x/common/adrv9371x_bd.qsys b/projects/adrv9371x/common/adrv9371x_bd.qsys
index babd6c137..da9538a80 100755
--- a/projects/adrv9371x/common/adrv9371x_bd.qsys
+++ b/projects/adrv9371x/common/adrv9371x_bd.qsys
@@ -350,7 +350,11 @@
    type="avalon"
    dir="end" />
  <interface name="avl_rx_os_xcvr" internal="xcvr_rx_os_core.reconfig_avmm" />
- <interface name="avl_rx_xcvr" internal="xcvr_rx_core.reconfig_avmm" />
+ <interface
+   name="avl_rx_xcvr_reconfig_avmm"
+   internal="xcvr_rx_core.reconfig_avmm"
+   type="avalon"
+   dir="end" />
  <interface
    name="avl_spi"
    internal="spi.spi_control_port"
@@ -372,6 +376,11 @@
    internal="xcvr_pll_reconfig.mgmt_avalon_slave"
    type="avalon"
    dir="end" />
+ <interface
+   name="axi_ad9371_s"
+   internal="axi_ad9371.s_axi"
+   type="axi4lite"
+   dir="end" />
  <interface
    name="axi_adc_dma_intr"
    internal="axi_adc_dma.interrupt_sender"
@@ -1012,11 +1021,11 @@
   <parameter name="lane_rate" value="4915.2" />
   <parameter name="part_trait_bd" value="NIGHTFURY4" />
   <parameter name="part_trait_dp" value="10AS066N3F40E2SGE2" />
-  <parameter name="pll_reconfig_enable" value="false" />
+  <parameter name="pll_reconfig_enable" value="true" />
   <parameter name="pll_type" value="CMU" />
   <parameter name="rcfg_jtag_enable" value="false" />
   <parameter name="sdc_constraint" value="1.0" />
-  <parameter name="set_capability_reg_enable" value="false" />
+  <parameter name="set_capability_reg_enable" value="true" />
   <parameter name="set_csr_soft_logic_enable" value="false" />
   <parameter name="set_prbs_soft_logic_enable" value="false" />
   <parameter name="set_user_identifier" value="0" />
@@ -1395,6 +1404,11 @@
    version="15.1"
    start="xcvr_ref_clk.out_clk"
    end="xcvr_tx_lane_pll.pll_refclk0" />
+ <connection
+   kind="clock"
+   version="15.1"
+   start="sys_clk.out_clk"
+   end="xcvr_rx_core.reconfig_clk" />
  <connection
    kind="clock"
    version="15.1"
@@ -2194,6 +2208,11 @@
    version="15.1"
    start="sys_rst.out_reset"
    end="xcvr_pll_reconfig.mgmt_reset" />
+ <connection
+   kind="reset"
+   version="15.1"
+   start="sys_rst.out_reset"
+   end="xcvr_rx_core.reconfig_reset" />
  <connection
    kind="reset"
    version="15.1"