sja1000: IP fixes, corrected device-tree entry, it works now

[fpga/zynq/canbench-sw.git] / system / ip / can_merge / can_merge.vhd

diff --git a/system/ip/can_merge/can_merge.vhd b/system/ip/can_merge/can_merge.vhd
index d7f580e934c88136627a446b00103864940fd8fe..d68260b3e309d99abcf2bf8ee2180e268312bfc6 100644 (file)
--- a/system/ip/can_merge/can_merge.vhd
+++ b/system/ip/can_merge/can_merge.vhd
@@ -14,10 +14,11 @@ entity can_merge is
     Port ( can_rx : out STD_LOGIC;
            can_tx1 : in STD_LOGIC := '1';
            can_tx2 : in STD_LOGIC := '1';
-           can_tx3 : in STD_LOGIC := '1');
+           can_tx3 : in STD_LOGIC := '1';
+           can_tx4 : in STD_LOGIC := '1');
 end can_merge;
 
 architecture Behavioral of can_merge is
 begin
-    can_rx <= can_tx1 and can_tx2 and can_tx3;
+    can_rx <= can_tx1 and can_tx2 and can_tx3 and can_tx4;
 end Behavioral;