linux-next: manual merge of the sound tree with the arm-soc tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
arch/arm/plat-omap/devices.c between commit 40246e0003f0 ("ARM: OMAP:
mcbsp: Move out omap_mcbsp_register_board_cfg from plat-omap/devices")
from the arm-soc tree and commit d231f5cbac9e ("OMAP: McPDM: Convert
McPDM device to omap_device") from the sound tree.

Just overlapping removals.  I fixed it up (see below) and can carry the
fix as necessary.

Mark, Liam:  That sound tree commit has a few Signed-off-by lines with no
email addresses.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/plat-omap/devices.c
index acd132c,40eca9b..0000000
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@@ -24,44 -24,56 +24,11 @@@
  #include <plat/tc.h>
  #include <plat/board.h>
  #include <plat/mmc.h>
 -#include <mach/gpio.h>
  #include <plat/menelaus.h>
 -#include <plat/mcbsp.h>
  #include <plat/omap44xx.h>
  
- #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
- 		defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
- 
- static struct resource mcpdm_resources[] = {
- 	{
- 		.name		= "mcpdm_mem",
- 		.start		= OMAP44XX_MCPDM_BASE,
- 		.end		= OMAP44XX_MCPDM_BASE + SZ_4K,
- 		.flags		= IORESOURCE_MEM,
- 	},
- 	{
- 		.name		= "mcpdm_irq",
- 		.start		= OMAP44XX_IRQ_MCPDM,
- 		.end		= OMAP44XX_IRQ_MCPDM,
- 		.flags		= IORESOURCE_IRQ,
- 	},
- };
- 
- static struct platform_device omap_mcpdm_device = {
- 	.name		= "omap-mcpdm",
- 	.id		= -1,
- 	.num_resources	= ARRAY_SIZE(mcpdm_resources),
- 	.resource	= mcpdm_resources,
- };
- 
- static void omap_init_mcpdm(void)
- {
- 	(void) platform_device_register(&omap_mcpdm_device);
- }
- #else
- static inline void omap_init_mcpdm(void) {}
- #endif
- 
  /*-------------------------------------------------------------------------*/
  
 -#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
 -
 -static struct platform_device **omap_mcbsp_devices;
 -
 -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
 -			struct omap_mcbsp_platform_data *config, int size)
 -{
 -	int i;
 -
 -	omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
 -				     GFP_KERNEL);
 -	if (!omap_mcbsp_devices) {
 -		printk(KERN_ERR "Could not register McBSP devices\n");
 -		return;
 -	}
 -
 -	for (i = 0; i < size; i++) {
 -		struct platform_device *new_mcbsp;
 -		int ret;
 -
 -		new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
 -		if (!new_mcbsp)
 -			continue;
 -		platform_device_add_resources(new_mcbsp, &res[i * res_count],
 -					res_count);
 -		new_mcbsp->dev.platform_data = &config[i];
 -		ret = platform_device_add(new_mcbsp);
 -		if (ret) {
 -			platform_device_put(new_mcbsp);
 -			continue;
 -		}
 -		omap_mcbsp_devices[i] = new_mcbsp;
 -	}
 -}
 -
 -#else
 -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
 -			struct omap_mcbsp_platform_data *config, int size)
 -{  }
 -#endif
 -
 -/*-------------------------------------------------------------------------*/
 -
  #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
  	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
  

Attachment: pgpeAuRbboNC1.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux