From: Chris Bostic <cbos...@us.ibm.com>

Enable each link and send a break command in preparation
for scanning each link for slaves.

Signed-off-by: Chris Bostic <cbos...@us.ibm.com>
Signed-off-by: Jeremy Kerr <j...@ozlabs.org>
---
 drivers/fsi/fsi-core.c   | 38 ++++++++++++++++++++++++++++++++++++--
 drivers/fsi/fsi-master.h |  2 ++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 3119aa1..b2c9274 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -271,14 +271,48 @@ static int fsi_slave_init(struct fsi_master *master,
 
 /* FSI master support */
 
+static int fsi_master_link_enable(struct fsi_master *master, int link)
+{
+       if (master->link_enable)
+               return master->link_enable(master, link);
+
+       return 0;
+}
+
+/*
+ * Issue a break command on this link
+ */
+static int fsi_master_break(struct fsi_master *master, int link)
+{
+       if (master->send_break)
+               return master->send_break(master, link);
+
+       return 0;
+}
+
 static int fsi_master_scan(struct fsi_master *master)
 {
-       int link, slave_id;
+       int link, slave_id, rc;
+
+       for (link = 0; link < master->n_links; link++) {
+               rc = fsi_master_link_enable(master, link);
+               if (rc) {
+                       dev_dbg(master->dev,
+                               "enable link:%d failed with:%d\n", link, rc);
+                       continue;
+               }
+               rc = fsi_master_break(master, link);
+               if (rc) {
+                       dev_dbg(master->dev,
+                               "Break to link:%d failed with:%d\n", link, rc);
+                       continue;
+               }
 
-       for (link = 0; link < master->n_links; link++)
                for (slave_id = 0; slave_id < FSI_N_SLAVES; slave_id++)
                        fsi_slave_init(master, link, slave_id);
 
+       }
+
        return 0;
 }
 
diff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h
index e75a810..94a0671 100644
--- a/drivers/fsi/fsi-master.h
+++ b/drivers/fsi/fsi-master.h
@@ -29,6 +29,8 @@ struct fsi_master {
        int             (*write)(struct fsi_master *, int link,
                                uint8_t slave, uint32_t addr,
                                const void *val, size_t size);
+       int             (*send_break)(struct fsi_master *, int link);
+       int             (*link_enable)(struct fsi_master *, int link);
 };
 
 extern int fsi_master_register(struct fsi_master *master);
-- 
1.8.2.2

Reply via email to