diff options
author | Eddie James <eajames@linux.ibm.com> | 2020-06-09 16:39:27 -0500 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2020-09-10 12:22:47 +0930 |
commit | 04635a30dd53890fac4e926f91c4ec8619c9227b (patch) | |
tree | a20f60529a37c5f26180f0fe6e3e3dad401eef3e /drivers/fsi/fsi-master-aspeed.c | |
parent | 3c3c484850bcb4b28f2377e3d641a32c42af949c (diff) | |
download | linux-stable-04635a30dd53890fac4e926f91c4ec8619c9227b.tar.gz linux-stable-04635a30dd53890fac4e926f91c4ec8619c9227b.tar.bz2 linux-stable-04635a30dd53890fac4e926f91c4ec8619c9227b.zip |
fsi: master: Add boolean parameter to link_enable function
Add the ability to disable a link with a boolean parameter to the
link_enable function. This is necessary so that the master can disable
links that it isn't using; for example, links to slaves that fail
initialization.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/fsi/fsi-master-aspeed.c')
-rw-r--r-- | drivers/fsi/fsi-master-aspeed.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c index b49dccf14315..6152cfe6d18e 100644 --- a/drivers/fsi/fsi-master-aspeed.c +++ b/drivers/fsi/fsi-master-aspeed.c @@ -301,7 +301,8 @@ static int aspeed_master_write(struct fsi_master *master, int link, return 0; } -static int aspeed_master_link_enable(struct fsi_master *master, int link) +static int aspeed_master_link_enable(struct fsi_master *master, int link, + bool enable) { struct fsi_master_aspeed *aspeed = to_fsi_master_aspeed(master); int idx, bit, ret; @@ -312,6 +313,10 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link) reg = cpu_to_be32(0x80000000 >> bit); + if (!enable) + return opb_writel(aspeed, ctrl_base + FSI_MCENP0 + (4 * idx), + reg); + ret = opb_writel(aspeed, ctrl_base + FSI_MSENP0 + (4 * idx), reg); if (ret) return ret; |