Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301e3610 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mailbox-fixes-v5.0-rc7' of... 

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()
parents 3ddc14e2 d7bf31a0

drivers/mailbox/bcm-flexrm-mailbox.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/mailbox/mailbox.c

+1 −0
Original line number Diff line number Diff line
@@ -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.