diff --git a/hdl/fpga/platforms/bladerf-micro/constraints/pins.tcl b/hdl/fpga/platforms/bladerf-micro/constraints/pins.tcl index 5f3ef02d..251d9de5 100644 --- a/hdl/fpga/platforms/bladerf-micro/constraints/pins.tcl +++ b/hdl/fpga/platforms/bladerf-micro/constraints/pins.tcl @@ -140,6 +140,8 @@ set_location_assignment PIN_N16 -to adi_ctrl_in[0] set_location_assignment PIN_N20 -to adi_ctrl_in[1] set_location_assignment PIN_M16 -to adi_ctrl_in[2] set_location_assignment PIN_N21 -to adi_ctrl_in[3] +set_location_assignment PIN_N19 -to i2c1_sda +set_location_assignment PIN_M22 -to i2c1_scl set_location_assignment PIN_K17 -to adi_enable set_location_assignment PIN_M20 -to adi_en_agc set_location_assignment PIN_L17 -to adi_txnrx @@ -176,7 +178,10 @@ foreach pin ${outs} { } # Single-ended inout constraints -set inouts {} +set inouts { + i2c1_sda + i2c1_scl +} foreach pin ${inouts} { set_instance_assignment -name IO_STANDARD "2.5 V" -to ${pin} @@ -232,8 +237,8 @@ foreach pin ${lvds_ins} { ########## set_location_assignment PIN_T18 -to adf_sdo set_location_assignment PIN_T20 -to dac_sdo -set_location_assignment PIN_T17 -to i2c1_sda -set_location_assignment PIN_T22 -to i2c1_scl +set_location_assignment PIN_T17 -to adf_muxout +set_location_assignment PIN_T22 -to adf_ce set_location_assignment PIN_T15 -to adi_rx_sp4t1_v[2] set_location_assignment PIN_R22 -to adi_rx_sp4t1_v[1] set_location_assignment PIN_R15 -to adi_rx_sp4t2_v[2] @@ -254,6 +259,7 @@ set_global_assignment -name IOBANK_VCCIO "3.3V" -section_id "5A" set outs { fx3_uart_cts fx3_uart_rxd + adf_ce } for { set i 1 } { $i < 3 } { incr i } { lappend outs "adi_rx_sp4t1_v\[${i}\]" @@ -269,10 +275,7 @@ foreach pin ${outs} { } # Single-ended inout constraints -set inouts { - i2c1_sda - i2c1_scl -} +set inouts {} foreach pin ${inouts} { set_instance_assignment -name IO_STANDARD "3.3-V LVCMOS" -to ${pin} @@ -285,6 +288,7 @@ set ins { adf_sdo dac_sdo fx3_uart_txd + adf_muxout } foreach pin ${ins} { @@ -304,39 +308,47 @@ set_location_assignment PIN_G16 -to adf_sclk set_location_assignment PIN_G18 -to adf_sdi set_location_assignment PIN_H18 -to adf_csn set_location_assignment PIN_H16 -to c5_clock_1 -set_location_assignment PIN_G15 -to exp_present +set_location_assignment PIN_G15 -to exp_present_n set_location_assignment PIN_B15 -to exp_i2c_scl set_location_assignment PIN_F14 -to exp_i2c_sda -set_location_assignment PIN_H14 -to exp_spi_sclk -set_location_assignment PIN_B13 -to exp_spi_miso -set_location_assignment PIN_J13 -to exp_spi_mosi -set_location_assignment PIN_A13 -to exp_spi_csn +set_location_assignment PIN_H13 -to c5_clock_2 set_location_assignment PIN_A12 -to dac_sclk set_location_assignment PIN_H11 -to dac_sdi set_location_assignment PIN_G12 -to dac_csn # Bank 8A set_location_assignment PIN_G10 -to exp_clock_in +set_location_assignment PIN_L7 -to exp_gpio[15] set_location_assignment PIN_F10 -to "exp_clock_in(n)" +set_location_assignment PIN_K7 -to exp_gpio[14] +set_location_assignment PIN_J7 -to exp_gpio[1] set_location_assignment PIN_H8 -to exp_clock_out +set_location_assignment PIN_J8 -to exp_gpio[0] set_location_assignment PIN_G8 -to "exp_clock_out(n)" -set_location_assignment PIN_B10 -to exp_gpio[7] -set_location_assignment PIN_C9 -to exp_gpio[6] -set_location_assignment PIN_E10 -to c5_clock_2 -set_location_assignment PIN_B6 -to exp_gpio[9] -set_location_assignment PIN_B7 -to exp_gpio[8] -set_location_assignment PIN_A8 -to exp_gpio[5] -set_location_assignment PIN_C6 -to exp_gpio[11] -set_location_assignment PIN_A7 -to exp_gpio[4] -set_location_assignment PIN_D6 -to exp_gpio[10] -set_location_assignment PIN_E9 -to exp_gpio[3] -set_location_assignment PIN_D7 -to exp_gpio[13] -set_location_assignment PIN_D9 -to exp_gpio[2] -set_location_assignment PIN_C8 -to exp_gpio[12] -set_location_assignment PIN_G6 -to exp_gpio[1] -set_location_assignment PIN_F7 -to exp_gpio[15] -set_location_assignment PIN_H6 -to exp_gpio[0] -set_location_assignment PIN_E7 -to exp_gpio[14] +set_location_assignment PIN_J9 -to exp_gpio[3] +set_location_assignment PIN_A10 -to exp_gpio[17] +set_location_assignment PIN_H9 -to exp_gpio[2] +set_location_assignment PIN_A9 -to exp_gpio[16] +set_location_assignment PIN_B10 -to exp_gpio[5] +set_location_assignment PIN_A5 -to exp_gpio[19] +set_location_assignment PIN_C9 -to exp_gpio[4] +set_location_assignment PIN_B5 -to exp_gpio[18] +set_location_assignment PIN_E10 -to exp_gpio[7] +set_location_assignment PIN_B6 -to exp_gpio[21] +set_location_assignment PIN_F9 -to exp_gpio[6] +set_location_assignment PIN_B7 -to exp_gpio[20] +set_location_assignment PIN_A8 -to exp_gpio[9] +set_location_assignment PIN_C6 -to exp_gpio[23] +set_location_assignment PIN_A7 -to exp_gpio[8] +set_location_assignment PIN_D6 -to exp_gpio[22] +set_location_assignment PIN_E9 -to exp_gpio[11] +set_location_assignment PIN_D7 -to exp_gpio[25] +set_location_assignment PIN_D9 -to exp_gpio[10] +set_location_assignment PIN_C8 -to exp_gpio[24] +set_location_assignment PIN_G6 -to exp_gpio[13] +set_location_assignment PIN_F7 -to exp_gpio[27] +set_location_assignment PIN_H6 -to exp_gpio[12] +set_location_assignment PIN_E7 -to exp_gpio[26] # Bank Voltage @@ -352,9 +364,6 @@ set outs { dac_sdi dac_csn exp_clock_out - exp_spi_sclk - exp_spi_mosi - exp_spi_csn } for { set i 1 } { $i < 4 } { incr i } { lappend outs "led\[${i}\]" @@ -371,7 +380,7 @@ set inouts { exp_i2c_scl exp_i2c_sda } -for { set i 0 } { $i < 16 } { incr i } { +for { set i 0 } { $i < 28 } { incr i } { lappend inouts "exp_gpio\[${i}\]" } @@ -386,8 +395,7 @@ set ins { c5_clock_1 c5_clock_2 exp_clock_in - exp_spi_miso - exp_present + exp_present_n } foreach pin ${ins} { diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd index 160ec876..d4c065e6 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-hosted.vhd @@ -1095,14 +1095,15 @@ begin exp_i2c_sda <= i2c_sda_out when i2c_sda_oen = '0' else 'Z' ; adi_txnrx <= led1_blink; adi_enable <= led1_blink; - adi_en_agc <= exp_spi_miso when rising_edge(c5_clock_2); + adi_en_agc <= led1_blink when rising_edge(c5_clock_2); adi_ctrl_in <= adi_ctrl_out(7 downto 4) xor adi_ctrl_out(3 downto 0); - exp_spi_csn <= exp_present; + exp_gpio(27 downto 16) <= (others => led1_blink); exp_gpio(0) <= led1_blink; exp_gpio(1) <= led1_blink; adf_sclk <= nios_sclk; adf_sdi <= adf_sdo; - adf_csn <= exp_present; + adf_csn <= exp_present_n; + adf_ce <= adf_muxout; U_exp_pll : entity work.pll port map ( @@ -1191,8 +1192,8 @@ begin -- CTS and the SPI CSx are tied to the same signal. When we are in reset, allow for SPI accesses fx3_uart_cts <= '1' when sys_rst_sync = '0' else 'Z' ; - exp_spi_sclk <= nios_sclk when ( nios_ss_n(1 downto 0) = "01" ) else '0' ; - exp_spi_mosi <= nios_sdio when ( nios_ss_n(1 downto 0) = "01" ) else '0' ; + --exp_spi_sclk <= nios_sclk when ( nios_ss_n(1 downto 0) = "01" ) else '0' ; + --exp_spi_mosi <= nios_sdio when ( nios_ss_n(1 downto 0) = "01" ) else '0' ; --mini_exp1 <= 'Z'; --mini_exp2 <= 'Z'; diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf.vhd index aa0d9384..45d3ed59 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf.vhd @@ -80,6 +80,8 @@ entity bladerf is adf_csn : out std_logic := '1' ; adf_sdi : out std_logic := '0' ; adf_sdo : in std_logic := '0' ; + adf_ce : out std_logic := '0'; + adf_muxout : in std_logic; -- FX3 GPIF Interface - VIO1/2/3 (1.8 V) fx3_pclk : in std_logic ; @@ -92,16 +94,12 @@ entity bladerf is fx3_uart_cts : out std_logic ; -- Expansion Interface (3.3 V) - exp_present : in std_logic ; - exp_spi_sclk : out std_logic ; - exp_spi_miso : in std_logic ; - exp_spi_mosi : out std_logic ; - exp_spi_csn : out std_logic; + exp_present_n : in std_logic ; exp_i2c_sda : inout std_logic; exp_i2c_scl : inout std_logic; exp_clock_in : in std_logic ; exp_clock_out : out std_logic; - exp_gpio : inout std_logic_vector(15 downto 0) + exp_gpio : inout std_logic_vector(27 downto 0) ) ; end entity ; -- bladerf --TODO: explain revisions