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

Commit 9390bd0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents da996f73 7d641938

Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Broadcom BCM2835 VideoCore mailbox IPC



Required properties:



- compatible:	Should be "brcm,bcm2835-mbox"

- reg:		Specifies base physical address and size of the registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

- #mbox-cells:	Specifies the number of cells needed to encode a mailbox

		  channel. The value shall be 0, since there is only one

		  mailbox channel implemented by the device.



Example:



mailbox: mailbox@7e00b800 {

	compatible = "brcm,bcm2835-mbox";

	reg = <0x7e00b880 0x40>;

	interrupts = <0 1>;

	#mbox-cells = <0>;

};



firmware: firmware {

	compatible = "raspberrypi,firmware";

	mboxes = <&mailbox>;

	#power-domain-cells = <1>;

};

Documentation/devicetree/bindings/mailbox/mailbox.txt

+2 −8
Original line number Diff line number Diff line
@@ -22,17 +22,11 @@ Required property: 
- mboxes: List of phandle and mailbox channel specifiers.



Optional property:

- mbox-names: List of identifier strings for each mailbox channel

		required by the client. The use of this property

		is discouraged in favor of using index in list of

		'mboxes' while requesting a mailbox. Instead the

		platforms may define channel indices, in DT headers,

		to something legible.

- mbox-names: List of identifier strings for each mailbox channel.



Example:

	pwr_cntrl: power {

		...

		mbox-names = "pwr-ctrl", "rpc";

		mboxes = <&mailbox 0

			&mailbox 1>;

		mboxes = <&mailbox 0 &mailbox 1>;

	};

drivers/mailbox/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -56,8 +56,18 @@ config PCC 


config ALTERA_MBOX

	tristate "Altera Mailbox"

	depends on HAS_IOMEM

	help

	  An implementation of the Altera Mailbox soft core. It is used

	  to send message between processors. Say Y here if you want to use the

	  Altera mailbox support.



config BCM2835_MBOX

	tristate "BCM2835 Mailbox"

	depends on ARCH_BCM2835

	help

	  An implementation of the BCM2385 Mailbox.  It is used to invoke

	  the services of the Videocore. Say Y here if you want to use the

	  BCM2835 Mailbox.



endif

drivers/mailbox/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ obj-$(CONFIG_OMAP2PLUS_MBOX) += omap-mailbox.o 
obj-$(CONFIG_PCC)		+= pcc.o



obj-$(CONFIG_ALTERA_MBOX)	+= mailbox-altera.o



obj-$(CONFIG_BCM2835_MBOX)	+= bcm2835-mailbox.o

drivers/mailbox/arm_mhu.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static void mhu_shutdown(struct mbox_chan *chan) 
	free_irq(mlink->irq, chan);

}



static struct mbox_chan_ops mhu_ops = {

static const struct mbox_chan_ops mhu_ops = {

	.send_data = mhu_send_data,

	.startup = mhu_startup,

	.shutdown = mhu_shutdown,