linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the arm-soc tree with the mailbox tree
@ 2013-06-21  6:08 Stephen Rothwell
  2013-06-21  6:45 ` Tony Lindgren
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2013-06-21  6:08 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/devices.c between commit 4a1c0e83bb4e ("ARM: OMAP2+:
mbox: remove dependencies with soc.h") from the mailbox tree and commit
82c5cde1c4b0 ("ARM: OMAP2+: Remove omap4 ocp2scp pdata") from the arm-soc
tree.

I fixed it up (removing the include of
linux/platform_data/omap_ocp2scp.h) and can carry the fix as necessary
(no action is required).

That mailbox tree commit looks very similar to commit b8a7cf8e2b15 ("ARM:
OMAP2+: mbox: remove dependencies with soc.h") from the arm-soc tree ...

As an aside, the include of linux/usb/omap_control_usb.h into this file
was removed by commit 608d19380c67 ("ARM: OMAP2+: Remove omap4 pdata for
USB") in the arm-soc tree, but reintroduced by commit 435f4c6d5242
("Merge branch 'next/drivers' into for-next").

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130621/2d7de735/attachment.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the arm-soc tree with the mailbox tree
@ 2013-06-21  6:14 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2013-06-21  6:14 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_44xx_data.c between commit 4a1c0e83bb4e
("ARM: OMAP2+: mbox: remove dependencies with soc.h") from the mailbox
tree and commit 3b9b10151c68 ("ARM: OMAP4: hwmod data: Clean up the data
file") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 4065962,d04b5e6..0000000
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -1862,22 -1573,6 +1574,17 @@@ static struct omap_hwmod_class omap44xx
  };
  
  /* mailbox */
 +static struct omap_mbox_dev_info omap44xx_mailbox_info[] = {
 +	{ .name = "mbox-ipu", .tx_id = 0, .rx_id = 1 },
 +	{ .name = "mbox-dsp", .tx_id = 3, .rx_id = 2 },
 +};
 +
 +static struct omap_mbox_pdata omap44xx_mailbox_attrs = {
 +	.intr_type	= MBOX_INTR_CFG_TYPE2,
 +	.info_cnt	= ARRAY_SIZE(omap44xx_mailbox_info),
 +	.info		= omap44xx_mailbox_info,
 +};
 +
- static struct omap_hwmod_irq_info omap44xx_mailbox_irqs[] = {
- 	{ .irq = 26 + OMAP44XX_IRQ_GIC_START },
- 	{ .irq = -1 }
- };
- 
  static struct omap_hwmod omap44xx_mailbox_hwmod = {
  	.name		= "mailbox",
  	.class		= &omap44xx_mailbox_hwmod_class,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130621/b4a13a3c/attachment.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the arm-soc tree with the mailbox tree
@ 2013-06-21  6:26 Stephen Rothwell
  2013-06-21  6:41 ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2013-06-21  6:26 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mailbox/Kconfig between commit a1824eaab70f ("mailbox: OMAP:
introduce mailbox framework") from the mailbox tree and commit
c869c75c16b3 ("mailbox/omap: move the OMAP mailbox framework to drivers")
from the arm-soc tree.

I fixed it up (I suspect not properly - see below) and can carry the fix
as necessary (no action is required).

It looks like we have two different versions of these changes in
linux-next now, so please clean it all up.  i.e. can I just drop the
mailbox tree now?
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/mailbox/Kconfig
index 438ea21,c8b5c13..0000000
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@@ -16,45 -16,38 +16,63 @@@ config PL320_MBO
  	  Management Engine, primarily for cpufreq. Say Y here if you want
  	  to use the PL320 IPCM support.
  
- config OMAP1_MBOX
-        tristate "OMAP1 Mailbox framework support"
-        depends on ARCH_OMAP1
-        help
-          Mailbox implementation for OMAP chips with hardware for
-          interprocessor communication involving DSP in OMAP1. Say Y here
-          if you want to use OMAP1 Mailbox framework support.
- 
- config OMAP2PLUS_MBOX
-        tristate "OMAP2+ Mailbox framework support"
-        depends on ARCH_OMAP2PLUS
-        help
-          Mailbox implementation for OMAP family chips with hardware for
-          interprocessor communication involving DSP, IVA1.0 and IVA2 in
-          OMAP2/3; or IPU, IVA HD and DSP in OMAP4. Say Y here if you want
-          to use OMAP2+ Mailbox framework support.
- 
 +config DBX500_MBOX
 +	tristate "DBx500 Mailbox driver support"
 +	depends on ARCH_U8500
 +	help
 +	  Say Y here if you want to use DBx500 Mailbox driver support for
 +	  power coprocessor access on Ux500 and Ux540 families
 +
 +config MBOX_KFIFO_SIZE
 +       int "Mailbox kfifo default buffer size (bytes)"
 +       default 256
 +       help
 +         Specify the default size of mailbox's kfifo buffers (bytes).
 +         This can also be changed at runtime (via the mbox_kfifo_size
 +         module parameter).
 +
 +config MBOX_DATA_SIZE
 +	int "Mailbox associated data max size (bytes)"
 +	default 64 if DBX500_MBOX
 +	default 4
 +	help
 +	  Specify the default size of mailbox's associated data buffer
 +	  (bytes)
 +          This can also be changed at runtime (via the mbox_kfifo_size
 +          module parameter).
++
+ config OMAP_MBOX
+ 	tristate
+ 	help
+ 	  This option is selected by any OMAP architecture specific mailbox
+ 	  driver such as CONFIG_OMAP1_MBOX or CONFIG_OMAP2PLUS_MBOX. This
+ 	  enables the common OMAP mailbox framework code.
+ 
+ config OMAP1_MBOX
+ 	tristate "OMAP1 Mailbox framework support"
+ 	depends on ARCH_OMAP1
+ 	select OMAP_MBOX
+ 	help
+ 	  Mailbox implementation for OMAP chips with hardware for
+ 	  interprocessor communication involving DSP in OMAP1. Say Y here
+ 	  if you want to use OMAP1 Mailbox framework support.
+ 
+ config OMAP2PLUS_MBOX
+ 	tristate "OMAP2+ Mailbox framework support"
+ 	depends on ARCH_OMAP2PLUS
+ 	select OMAP_MBOX
+ 	help
+ 	  Mailbox implementation for OMAP family chips with hardware for
+ 	  interprocessor communication involving DSP, IVA1.0 and IVA2 in
+ 	  OMAP2/3; or IPU, IVA HD and DSP in OMAP4/5. Say Y here if you
+ 	  want to use OMAP2+ Mailbox framework support.
+ 
+ config OMAP_MBOX_KFIFO_SIZE
+ 	int "Mailbox kfifo default buffer size (bytes)"
+ 	depends on OMAP2PLUS_MBOX || OMAP1_MBOX
+ 	default 256
+ 	help
+ 	  Specify the default size of mailbox's kfifo buffers (bytes).
+ 	  This can also be changed at runtime (via the mbox_kfifo_size
+ 	  module parameter).
  endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130621/54feb6c1/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-06-24  5:29 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-21  6:08 linux-next: manual merge of the arm-soc tree with the mailbox tree Stephen Rothwell
2013-06-21  6:45 ` Tony Lindgren
2013-06-21 16:39   ` Anna, Suman
  -- strict thread matches above, loose matches on Subject: below --
2013-06-21  6:14 Stephen Rothwell
2013-06-21  6:26 Stephen Rothwell
2013-06-21  6:41 ` Stephen Rothwell
2013-06-21  6:53   ` Tony Lindgren
2013-06-21  7:01     ` Olof Johansson
2013-06-21  7:12       ` Tony Lindgren
2013-06-21  7:36         ` Arnd Bergmann
2013-06-21 15:24           ` Suman Anna
2013-06-24  5:29             ` Stephen Rothwell
2013-06-21  7:48         ` Jassi Brar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).