Commit f3aa2c6f authored by Christopher Bostic's avatar Christopher Bostic Committed by Greg Kroah-Hartman

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: default avatarChristopher Bostic <cbostic@linux.vnet.ibm.com>
Acked-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: Joel Stanley's avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd798739
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment