fsi: core: Add check for master property no-scan-on-init

Prior to scanning a master check if the optional property
no-scan-on-init is present.  If it is then avoid scanning.  This is
necessary in cases where a master scan could interfere with another
FSI master on the same bus.

Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 8d8b25809452940e14cf27fadcd58d352ab9446e..4c03d6933646f03b8784a8de754b535fcbaba14d 100644 (file)
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -901,6 +901,7 @@ static DEVICE_ATTR(break, 0200, NULL, master_break_store);
 int fsi_master_register(struct fsi_master *master)
 {
        int rc;
+       struct device_node *np;
 
        if (!master)
                return -EINVAL;
@@ -928,7 +929,9 @@ int fsi_master_register(struct fsi_master *master)
                return rc;
        }
 
-       fsi_master_scan(master);
+       np = dev_of_node(&master->dev);
+       if (!of_property_read_bool(np, "no-scan-on-init"))
+               fsi_master_scan(master);
 
        return 0;
 }