Merge branch 'master' of libre-riscv.org:/pinmux

diff --cc src/test_bsv/tests/test_pinmux.py
index 3a2fec1af35347efbbf2e5a0c24a5c68e366a17a,84e8aa68b37d679517c7297600b2cea038fb84ad..08761de7cf25cfbca6e58e0f656ebc3399797543
--- 1/src/test_bsv/tests/test_pinmux.py
--- 2/src/test_bsv/tests/test_pinmux.py
+++ b/src/test_bsv/tests/test_pinmux.py
@@@ -398,9 -399,9 +399,9 @@@ def pinmux_twi_sda3(dut)
      # Test for out for twi_sda
      if dut.iocell_side_io1_cell_out != 0:
          raise TestFailure(
 -            "twi_sda=0/mux=0/out=1 %s iocell_io1 != 0" %
 +            "twi_sda=0/mux=2/out=1 %s iocell_io1 != 0" %
              str(dut.iocell_side_io1_cell_out))
-     
+ 
      dut.peripheral_side_twi_sda_out_in = 1
      yield Timer(2)
      # ok, now io1_cell_out should be equal to 1
@@@ -445,19 -446,19 +446,19 @@@
  
      if dut.peripheral_side_twi_sda_out_in != 1:  # output of twi_sda
          raise TestFailure(
 -            "gpioa_a2=0/mux=0/out=1 %s iocell_io2 != 0" %
 +            "twi_sda=0/mux=0/out=1 %s iocell_io0 != 0" %
              str(dut.iocell_side_io2_cell_out))
  
-     # Now, let's test the working of output muxing logic 
-     # at cell1. First, the output of io1_cell_out should 
-     # be the previous value (1). 
+     # Now, let's test the working of output muxing logic
+     # at cell1. First, the output of io1_cell_out should
+     # be the previous value (1).
  
      yield Timer(2)
      if dut.iocell_side_io1_cell_out != 1:
          raise TestFailure(
 -            "twi_sda=1/mux=0/out=1 %s iocell_io1 != 1" %
 +            "twi_sda=1/mux=2/out=1 %s iocell_io1 != 1" %
              str(dut.iocell_side_io1_cell_out))
-    
+ 
      # ok, now set the muxing selection line for gpio1
      # again, the value of gpio_out_in should be 0
      # ie. opposite of twi_sda_out