Merge tag 'mailbox-fixes-v5.0-rc7' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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()

Linus Torvalds 7 years ago 301e3610 3ddc14e2

+3 -2

2 changed files

expand all

drivers

mailbox

bcm-flexrm-mailbox.c

mailbox.c

+2 -2

drivers/mailbox/bcm-flexrm-mailbox.c

··· 1396 1396 1397 1397 /* Clear ring flush state */ 1398 1398 timeout = 1000; /* timeout of 1s */ 1399 - writel_relaxed(0x0, ring + RING_CONTROL); 1399 + writel_relaxed(0x0, ring->regs + RING_CONTROL); 1400 1400 do { 1401 - if (!(readl_relaxed(ring + RING_FLUSH_DONE) & 1401 + if (!(readl_relaxed(ring->regs + RING_FLUSH_DONE) & 1402 1402 FLUSH_DONE_MASK)) 1403 1403 break; 1404 1404 mdelay(1);

drivers/mailbox/mailbox.c

··· 310 310 311 311 return ret; 312 312 } 313 + EXPORT_SYMBOL_GPL(mbox_flush); 313 314 314 315 /** 315 316 * mbox_request_channel - Request a mailbox channel.