diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-18 10:03:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-18 10:03:19 -0800 |
| commit | 301e361072e56a6d6afbf952ae5e746dc8bbb865 (patch) | |
| tree | 2b74d591be541795e41d9f49953e3c5472a34d32 | |
| parent | 3ddc14e25e7fef143d35fdd0cad1e8dcf48efaa7 (diff) | |
| parent | d7bf31a0f85faaf63c63c39d55154825a1eaaea9 (diff) | |
| download | linux-soc-thermal-301e361072e56a6d6afbf952ae5e746dc8bbb865.tar.gz | |
Merge tag 'mailbox-fixes-v5.0-rc7' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox fixes from Jassi Brar:
- API: Fix build breakge by exporting the function mbox_flush
- BRCM: Fix FlexRM ring flush timeout issue
* tag 'mailbox-fixes-v5.0-rc7' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue
mailbox: Export mbox_flush()
| -rw-r--r-- | drivers/mailbox/bcm-flexrm-mailbox.c | 4 | ||||
| -rw-r--r-- | drivers/mailbox/mailbox.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c index d713271ebf7c7..a64116586b4cc 100644 --- a/drivers/mailbox/bcm-flexrm-mailbox.c +++ b/drivers/mailbox/bcm-flexrm-mailbox.c @@ -1396,9 +1396,9 @@ static void flexrm_shutdown(struct mbox_chan *chan) /* Clear ring flush state */ timeout = 1000; /* timeout of 1s */ - writel_relaxed(0x0, ring + RING_CONTROL); + writel_relaxed(0x0, ring->regs + RING_CONTROL); do { - if (!(readl_relaxed(ring + RING_FLUSH_DONE) & + if (!(readl_relaxed(ring->regs + RING_FLUSH_DONE) & FLUSH_DONE_MASK)) break; mdelay(1); diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index c6a7d4582dc67..38d9df3fb199f 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -310,6 +310,7 @@ int mbox_flush(struct mbox_chan *chan, unsigned long timeout) return ret; } +EXPORT_SYMBOL_GPL(mbox_flush); /** * mbox_request_channel - Request a mailbox channel. |