[i2c] [patch 2.6.21-git] i2c-at91 supports new-style binding

Jean Delvare khali at linux-fr.org
Fri May 4 17:30:30 CEST 2007


Hello David,

On Tue, 1 May 2007 11:34:37 -0700, David Brownell wrote:
> Make i2c-at91 register as i2c adapter zero (none of these chips seem to
> have more than one TWI controller) to let it kick in any board-specific
> device declarations; also make it hotplug/coldplug.
> 
> Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
> 
> ---
>  drivers/i2c/busses/i2c-at91.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> --- g26.orig/drivers/i2c/busses/i2c-at91.c	2007-01-07 19:34:46.000000000 -0800
> +++ g26/drivers/i2c/busses/i2c-at91.c	2007-05-01 11:26:07.000000000 -0700
> @@ -227,13 +227,14 @@ static int __devinit at91_i2c_probe(stru
>  	adapter->algo = &at91_algorithm;
>  	adapter->class = I2C_CLASS_HWMON;
>  	adapter->dev.parent = &pdev->dev;
> +	/* adapter->id == 0 ... only one TWI controller for now */
>  
>  	platform_set_drvdata(pdev, adapter);
>  
>  	clk_enable(twi_clk);		/* enable peripheral clock */
>  	at91_twi_hwinit();		/* initialize TWI controller */
>  
> -	rc = i2c_add_adapter(adapter);
> +	rc = i2c_add_numbered_adapter(adapter);
>  	if (rc) {
>  		dev_err(&pdev->dev, "Adapter %s registration failed\n",
>  				adapter->name);
> @@ -296,6 +297,9 @@ static int at91_i2c_resume(struct platfo
>  #define at91_i2c_resume		NULL
>  #endif
>  
> +/* work with "modprobe at91_i2c" from hotplugging or coldplugging */
> +MODULE_ALIAS("at91_i2c");
> +
>  static struct platform_driver at91_i2c_driver = {
>  	.probe		= at91_i2c_probe,
>  	.remove		= __devexit_p(at91_i2c_remove),

Applied, thanks.

-- 
Jean Delvare



More information about the i2c mailing list