diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 18:38:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 18:38:40 -0700 |
| commit | 9390bd0d14b4585f7ac2df15ff5f52af182251e1 (patch) | |
| tree | 7e61faeb498ee8faf05ea0d413c490ff3cce3547 /include | |
| parent | da996f7310eb7fa8d49223936111d3e86b72e2f3 (diff) | |
| parent | 7d641938aa2ae433a97cc65ec622547cfe08f2ed (diff) | |
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar.
* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox/bcm2835: Fix mailbox full detection.
dt: mailbox: Remove 'mbox-names property is discouraged' message from binding
mailbox: Add ability for clients to request channels by name
mailbox: Enable BCM2835 mailbox support
dt/bindings: Add binding for the BCM2835 mailbox driver
mailbox: Fix up error handling in mbox_request_channel()
mailbox: Make mbox_chan_ops const
mailbox: altera: Add dependency on HAS_IOMEM
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mailbox_client.h | 2 | ||||
| -rw-r--r-- | include/linux/mailbox_controller.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h index 1726ccbd8009..44348710953f 100644 --- a/include/linux/mailbox_client.h +++ b/include/linux/mailbox_client.h @@ -40,6 +40,8 @@ struct mbox_client { void (*tx_done)(struct mbox_client *cl, void *mssg, int r); }; +struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl, + const char *name); struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index); int mbox_send_message(struct mbox_chan *chan, void *mssg); void mbox_client_txdone(struct mbox_chan *chan, int r); /* atomic */ diff --git a/include/linux/mailbox_controller.h b/include/linux/mailbox_controller.h index d4cf96f07cfc..68c42454439b 100644 --- a/include/linux/mailbox_controller.h +++ b/include/linux/mailbox_controller.h @@ -72,7 +72,7 @@ struct mbox_chan_ops { */ struct mbox_controller { struct device *dev; - struct mbox_chan_ops *ops; + const struct mbox_chan_ops *ops; struct mbox_chan *chans; int num_chans; bool txdone_irq; |