diff options
| author | Christopher Bostic <cbostic@linux.vnet.ibm.com> | 2018-02-12 06:15:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-14 19:11:01 +0100 |
| commit | f3aa2c6f98e53cffc0e26ea9868154b2d4b2c75e (patch) | |
| tree | ab795924e27c734f12a8dd6a3515b28ff06dee64 /drivers | |
| parent | dt-bindings: fsi: Add optional property no-scan-on-init (diff) | |
| download | linux-f3aa2c6f98e53cffc0e26ea9868154b2d4b2c75e.tar.xz linux-f3aa2c6f98e53cffc0e26ea9868154b2d4b2c75e.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fsi/fsi-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 8d8b25809452..4c03d6933646 100644 --- 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; } |