Merge "SPEC-2996: handle rcar_can"

diff --combined common/scripts/test_can_modules.sh
index 3b317af,2a16897..1a46034
--- 1/common/scripts/test_can_modules.sh
--- 2/common/scripts/test_can_modules.sh
+++ b/common/scripts/test_can_modules.sh
@@@ -1,5 -1,7 +1,7 @@@
  #!/bin/sh
  
+ RCAR_CAN=0
+ 
  if [ ! -e /sys/class/net/can1 ];then
        lava-test-case show_can_modules --result skip
        lava-test-case unload_can_raw_module --result skip
@@@ -48,9 -50,15 +50,15 @@@ remove_module c_can_platfor
  
  remove_module c_can
  
- remove_module can_dev unload_can_dev_module
+ lsmod | grep -q rcar_can
+ if [ $? -eq 0 ];then
+       RCAR_CAN=1
+       remove_module rcar_can
+ fi
+ 
+ remove_module can_dev
  
 -ip -V | grep -q -i BusyBox
 +ip -V 2>&1 | grep -q -i BusyBox
  if [ $? -eq 0 ];then
        lava-test-case canconfig_can0 --result skip
  else
@@@ -72,11 -80,15 +80,15 @@@ modprobe_module c_can_platfor
  
  modprobe_module can_dev
  
+ if [ $RCAR_CAN -eq 1 ];then
+       modprobe_module rcar_can
+ fi
+ 
  #Make sure always that the can interface is down before
  #starting the config step.
  ip link set can0 down
  
 -ip -V | grep -q -i BusyBox
 +ip -V 2>&1 | grep -q -i BusyBox
  if [ $? -eq 0 ];then
        lava-test-case canconfig_can0 --result skip
  else