提交 f3aa2c6f 编写于 作者: C Christopher Bostic 提交者: 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: NChristopher Bostic <cbostic@linux.vnet.ibm.com>
Acked-by: NJeremy Kerr <jk@ozlabs.org>
Signed-off-by: NJoel Stanley <joel@jms.id.au>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 dd798739
...@@ -901,6 +901,7 @@ static DEVICE_ATTR(break, 0200, NULL, master_break_store); ...@@ -901,6 +901,7 @@ static DEVICE_ATTR(break, 0200, NULL, master_break_store);
int fsi_master_register(struct fsi_master *master) int fsi_master_register(struct fsi_master *master)
{ {
int rc; int rc;
struct device_node *np;
if (!master) if (!master)
return -EINVAL; return -EINVAL;
...@@ -928,7 +929,9 @@ int fsi_master_register(struct fsi_master *master) ...@@ -928,7 +929,9 @@ int fsi_master_register(struct fsi_master *master)
return rc; 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; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册