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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit 5ec65ee589fd
("ASoC: mx27vis-aic32x4: Convert it to platform driver") from the
sound-asoc tree and commit f52f5a5503b5 ("i.MX27: visstrim_m10: Add video
support") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 428459f,0a1643c..0000000
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -263,7 -393,10 +393,11 @@@ static void __init visstrim_m10_board_i
  	imx27_add_fec(NULL);
  	imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);
  	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+ 	platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,
+ 				      &iclink_tvp5150, sizeof(iclink_tvp5150));
+ 	gpio_led_register_device(0, &visstrim_m10_led_data);
+ 	visstrim_camera_init();
 +	imx_add_platform_device("mx27vis", 0, NULL, 0, NULL, 0);
  }
  
  static void __init visstrim_m10_timer_init(void)

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

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

[Mark Brown]

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

On Wed, Mar 14, 2012 at 05:06:28PM +1100, Stephen Rothwell wrote:

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

Looks good, thanks.

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

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

[Olof Johansson]

On Sun, Dec 9, 2012 at 10:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/plat-samsung/include/plat/devs.h between commit a08485d8fdf6
> ("ASoC: Samsung: Do not register samsung audio dma device as pdev") from
> the sound-asoc tree and commit 0a9d5ac307ae ("ARM: EXYNOS: removing
> exynos-drm device registration from non-dt platforms") from the arm-soc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.


-Olof

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-samsung/include/plat/devs.h between commit a08485d8fdf6
("ASoC: Samsung: Do not register samsung audio dma device as pdev") from
the sound-asoc tree and commit 0a9d5ac307ae ("ARM: EXYNOS: removing
exynos-drm device registration from non-dt platforms") 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@canb.auug.org.au

diff --cc arch/arm/plat-samsung/include/plat/devs.h
index c45f70c,f53beba..0000000
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@@ -133,8 -132,7 +132,6 @@@ extern struct platform_device exynos4_d
  extern struct platform_device exynos4_device_pcm2;
  extern struct platform_device exynos4_device_spdif;
  
- extern struct platform_device exynos_device_drm;
- 
 -extern struct platform_device samsung_asoc_dma;
  extern struct platform_device samsung_asoc_idma;
  extern struct platform_device samsung_device_keypad;
  

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

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

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [120919 23:07]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got conflicts in
> sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c,
> sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit
> 152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the
> sound-asoc tree and commit 2203747c9771 ("ARM: omap: move platform_data
> definitions") from the arm-soc tree.
> 
> The former removed the files, so I did that and can carry the fix as
> necessary (no action is required).

OK thanks again.

Tony

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c,
sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit
152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the
sound-asoc tree and commit 2203747c9771 ("ARM: omap: move platform_data
definitions") from the arm-soc tree.

The former removed the files, so I did that and can carry the fix as
necessary (no action is required).

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

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
sound/soc/mxs/mxs-saif.c between commit 08641c7c74dd ("ASoC: mxs: add
device tree support for mxs-saif") from the sound-asoc tree and commit
f755865f9082 ("ASoC: mxs-saif: adopt pinctrl support") from the arm-soc
tree.

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

diff --cc sound/soc/mxs/mxs-saif.c
index 0642748,7fd224b..0000000
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@@ -628,50 -626,38 +629,57 @@@ static int __devinit mxs_saif_probe(str
  	struct resource *iores, *dmares;
  	struct mxs_saif *saif;
  	struct mxs_saif_platform_data *pdata;
+ 	struct pinctrl *pinctrl;
  	int ret = 0;
  
 -	if (pdev->id >= ARRAY_SIZE(mxs_saif))
 +
 +	if (!np && pdev->id >= ARRAY_SIZE(mxs_saif))
  		return -EINVAL;
  
  	saif = devm_kzalloc(&pdev->dev, sizeof(*saif), GFP_KERNEL);
  	if (!saif)
  		return -ENOMEM;
  
 -	mxs_saif[pdev->id] = saif;
 -	saif->id = pdev->id;
 -
 -	pdata = pdev->dev.platform_data;
 -	if (pdata && !pdata->master_mode) {
 -		saif->master_id = pdata->master_id;
 -		if (saif->master_id < 0 ||
 -			saif->master_id >= ARRAY_SIZE(mxs_saif) ||
 -			saif->master_id == saif->id) {
 -			dev_err(&pdev->dev, "get wrong master id\n");
 -			return -EINVAL;
 +	if (np) {
 +		struct device_node *master;
 +		saif->id = of_alias_get_id(np, "saif");
 +		if (saif->id < 0)
 +			return saif->id;
 +		/*
 +		 * If there is no "fsl,saif-master" phandle, it's a saif
 +		 * master.  Otherwise, it's a slave and its phandle points
 +		 * to the master.
 +		 */
 +		master = of_parse_phandle(np, "fsl,saif-master", 0);
 +		if (!master) {
 +			saif->master_id = saif->id;
 +		} else {
 +			saif->master_id = of_alias_get_id(master, "saif");
 +			if (saif->master_id < 0)
 +				return saif->master_id;
  		}
  	} else {
 -		saif->master_id = saif->id;
 +		saif->id = pdev->id;
 +		pdata = pdev->dev.platform_data;
 +		if (pdata && !pdata->master_mode)
 +			saif->master_id = pdata->master_id;
 +		else
 +			saif->master_id = saif->id;
 +	}
 +
 +	if (saif->master_id < 0 || saif->master_id >= ARRAY_SIZE(mxs_saif)) {
 +		dev_err(&pdev->dev, "get wrong master id\n");
 +		return -EINVAL;
  	}
  
 +	mxs_saif[saif->id] = saif;
 +
+ 	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ 	if (IS_ERR(pinctrl)) {
+ 		ret = PTR_ERR(pinctrl);
+ 		return ret;
+ 	}
+ 
  	saif->clk = clk_get(&pdev->dev, NULL);
  	if (IS_ERR(saif->clk)) {
  		ret = PTR_ERR(saif->clk);

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-mxc/audmux-v1.c between commit 2405fc9728a3 ("ARM: imx:
merge audmux-v1 and audmux-v2") from the sound-asoc tree and commit
48d795616c73 ("ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's") from
the arm-soc tree.

The former removed this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/mm-imx3.c between commit 3bc34a614335 ("ARM: imx:
convert audmux to a platform driver") from the sound-asoc tree and commit
bb07d7511e08 ("ARM: mx3: Setup AIPS registers") from the arm-soc tree.

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

diff --cc arch/arm/mach-imx/mm-imx3.c
index 9c9b7f9,17963e0..0000000
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@@ -177,8 -175,9 +179,12 @@@ void __init imx31_soc_init(void
  	}
  
  	imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);
+ 
+ 	imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS1_BASE_ADDR));
+ 	imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS2_BASE_ADDR));
++
 +	platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res,
 +					ARRAY_SIZE(imx31_audmux_res));
  }
  #endif /* ifdef CONFIG_SOC_IMX31 */
  

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