forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
dd79873923
commit
f3aa2c6f98
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user