From d969b9ea9f891d1a4c8d814faece29433b6c9152 Mon Sep 17 00:00:00 2001 From: Rejeesh Kutty Date: Tue, 18 Jul 2017 13:53:44 -0400 Subject: [PATCH] rfsom2/ccbox- tsw updates --- .../adrv9364z7020/ccbox_lvds/system_top.v | 48 +++++++++---------- .../adrv9364z7020/common/ccbox_constr.xdc | 17 +++---- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/projects/adrv9364z7020/ccbox_lvds/system_top.v b/projects/adrv9364z7020/ccbox_lvds/system_top.v index 3464f8d8d..795a819ab 100644 --- a/projects/adrv9364z7020/ccbox_lvds/system_top.v +++ b/projects/adrv9364z7020/ccbox_lvds/system_top.v @@ -95,16 +95,13 @@ module system_top ( input [ 2:0] pss_valid_n, inout [ 2:0] adp5061_io, - inout tsw_rot_com_a, - inout tsw_dir_com_b, - inout tsw_rot_s1, - inout tsw_rot_a, - inout tsw_rot_b, - inout tsw_rot_misc, - inout tsw_dir_s2, - inout tsw_dir_s3, - inout tsw_dir_s4, - inout tsw_dir_s5, + inout tsw_s1, + inout tsw_s2, + inout tsw_s3, + inout tsw_s4, + inout tsw_s5, + inout tsw_a, + inout tsw_b, inout ltc2955_kill_n, inout ltc2955_int_n, @@ -214,21 +211,22 @@ module system_top ( assign gpio_i[3:0] = gpio_o[3:0]; // ad9361 gpio - tact-scroll-wheel - - ad_iobuf #(.DATA_WIDTH(10)) i_iobuf_tsw ( - .dio_t ({gpio_t[63:62], gpio_t[60:57], gpio_t[50:47]}), - .dio_i ({gpio_o[63:62], gpio_o[60:57], gpio_o[50:47]}), - .dio_o ({gpio_i[63:62], gpio_i[60:57], gpio_i[50:47]}), - .dio_p ({ tsw_rot_com_a, // 63 - tsw_dir_com_b, // 62 - tsw_rot_s1, // 60 - tsw_rot_a, // 59 - tsw_rot_b, // 58 - tsw_rot_misc, // 57 - tsw_dir_s2, // 50 - tsw_dir_s3, // 49 - tsw_dir_s4, // 48 - tsw_dir_s5})); // 47 + + assign gpio_i[63] = gpio_o[63]; + assign gpio_i[62] = gpio_o[62]; + assign gpio_i[60] = gpio_o[60]; + + ad_iobuf #(.DATA_WIDTH(7)) i_iobuf_tsw ( + .dio_t ({gpio_t[59:57], gpio_t[50:47]}), + .dio_i ({gpio_o[59:57], gpio_o[50:47]}), + .dio_o ({gpio_i[59:57], gpio_i[50:47]}), + .dio_p ({ tsw_a, // 59 + tsw_b, // 58 + tsw_s1, // 57 + tsw_s2, // 50 + tsw_s3, // 49 + tsw_s4, // 48 + tsw_s5})); // 47 // ad9361 gpio - 63-32 diff --git a/projects/adrv9364z7020/common/ccbox_constr.xdc b/projects/adrv9364z7020/common/ccbox_constr.xdc index 53b8be691..b3d39dd52 100644 --- a/projects/adrv9364z7020/common/ccbox_constr.xdc +++ b/projects/adrv9364z7020/common/ccbox_constr.xdc @@ -72,14 +72,11 @@ set_property -dict {PACKAGE_PIN W13 IOSTANDARD LVCMOS25} [get_ports pss_va ## tsw -set_property -dict {PACKAGE_PIN V16 IOSTANDARD LVCMOS25} [get_ports tsw_rot_com_a] ; ## U1,V16,IO_L18_34_JX4_P,JX4,68,TSW_COM_A -set_property -dict {PACKAGE_PIN W16 IOSTANDARD LVCMOS25} [get_ports tsw_rot_s1] ; ## U1,W16,IO_L18_34_JX4_N,JX4,70,TSW_S1 -set_property -dict {PACKAGE_PIN R16 IOSTANDARD LVCMOS25} [get_ports tsw_rot_a] ; ## U1,R16,IO_L19_34_JX4_P,JX4,73,TSW_A -set_property -dict {PACKAGE_PIN R17 IOSTANDARD LVCMOS25} [get_ports tsw_rot_b] ; ## U1,R17,IO_L19_34_JX4_N,JX4,75,TSW_B -set_property -dict {PACKAGE_PIN T17 IOSTANDARD LVCMOS25} [get_ports tsw_rot_misc] ; ## U1,T17,IO_L20_34_JX4_P,JX4,74,TSW_? -set_property -dict {PACKAGE_PIN R18 IOSTANDARD LVCMOS25} [get_ports tsw_dir_com_b] ; ## U1,R18,IO_L20_34_JX4_N,JX4,76,TSW_COM_B -set_property -dict {PACKAGE_PIN V17 IOSTANDARD LVCMOS25} [get_ports tsw_dir_s2] ; ## U1,V17,IO_L21_34_JX4_P,JX4,77,TSW_S2 -set_property -dict {PACKAGE_PIN V18 IOSTANDARD LVCMOS25} [get_ports tsw_dir_s3] ; ## U1,V18,IO_L21_34_JX4_N,JX4,79,TSW_S3 -set_property -dict {PACKAGE_PIN W18 IOSTANDARD LVCMOS25} [get_ports tsw_dir_s4] ; ## U1,W18,IO_L22_34_JX4_P,JX4,78,TSW_S4 -set_property -dict {PACKAGE_PIN W19 IOSTANDARD LVCMOS25} [get_ports tsw_dir_s5] ; ## U1,W19,IO_L22_34_JX4_N,JX4,80,TSW_S5 +set_property -dict {PACKAGE_PIN T20 IOSTANDARD LVCMOS25} [get_ports tsw_s1] ; ## U1,T20,IO_L15_34_JX4_P,JX4,57,P11,2,NAV_SWITCH_S1 +set_property -dict {PACKAGE_PIN W20 IOSTANDARD LVCMOS25} [get_ports tsw_s2] ; ## U1,W20,IO_L16_34_JX4_N,JX4,60,P11,4,NAV_SWITCH_S2 +set_property -dict {PACKAGE_PIN Y18 IOSTANDARD LVCMOS25} [get_ports tsw_s3] ; ## U1,Y18,IO_L17_34_JX4_P,JX4,67,P11,6,NAV_SWITCH_S3 +set_property -dict {PACKAGE_PIN V16 IOSTANDARD LVCMOS25} [get_ports tsw_s4] ; ## U1,V16,IO_L18_34_JX4_P,JX4,68,P11,8,NAV_SWITCH_S4 +set_property -dict {PACKAGE_PIN V10 IOSTANDARD LVCMOS25} [get_ports tsw_s5] ; ## U1,V10,IO_L21_13_JX2_N,JX2,69,P11,10,NAV_SWITCH_S5 +set_property -dict {PACKAGE_PIN V20 IOSTANDARD LVCMOS25} [get_ports tsw_a] ; ## U1,V20,IO_L16_34_JX4_P,JX4,58,P11,1,NAV_SWITCH_A +set_property -dict {PACKAGE_PIN U20 IOSTANDARD LVCMOS25} [get_ports tsw_b] ; ## U1,U20,IO_L15_34_JX4_N,JX4,59,P11,3,NAV_SWITCH_B