linux-next: manual merge of the sound-asoc tree with the v4l-dvb tree

linux-next: manual merge of the sound-asoc tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2507 bytes --]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit b6c14dc29757
("[media] Visstrim M10: Add support for Coda") from the v4l-dvb tree and
commit d41789b2660e ("ASoC: mx27vis: retrieve gpio numbers from
platform_data") from the sound-asoc tree.

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

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

diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 821d6aa,5627229..0000000
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -32,6 -32,8 +32,7 @@@
  #include <linux/delay.h>
  #include <linux/dma-mapping.h>
  #include <linux/leds.h>
 -#include <linux/memblock.h>
+ #include <linux/platform_data/asoc-mx27vis.h>
  #include <media/soc_camera.h>
  #include <sound/tlv320aic32x4.h>
  #include <asm/mach-types.h>
@@@ -403,47 -436,14 +434,55 @@@ static const struct imx_ssi_platform_da
  	.flags			= IMX_SSI_DMA | IMX_SSI_SYN,
  };
  
 +/* coda */
 +
 +static void __init visstrim_coda_init(void)
 +{
 +	struct platform_device *pdev;
 +	int dma;
 +
 +	pdev = imx27_add_coda();
 +	dma = dma_declare_coherent_memory(&pdev->dev,
 +					  mx2_camera_base + MX2_CAMERA_BUF_SIZE,
 +					  mx2_camera_base + MX2_CAMERA_BUF_SIZE,
 +					  MX2_CAMERA_BUF_SIZE,
 +					  DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
 +	if (!(dma & DMA_MEMORY_MAP))
 +		return;
 +}
 +
 +/* DMA deinterlace */
 +static struct platform_device visstrim_deinterlace = {
 +	.name = "m2m-deinterlace",
 +	.id = 0,
 +};
 +
 +static void __init visstrim_deinterlace_init(void)
 +{
 +	int ret = -ENOMEM;
 +	struct platform_device *pdev = &visstrim_deinterlace;
 +	int dma;
 +
 +	ret = platform_device_register(pdev);
 +
 +	dma = dma_declare_coherent_memory(&pdev->dev,
 +					  mx2_camera_base + 2 * MX2_CAMERA_BUF_SIZE,
 +					  mx2_camera_base + 2 * MX2_CAMERA_BUF_SIZE,
 +					  MX2_CAMERA_BUF_SIZE,
 +					  DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
 +	if (!(dma & DMA_MEMORY_MAP))
 +		return;
 +}
 +
 +
+ /* Audio */
+ static const struct snd_mx27vis_platform_data snd_mx27vis_pdata __initconst = {
+ 	.amp_gain0_gpio = AMP_GAIN_0,
+ 	.amp_gain1_gpio = AMP_GAIN_1,
+ 	.amp_mutel_gpio = AMP_MUTE_SDL,
+ 	.amp_muter_gpio = AMP_MUTE_SDR,
+ };
+ 
  static void __init visstrim_m10_revision(void)
  {
  	int exp_version = 0;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]