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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC:
arizona: Allow number of channels clocked to be restricted") from the
sound-asoc tree and commit 92a49871b378 ("extcon: arizona: Support use of
GPIO5 as an input to jack detection") from the char-misc 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 include/linux/mfd/arizona/pdata.h
index ec3e2a2,bcbe4fd..0000000
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@@ -98,13 -96,15 +98,22 @@@ struct arizona_pdata 
  	/** Pin state for GPIO pins */
  	int gpio_defaults[ARIZONA_MAX_GPIO];
  
 +	/**
 +	 * Maximum number of channels clocks will be generated for,
 +	 * useful for systems where and I2S bus with multiple data
 +	 * lines is mastered.
 +	 */
 +	int max_channels_clocked[ARIZONA_MAX_AIF];
 +
+ 	/** GPIO5 is used for jack detection */
+ 	bool jd_gpio5;
+ 
+ 	/** Use the headphone detect circuit to identify the accessory */
+ 	bool hpdet_acc_id;
+ 
+ 	/** GPIO used for mic isolation with HPDET */
+ 	int hpdet_id_gpio;
+ 
  	/** GPIO for mic detection polarity */
  	int micd_pol_gpio;
  

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

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

[Mark Brown]

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

On Mon, Jan 28, 2013 at 09:54:44PM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the char-misc tree got a conflict in
> include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC:
> arizona: Allow number of channels clocked to be restricted") from the
> sound-asoc tree and commit 92a49871b378 ("extcon: arizona: Support use of
> GPIO5 as an input to jack detection") from the char-misc tree.

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

Thanks.

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/atmel-ssc.c between commit 5c86ac695c7e ("ASoC: atmel-ssc:
use module_platform_driver macro") from the sound-asoc tree and commit
2d6bed9ca93e ("drivers/misc: remove use of __devexit_p") from the
char-misc 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 drivers/misc/atmel-ssc.c
index d07a9ed,c58f9ab..0000000
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@@ -186,10 -125,19 +186,10 @@@ static int ssc_probe(struct platform_de
  	dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n",
  			ssc->regs, ssc->irq);
  
 -	goto out;
 -
 -out_unmap:
 -	iounmap(ssc->regs);
 -out_clk:
 -	clk_put(ssc->clk);
 -out_free:
 -	kfree(ssc);
 -out:
 -	return retval;
 +	return 0;
  }
  
- static int __devexit ssc_remove(struct platform_device *pdev)
+ static int ssc_remove(struct platform_device *pdev)
  {
  	struct ssc_device *ssc = platform_get_drvdata(pdev);
  
@@@ -204,13 -155,21 +204,13 @@@ static struct platform_driver ssc_drive
  	.driver		= {
  		.name		= "ssc",
  		.owner		= THIS_MODULE,
 +		.of_match_table	= of_match_ptr(atmel_ssc_dt_ids),
  	},
 +	.id_table	= atmel_ssc_devtypes,
 +	.probe		= ssc_probe,
- 	.remove		= __devexit_p(ssc_remove),
++	.remove		= ssc_remove,
  };
 -
 -static int __init ssc_init(void)
 -{
 -	return platform_driver_probe(&ssc_driver, ssc_probe);
 -}
 -module_init(ssc_init);
 -
 -static void __exit ssc_exit(void)
 -{
 -	platform_driver_unregister(&ssc_driver);
 -}
 -module_exit(ssc_exit);
 +module_platform_driver(ssc_driver);
  
  MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
  MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");

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

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

[Greg KH]

On Mon, Nov 26, 2012 at 07:42:29PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/misc/atmel-ssc.c between commit 5c86ac695c7e ("ASoC: atmel-ssc:
> use module_platform_driver macro") from the sound-asoc tree and commit
> 2d6bed9ca93e ("drivers/misc: remove use of __devexit_p") from the
> char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h