diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 12:09:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 12:09:37 -0800 |
commit | 14ba9a2e4bacc6f5a0dbe0de5390daedd544508f (patch) | |
tree | 90b0d639f577feada25fb56837c3e8350b7de035 /include/linux/mailbox_client.h | |
parent | Merge tag 'spi-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
parent | Mailbox: Add support for Platform Communication Channel (diff) | |
download | linux-dev-14ba9a2e4bacc6f5a0dbe0de5390daedd544508f.tar.xz linux-dev-14ba9a2e4bacc6f5a0dbe0de5390daedd544508f.zip |
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox framework updates from Jassi Brar.
* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
Mailbox: Add support for Platform Communication Channel
mailbox/omap: adapt to the new mailbox framework
mailbox: add tx_prepare client callback
mailbox: Don't unnecessarily re-arm the polling timer
Diffstat (limited to 'include/linux/mailbox_client.h')
-rw-r--r-- | include/linux/mailbox_client.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h index 307d9cab2026..1726ccbd8009 100644 --- a/include/linux/mailbox_client.h +++ b/include/linux/mailbox_client.h @@ -25,6 +25,8 @@ struct mbox_chan; * if the client receives some ACK packet for transmission. * Unused if the controller already has TX_Done/RTR IRQ. * @rx_callback: Atomic callback to provide client the data received + * @tx_prepare: Atomic callback to ask client to prepare the payload + * before initiating the transmission if required. * @tx_done: Atomic callback to tell client of data transmission */ struct mbox_client { @@ -34,6 +36,7 @@ struct mbox_client { bool knows_txdone; void (*rx_callback)(struct mbox_client *cl, void *mssg); + void (*tx_prepare)(struct mbox_client *cl, void *mssg); void (*tx_done)(struct mbox_client *cl, void *mssg, int r); }; |