Change FSI service files for 4.10

Latest FSI code changes paths, so we need to update the bind/unbind/scan
paths.

Change-Id: Ia1d8c5f31a8f0c8a69ca03121741a3ba35761c3a
Signed-off-by: Edward A. James <eajames@us.ibm.com>
diff --git a/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service b/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
index c5b1ea1..3dd068e 100644
--- a/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
+++ b/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
@@ -2,9 +2,10 @@
 Description=Enable FSI
 Conflicts=fsi-disable.service
 ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
+ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/gpio-fsi
 
 [Service]
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind"
-ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind"
+ExecStart=/bin/sh -c "if [ -f /sys/bus/platform/devices/gpio-fsi/fsi0/rescan ]; then echo 1 > /sys/bus/platform/devices/gpio-fsi/fsi0/rescan; else echo 1 > /sys/bus/platform/devices/fsi-master/scan; fi"
 Type=oneshot
 RemainAfterExit=yes