linux-next: manual merge of the staging-next tree with the omap tree

linux-next: manual merge of the staging-next tree with the omap tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
arch/arm/plat-omap/devices.c between commit
f2ce62312650211f6cf665cd6dc519c334c4071e ("OMAP: WDT: Split OMAP1 and
OMAP2PLUS device registration") from the omap tree and commit
90173882ed15a8034d6d162da5f343a2c7d87587 ("omap: add dsp platform
device") from the staging-next tree.

Just overlapping removal/additions (I think).  I fixed it up (see below)
and can carry the changes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/plat-omap/devices.c
index 1e2383e,4c8f9b9..0000000
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@@ -231,6 -233,75 +232,35 @@@ static void omap_init_uwire(void
  static inline void omap_init_uwire(void) {}
  #endif
  
 -/*-------------------------------------------------------------------------*/
 -
 -#if	defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
 -
 -static struct resource wdt_resources[] = {
 -	{
 -		.flags		= IORESOURCE_MEM,
 -	},
 -};
 -
 -static struct platform_device omap_wdt_device = {
 -	.name	   = "omap_wdt",
 -	.id	     = -1,
 -	.num_resources	= ARRAY_SIZE(wdt_resources),
 -	.resource	= wdt_resources,
 -};
 -
 -static void omap_init_wdt(void)
 -{
 -	if (cpu_is_omap16xx())
 -		wdt_resources[0].start = 0xfffeb000;
 -	else if (cpu_is_omap2420())
 -		wdt_resources[0].start = 0x48022000; /* WDT2 */
 -	else if (cpu_is_omap2430())
 -		wdt_resources[0].start = 0x49016000; /* WDT2 */
 -	else if (cpu_is_omap343x())
 -		wdt_resources[0].start = 0x48314000; /* WDT2 */
 -	else if (cpu_is_omap44xx())
 -		wdt_resources[0].start = 0x4a314000;
 -	else
 -		return;
 -
 -	wdt_resources[0].end = wdt_resources[0].start + 0x4f;
 -
 -	(void) platform_device_register(&omap_wdt_device);
 -}
 -#else
 -static inline void omap_init_wdt(void) {}
 -#endif
 -
+ #if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
+ 
+ static phys_addr_t omap_dsp_phys_mempool_base;
+ 
+ void __init omap_dsp_reserve_sdram_memblock(void)
+ {
+ 	phys_addr_t size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
+ 	phys_addr_t paddr;
+ 
+ 	if (!size)
+ 		return;
+ 
+ 	paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT);
+ 	if (!paddr) {
+ 		pr_err("%s: failed to reserve %x bytes\n",
+ 				__func__, size);
+ 		return;
+ 	}
+ 
+ 	omap_dsp_phys_mempool_base = paddr;
+ }
+ 
+ phys_addr_t omap_dsp_get_mempool_base(void)
+ {
+ 	return omap_dsp_phys_mempool_base;
+ }
+ EXPORT_SYMBOL(omap_dsp_get_mempool_base);
+ #endif
+ 
  /*
   * This gets called after board-specific INIT_MACHINE, and initializes most
   * on-chip peripherals accessible on this board (except for few like USB):

Re: linux-next: manual merge of the staging-next tree with the omap tree

[Greg KH]

On Wed, Oct 06, 2010 at 02:21:10PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> arch/arm/plat-omap/devices.c between commit
> f2ce62312650211f6cf665cd6dc519c334c4071e ("OMAP: WDT: Split OMAP1 and
> OMAP2PLUS device registration") from the omap tree and commit
> 90173882ed15a8034d6d162da5f343a2c7d87587 ("omap: add dsp platform
> device") from the staging-next tree.
> 
> Just overlapping removal/additions (I think).  I fixed it up (see below)
> and can carry the changes as necessary.

Your fixup looks correct to me, thanks for carrying it.

greg k-h