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

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
drivers/video/sh_mobile_hdmi.c between commit
6de9edd5bde0cdfea12e9948690e53ec669c3018 ("fbdev: sh_mobile_hdmi:
implement locking") from the genesis tree and commits
1d6be338c11ddc1e58915ab85e19b0f6cbc10782 ("ASoC: Add sh_mobile_hdmi sound
support") and ec4e5ccd4b8be576f9cd8bfc3cb8651565ed87ef ("fbdev:
sh_mobile_hdmi: add new label for sound error path") from the sound-asoc
tree.

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

diff --cc drivers/video/sh_mobile_hdmi.c
index 4d6ab86,ef989d9..0000000
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@@ -227,8 -224,60 +229,60 @@@ static u8 hdmi_read(struct sh_hdmi *hdm
  	return ioread8(hdmi->base + reg);
  }
  
+ /*
+  *	HDMI sound
+  */
+ static unsigned int sh_hdmi_snd_read(struct snd_soc_codec *codec,
+ 				     unsigned int reg)
+ {
+ 	struct sh_hdmi *hdmi = snd_soc_codec_get_drvdata(codec);
+ 
+ 	return hdmi_read(hdmi, reg);
+ }
+ 
+ static int sh_hdmi_snd_write(struct snd_soc_codec *codec,
+ 			     unsigned int reg,
+ 			     unsigned int value)
+ {
+ 	struct sh_hdmi *hdmi = snd_soc_codec_get_drvdata(codec);
+ 
+ 	hdmi_write(hdmi, value, reg);
+ 	return 0;
+ }
+ 
+ static struct snd_soc_dai_driver sh_hdmi_dai = {
+ 	.name = "sh_mobile_hdmi-hifi",
+ 	.playback = {
+ 		.stream_name = "Playback",
+ 		.channels_min = 2,
+ 		.channels_max = 8,
+ 		.rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100  |
+ 			 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200  |
+ 			 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
+ 			 SNDRV_PCM_RATE_192000,
+ 		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,
+ 	},
+ };
+ 
+ static int sh_hdmi_snd_probe(struct snd_soc_codec *codec)
+ {
+ 	dev_info(codec->dev, "SH Mobile HDMI Audio Codec");
+ 
+ 	return 0;
+ }
+ 
+ static struct snd_soc_codec_driver soc_codec_dev_sh_hdmi = {
+ 	.probe		= sh_hdmi_snd_probe,
+ 	.read		= sh_hdmi_snd_read,
+ 	.write		= sh_hdmi_snd_write,
+ };
+ 
+ /*
+  *	HDMI video
+  */
+ 
  /* External video parameter settings */
 -static void hdmi_external_video_param(struct sh_hdmi *hdmi)
 +static void sh_hdmi_external_video_param(struct sh_hdmi *hdmi)
  {
  	struct fb_var_screeninfo *var = &hdmi->var;
  	u16 htotal, hblank, hdelay, vtotal, vblank, vdelay, voffset;
@@@ -1041,7 -964,11 +1114,12 @@@ static int __init sh_hdmi_probe(struct 
  		return -ENOMEM;
  	}
  
+ 	ret =  snd_soc_register_codec(&pdev->dev,
+ 			&soc_codec_dev_sh_hdmi, &sh_hdmi_dai, 1);
+ 	if (ret < 0)
+ 		goto esndreg;
+ 
 +	mutex_init(&hdmi->mutex);
  	hdmi->dev = &pdev->dev;
  
  	hdmi->hdmi_clk = clk_get(&pdev->dev, "ick");
@@@ -1109,7 -1053,9 +1187,9 @@@ ereqreg
  erate:
  	clk_put(hdmi->hdmi_clk);
  egetclk:
 +	mutex_destroy(&hdmi->mutex);
+ 	snd_soc_unregister_codec(&pdev->dev);
+ esndreg:
  	kfree(hdmi);
  
  	return ret;
@@@ -1120,19 -1066,17 +1200,21 @@@ static int __exit sh_hdmi_remove(struc
  	struct sh_mobile_hdmi_info *pdata = pdev->dev.platform_data;
  	struct sh_hdmi *hdmi = platform_get_drvdata(pdev);
  	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 +	struct sh_mobile_lcdc_board_cfg	*board_cfg = &pdata->lcd_chan->board_cfg;
  	int irq = platform_get_irq(pdev, 0);
  
+ 	snd_soc_unregister_codec(&pdev->dev);
+ 
 -	pdata->lcd_chan->board_cfg.display_on = NULL;
 -	pdata->lcd_chan->board_cfg.display_off = NULL;
 -	pdata->lcd_chan->board_cfg.board_data = NULL;
 +	board_cfg->display_on = NULL;
 +	board_cfg->display_off = NULL;
 +	board_cfg->board_data = NULL;
 +	board_cfg->owner = NULL;
  
 +	/* No new work will be scheduled, wait for running ISR */
  	free_irq(irq, hdmi);
 -	pm_runtime_disable(&pdev->dev);
 +	/* Wait for already scheduled work */
  	cancel_delayed_work_sync(&hdmi->edid_work);
 +	pm_runtime_disable(&pdev->dev);
  	clk_disable(hdmi->hdmi_clk);
  	clk_put(hdmi->hdmi_clk);
  	iounmap(hdmi->base);

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

[Mark Brown]

On Wed, Sep 15, 2010 at 12:11:28PM +1000, Stephen Rothwell wrote:

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

Looks reasonable to me, though Guennadi and Morimoto-san are the experts
here.  Thanks!

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

[Guennadi Liakhovetski]

On Wed, 15 Sep 2010, Mark Brown wrote:

> On Wed, Sep 15, 2010 at 12:11:28PM +1000, Stephen Rothwell wrote:
> 
> > I fixed it up (I think - see below) and can carry the fix as necessary.
> 
> Looks reasonable to me, though Guennadi and Morimoto-san are the experts
> here.  Thanks!

Yes, looks good to me too. Thanks, Stephen!

Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

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

[Kuninori Morimoto]

Dear Stephen

> > > I fixed it up (I think - see below) and can carry the fix as necessary.
> > 
> > Looks reasonable to me, though Guennadi and Morimoto-san are the experts
> > here.  Thanks!
> 
> Yes, looks good to me too. Thanks, Stephen!

YES. me too.
Thank you Stephen.

But I wonder.
Now Paul and Mark are adding patches to this file.

Paul : sh_mobile_hdmi video
Mark : sh_mobile_hdmi sound

If I (for sound) and Guennadi (for video) would like to add
new patches to it in future (in same time),
what should I do ?

Best regards
--
Kuninori Morimoto
 

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

[Mark Brown]

On Thu, Sep 16, 2010 at 09:53:42AM +0900, Kuninori Morimoto wrote:

> If I (for sound) and Guennadi (for video) would like to add
> new patches to it in future (in same time),
> what should I do ?

Ideally the patches will be layering on top of the changes in one tree
or the other so you can follow the affected tree.  Once the merge window
is over they should be going via the video route.