[PATCH] i2c: tea5761: New-style i2c driver

[PATCH] i2c: tea5761: New-style i2c driver

[Eduardo Valentin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 7778 bytes --]

From: Eduardo Valentin <eduardo.valentin@indt.org.br>

This patch updates the fm radio driver for tea5761 chip.
It also moves board dependent code to its correct board
file place.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
---
 arch/arm/mach-omap2/board-n800.c    |   34 +++++++++
 drivers/media/radio/radio-tea5761.c |  138 ++--------------------------------
 2 files changed, 43 insertions(+), 129 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 34f1c37..907198a 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -258,6 +258,34 @@ static void tsc2301_dev_init(void)
 	}
 }
 
+static int __init tea5761_dev_init(void)
+{
+	const struct omap_tea5761_config *info;
+	int enable_gpio = 0;
+
+	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
+	if (info) {
+		enable_gpio = info->enable_gpio;
+	}
+
+	if (enable_gpio) {
+		pr_debug("Enabling tea5761 at GPIO %d\n",
+			 enable_gpio);
+
+		if (omap_request_gpio(enable_gpio) < 0) {
+			printk(KERN_ERR "Can't request GPIO %d\n",
+			       enable_gpio);
+			return -ENODEV;
+		}
+
+		omap_set_gpio_direction(enable_gpio, 0);
+		udelay(50);
+		omap_set_gpio_dataout(enable_gpio, 1);
+	}
+
+	return 0;
+}
+
 static struct omap2_mcspi_device_config tsc2301_mcspi_config = {
 	.turbo_mode	= 0,
 	.single_channel = 1,
@@ -470,6 +498,11 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
 		.platform_data = &n800_tcm825x_platform_data,
 	},
 #endif
+#if defined (CONFIG_RADIO_TEA5761) || defined (CONFIG_RADIO_TEA5761_MODULE)
+	{
+		I2C_BOARD_INFO("tea5761", 0x10),
+	},
+#endif
 };
 
 void __init nokia_n800_common_init(void)
@@ -500,6 +533,7 @@ static void __init nokia_n800_init(void)
 	n800_audio_init(&tsc2301_config);
 	n800_ts_set_config();
 	tsc2301_dev_init();
+	tea5761_dev_init();
 	omap_register_gpio_switches(n800_gpio_switches,
 				    ARRAY_SIZE(n800_gpio_switches));
 }
diff --git a/drivers/media/radio/radio-tea5761.c b/drivers/media/radio/radio-tea5761.c
index ac0f621..2341e66 100644
--- a/drivers/media/radio/radio-tea5761.c
+++ b/drivers/media/radio/radio-tea5761.c
@@ -74,14 +74,6 @@
 #define TEA5761_FREQ_LOW	87500
 #define TEA5761_FREQ_HIGH	108000
 
-/* Probe for TEA5761 twice since the version N4B seems to be
- * broken and needs two probes to be found */
-static unsigned short normal_i2c[] = {
-	TEA5761_I2C_ADDR, TEA5761_I2C_ADDR, I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;
-
 struct tea5761_regs {
 	u16 intreg;
 	u16 frqset;
@@ -423,67 +415,22 @@ static struct video_device tea5761_video_device = {
 	.release       = video_device_release
 };
 
-static int tea5761_probe(struct i2c_adapter *adapter, int address,
-			  int kind)
+static int tea5761_i2c_driver_probe(struct i2c_client *client)
 {
-	struct i2c_client *client;
 	struct video_device *video_dev;
 	int err = 0;
-	static const char *client_name = "TEA5761 FM-Radio";
 	struct tea5761_device *tea = &tea5761;
-	struct tea5761_regs   *r = &tea->regs;
 
 	mutex_init(&tea->mutex);
-        /* I2C detection and initialization */
-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-	if (client == NULL) {
-		dev_err(&adapter->dev, DRIVER_NAME
-			": couldn't allocate memory\n");
-		return -ENOMEM;
-	}
-	tea->i2c_dev = client;
 
-	client->addr = address;
-	client->adapter = adapter;
-	client->driver = &tea5761_driver;
-	client->dev.driver = &tea5761_driver.driver;
-	client->flags = 0;
-	strlcpy(client->name, client_name, I2C_NAME_SIZE);
-
-	if (kind < 0) {
-		if (tea5761_read_regs(tea) < 0) {
-			dev_info(&client->dev,
-				 "chip read failed for %d-%04x\n",
-				 adapter->nr, address);
-			goto err_tea_dev;
-		}
-		if (r->chipid != TEA5761_CHIPID) {
-			dev_info(&client->dev,
-				 "bad chipid (0x%04x) at %d-%04x\n",
-				 r->chipid, adapter->nr, address);
-			goto err_tea_dev;
-		}
-		if ((r->manid & 0x0fff) != TEA5761_MANID) {
-			dev_info(&client->dev,
-				 "bad manid (0x%04x) at %d-%04x\n",
-				 r->manid, adapter->nr, address);
-			goto err_tea_dev;
-		}
-	}
-
-	err = i2c_attach_client(client);
-	if (err) {
-		dev_err(&client->dev, "couldn't attach to address %d-%04x\n",
-		        adapter->nr, address);
-		goto err_tea_dev;
-	}
+	tea->i2c_dev = client;
 
 	/* V4L initialization */
 	video_dev = video_device_alloc();
 	if (video_dev == NULL) {
 		dev_err(&client->dev, "couldn't allocate memory\n");
 		err = -ENOMEM;
-		goto err_i2c_attach;
+		goto exit;
 	}
 	tea->video_dev = video_dev;
 
@@ -506,105 +453,39 @@ static int tea5761_probe(struct i2c_adapter *adapter, int address,
 		goto err_video_alloc;
 	}
 
-	dev_info(&client->dev, "tea5761 (version %d) detected at %d-%04x\n",
-		(tea->regs.manid >> 12) & 0xf, adapter->nr, address);
+	dev_info(&client->dev, "tea5761 (version %d) detected\n",
+		(tea->regs.manid >> 12) & 0xf);
 
 	return 0;
 
 err_video_alloc:
 	video_device_release(video_dev);
-err_i2c_attach:
-	i2c_detach_client(client);
-err_tea_dev:
+exit:
 	kfree(client);
 	return err;
 }
 
-static int tea5761_attach_adapter(struct i2c_adapter *adapter)
-{
-	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
-		return -EINVAL;
-
-	return i2c_probe(adapter, &addr_data, tea5761_probe);
-}
-
-static int tea5761_detach_client(struct i2c_client *client)
+static int tea5761_i2c_driver_remove(struct i2c_client *client)
 {
 	struct video_device *vd = i2c_get_clientdata(client);
 
-	i2c_detach_client(client);
 	video_unregister_device(vd);
-	kfree(client);
 
 	return 0;
 }
 
 static struct i2c_driver tea5761_driver = {
-	.id		= I2C_DRIVERID_TUNER,
 	.driver = {
 		.name	= DRIVER_NAME,
 	},
-	.attach_adapter	= tea5761_attach_adapter,
-	.detach_client	= tea5761_detach_client,
+	.probe	= tea5761_i2c_driver_probe,
+	.remove = tea5761_i2c_driver_remove,
 };
 
-#if CONFIG_ARCH_OMAP
-/* No way to pass platform device data. Enable here all the TEA5761
- * devices, since I2C address scanning will need them to respond.
- */
-static int enable_gpio;
-
-static int __init tea5761_dev_init(void)
-{
-	const struct omap_tea5761_config *info;
-
-	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
-	if (info) {
-		enable_gpio = info->enable_gpio;
-	}
-
-	if (enable_gpio) {
-		pr_debug(DRIVER_NAME ": enabling tea5761 at GPIO %d\n",
-			 enable_gpio);
-
-		if (omap_request_gpio(enable_gpio) < 0) {
-			printk(KERN_ERR DRIVER_NAME ": can't request GPIO %d\n",
-			       enable_gpio);
-			return -ENODEV;
-		}
-
-		omap_set_gpio_direction(enable_gpio, 0);
-		udelay(50);
-		omap_set_gpio_dataout(enable_gpio, 1);
-	}
-
-	return 0;
-}
-
-static void __exit tea5761_dev_exit(void)
-{
-	if (enable_gpio) {
-		omap_set_gpio_dataout(enable_gpio, 0);
-		omap_free_gpio(enable_gpio);
-	}
-}
-#else
-static int __init tea5761_dev_init(void)
-{
-}
-
-static void __exit tea5761_dev_exit(void)
-{
-}
-#endif
-
 static int __init tea5761_init(void)
 {
 	int res;
 
-	if ((res = tea5761_dev_init()) < 0)
-		return res;
-
 	if ((res = i2c_add_driver(&tea5761_driver))) {
 		printk(KERN_ERR DRIVER_NAME ": driver registration failed\n");
 		return res;
@@ -616,7 +497,6 @@ static int __init tea5761_init(void)
 static void __exit tea5761_exit(void)
 {
 	i2c_del_driver(&tea5761_driver);
-	tea5761_dev_exit();
 }
 
 MODULE_AUTHOR("Timo Teräs");
-- 
1.5.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] i2c: tea5761: New-style i2c driver

[Tony Lindgren]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 8701 bytes --]

* Eduardo Valentin <edubezval@gmail.com> [080327 17:32]:
> From: Eduardo Valentin <eduardo.valentin@indt.org.br>
> 
> This patch updates the fm radio driver for tea5761 chip.
> It also moves board dependent code to its correct board
> file place.

Pushing today. You might want to start discussing this driver on V4L list
too.

Tony


> Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
> ---
>  arch/arm/mach-omap2/board-n800.c    |   34 +++++++++
>  drivers/media/radio/radio-tea5761.c |  138 ++--------------------------------
>  2 files changed, 43 insertions(+), 129 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
> index 34f1c37..907198a 100644
> --- a/arch/arm/mach-omap2/board-n800.c
> +++ b/arch/arm/mach-omap2/board-n800.c
> @@ -258,6 +258,34 @@ static void tsc2301_dev_init(void)
>  	}
>  }
>  
> +static int __init tea5761_dev_init(void)
> +{
> +	const struct omap_tea5761_config *info;
> +	int enable_gpio = 0;
> +
> +	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
> +	if (info) {
> +		enable_gpio = info->enable_gpio;
> +	}
> +
> +	if (enable_gpio) {
> +		pr_debug("Enabling tea5761 at GPIO %d\n",
> +			 enable_gpio);
> +
> +		if (omap_request_gpio(enable_gpio) < 0) {
> +			printk(KERN_ERR "Can't request GPIO %d\n",
> +			       enable_gpio);
> +			return -ENODEV;
> +		}
> +
> +		omap_set_gpio_direction(enable_gpio, 0);
> +		udelay(50);
> +		omap_set_gpio_dataout(enable_gpio, 1);
> +	}
> +
> +	return 0;
> +}
> +
>  static struct omap2_mcspi_device_config tsc2301_mcspi_config = {
>  	.turbo_mode	= 0,
>  	.single_channel = 1,
> @@ -470,6 +498,11 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
>  		.platform_data = &n800_tcm825x_platform_data,
>  	},
>  #endif
> +#if defined (CONFIG_RADIO_TEA5761) || defined (CONFIG_RADIO_TEA5761_MODULE)
> +	{
> +		I2C_BOARD_INFO("tea5761", 0x10),
> +	},
> +#endif
>  };
>  
>  void __init nokia_n800_common_init(void)
> @@ -500,6 +533,7 @@ static void __init nokia_n800_init(void)
>  	n800_audio_init(&tsc2301_config);
>  	n800_ts_set_config();
>  	tsc2301_dev_init();
> +	tea5761_dev_init();
>  	omap_register_gpio_switches(n800_gpio_switches,
>  				    ARRAY_SIZE(n800_gpio_switches));
>  }
> diff --git a/drivers/media/radio/radio-tea5761.c b/drivers/media/radio/radio-tea5761.c
> index ac0f621..2341e66 100644
> --- a/drivers/media/radio/radio-tea5761.c
> +++ b/drivers/media/radio/radio-tea5761.c
> @@ -74,14 +74,6 @@
>  #define TEA5761_FREQ_LOW	87500
>  #define TEA5761_FREQ_HIGH	108000
>  
> -/* Probe for TEA5761 twice since the version N4B seems to be
> - * broken and needs two probes to be found */
> -static unsigned short normal_i2c[] = {
> -	TEA5761_I2C_ADDR, TEA5761_I2C_ADDR, I2C_CLIENT_END
> -};
> -
> -I2C_CLIENT_INSMOD;
> -
>  struct tea5761_regs {
>  	u16 intreg;
>  	u16 frqset;
> @@ -423,67 +415,22 @@ static struct video_device tea5761_video_device = {
>  	.release       = video_device_release
>  };
>  
> -static int tea5761_probe(struct i2c_adapter *adapter, int address,
> -			  int kind)
> +static int tea5761_i2c_driver_probe(struct i2c_client *client)
>  {
> -	struct i2c_client *client;
>  	struct video_device *video_dev;
>  	int err = 0;
> -	static const char *client_name = "TEA5761 FM-Radio";
>  	struct tea5761_device *tea = &tea5761;
> -	struct tea5761_regs   *r = &tea->regs;
>  
>  	mutex_init(&tea->mutex);
> -        /* I2C detection and initialization */
> -	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
> -	if (client == NULL) {
> -		dev_err(&adapter->dev, DRIVER_NAME
> -			": couldn't allocate memory\n");
> -		return -ENOMEM;
> -	}
> -	tea->i2c_dev = client;
>  
> -	client->addr = address;
> -	client->adapter = adapter;
> -	client->driver = &tea5761_driver;
> -	client->dev.driver = &tea5761_driver.driver;
> -	client->flags = 0;
> -	strlcpy(client->name, client_name, I2C_NAME_SIZE);
> -
> -	if (kind < 0) {
> -		if (tea5761_read_regs(tea) < 0) {
> -			dev_info(&client->dev,
> -				 "chip read failed for %d-%04x\n",
> -				 adapter->nr, address);
> -			goto err_tea_dev;
> -		}
> -		if (r->chipid != TEA5761_CHIPID) {
> -			dev_info(&client->dev,
> -				 "bad chipid (0x%04x) at %d-%04x\n",
> -				 r->chipid, adapter->nr, address);
> -			goto err_tea_dev;
> -		}
> -		if ((r->manid & 0x0fff) != TEA5761_MANID) {
> -			dev_info(&client->dev,
> -				 "bad manid (0x%04x) at %d-%04x\n",
> -				 r->manid, adapter->nr, address);
> -			goto err_tea_dev;
> -		}
> -	}
> -
> -	err = i2c_attach_client(client);
> -	if (err) {
> -		dev_err(&client->dev, "couldn't attach to address %d-%04x\n",
> -		        adapter->nr, address);
> -		goto err_tea_dev;
> -	}
> +	tea->i2c_dev = client;
>  
>  	/* V4L initialization */
>  	video_dev = video_device_alloc();
>  	if (video_dev == NULL) {
>  		dev_err(&client->dev, "couldn't allocate memory\n");
>  		err = -ENOMEM;
> -		goto err_i2c_attach;
> +		goto exit;
>  	}
>  	tea->video_dev = video_dev;
>  
> @@ -506,105 +453,39 @@ static int tea5761_probe(struct i2c_adapter *adapter, int address,
>  		goto err_video_alloc;
>  	}
>  
> -	dev_info(&client->dev, "tea5761 (version %d) detected at %d-%04x\n",
> -		(tea->regs.manid >> 12) & 0xf, adapter->nr, address);
> +	dev_info(&client->dev, "tea5761 (version %d) detected\n",
> +		(tea->regs.manid >> 12) & 0xf);
>  
>  	return 0;
>  
>  err_video_alloc:
>  	video_device_release(video_dev);
> -err_i2c_attach:
> -	i2c_detach_client(client);
> -err_tea_dev:
> +exit:
>  	kfree(client);
>  	return err;
>  }
>  
> -static int tea5761_attach_adapter(struct i2c_adapter *adapter)
> -{
> -	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
> -		return -EINVAL;
> -
> -	return i2c_probe(adapter, &addr_data, tea5761_probe);
> -}
> -
> -static int tea5761_detach_client(struct i2c_client *client)
> +static int tea5761_i2c_driver_remove(struct i2c_client *client)
>  {
>  	struct video_device *vd = i2c_get_clientdata(client);
>  
> -	i2c_detach_client(client);
>  	video_unregister_device(vd);
> -	kfree(client);
>  
>  	return 0;
>  }
>  
>  static struct i2c_driver tea5761_driver = {
> -	.id		= I2C_DRIVERID_TUNER,
>  	.driver = {
>  		.name	= DRIVER_NAME,
>  	},
> -	.attach_adapter	= tea5761_attach_adapter,
> -	.detach_client	= tea5761_detach_client,
> +	.probe	= tea5761_i2c_driver_probe,
> +	.remove = tea5761_i2c_driver_remove,
>  };
>  
> -#if CONFIG_ARCH_OMAP
> -/* No way to pass platform device data. Enable here all the TEA5761
> - * devices, since I2C address scanning will need them to respond.
> - */
> -static int enable_gpio;
> -
> -static int __init tea5761_dev_init(void)
> -{
> -	const struct omap_tea5761_config *info;
> -
> -	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
> -	if (info) {
> -		enable_gpio = info->enable_gpio;
> -	}
> -
> -	if (enable_gpio) {
> -		pr_debug(DRIVER_NAME ": enabling tea5761 at GPIO %d\n",
> -			 enable_gpio);
> -
> -		if (omap_request_gpio(enable_gpio) < 0) {
> -			printk(KERN_ERR DRIVER_NAME ": can't request GPIO %d\n",
> -			       enable_gpio);
> -			return -ENODEV;
> -		}
> -
> -		omap_set_gpio_direction(enable_gpio, 0);
> -		udelay(50);
> -		omap_set_gpio_dataout(enable_gpio, 1);
> -	}
> -
> -	return 0;
> -}
> -
> -static void __exit tea5761_dev_exit(void)
> -{
> -	if (enable_gpio) {
> -		omap_set_gpio_dataout(enable_gpio, 0);
> -		omap_free_gpio(enable_gpio);
> -	}
> -}
> -#else
> -static int __init tea5761_dev_init(void)
> -{
> -}
> -
> -static void __exit tea5761_dev_exit(void)
> -{
> -}
> -#endif
> -
>  static int __init tea5761_init(void)
>  {
>  	int res;
>  
> -	if ((res = tea5761_dev_init()) < 0)
> -		return res;
> -
>  	if ((res = i2c_add_driver(&tea5761_driver))) {
>  		printk(KERN_ERR DRIVER_NAME ": driver registration failed\n");
>  		return res;
> @@ -616,7 +497,6 @@ static int __init tea5761_init(void)
>  static void __exit tea5761_exit(void)
>  {
>  	i2c_del_driver(&tea5761_driver);
> -	tea5761_dev_exit();
>  }
>  
>  MODULE_AUTHOR("Timo Teräs");
> -- 
> 1.5.4.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] i2c: tea5761: New-style i2c driver

[Jarkko Nikula]

On Thu, 27 Mar 2008 11:31:20 -0400
"ext Eduardo Valentin" <edubezval@gmail.com> wrote:

> From: Eduardo Valentin <eduardo.valentin@indt.org.br>
> 
> This patch updates the fm radio driver for tea5761 chip.
> It also moves board dependent code to its correct board
> file place.
> 
Good move forward!

Any plans to send this driver with Kconfig & Makefile modifications to
relevant V4L etc mailing list?

Note there are three minor warnings if you run your patch with
scripts/checkpatch.pl.

You could also remove these two headers files below since they are not
needed anymore.

> diff --git a/drivers/media/radio/radio-tea5761.c
> b/drivers/media/radio/radio-tea5761.c index ac0f621..2341e66 100644
> --- a/drivers/media/radio/radio-tea5761.c
> +++ b/drivers/media/radio/radio-tea5761.c
@@ -23,8 +23,8 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <media/v4l2-common.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>


-- 
Jarkko

Re: [PATCH] i2c: tea5761: New-style i2c driver

[Eduardo Valentin]

Hi Jarkko,

Thanks for the review.

>On Thu, 27 Mar 2008 11:31:20 -0400
>"ext Eduardo Valentin" <edubezval@gmail.com> wrote:
>
>> From: Eduardo Valentin <eduardo.valentin@indt.org.br>
>> 
>> This patch updates the fm radio driver for tea5761 chip.
>> It also moves board dependent code to its correct board
>> file place.
>> 
>Good move forward!
>
>Any plans to send this driver with Kconfig & Makefile modifications to
>relevant V4L etc mailing list?

Yes, I can send them to V4L2 mailing list after we have them in a good shape.

>
>Note there are three minor warnings if you run your patch with
>scripts/checkpatch.pl.

Yes, thanks. I'm sending an updated version.

>
>You could also remove these two headers files below since they are not
>needed anymore.

Already done in this new version.

>
>> diff --git a/drivers/media/radio/radio-tea5761.c
>> b/drivers/media/radio/radio-tea5761.c index ac0f621..2341e66 100644
>> --- a/drivers/media/radio/radio-tea5761.c
>> +++ b/drivers/media/radio/radio-tea5761.c
>@@ -23,8 +23,8 @@
> #include <linux/i2c.h>
> #include <linux/delay.h>
> #include <media/v4l2-common.h>
>-#include <asm/arch/gpio.h>
>-#include <asm/arch/board.h>
>
>
>-- 
>Jarkko

Cheers,

Eduardo Valentin

[PATCH] i2c: tea5761: New-style i2c driver

[Eduardo Valentin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 7969 bytes --]

From: Eduardo Valentin <eduardo.valentin@indt.org.br>

This patch updates the fm radio driver for tea5761 chip.
It also moves board dependent code to its correct board
file place.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
---
 arch/arm/mach-omap2/board-n800.c    |   33 ++++++++
 drivers/media/radio/radio-tea5761.c |  140 ++--------------------------------
 2 files changed, 42 insertions(+), 131 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 34f1c37..758e2c1 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -258,6 +258,33 @@ static void tsc2301_dev_init(void)
 	}
 }
 
+static int __init tea5761_dev_init(void)
+{
+	const struct omap_tea5761_config *info;
+	int enable_gpio = 0;
+
+	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
+	if (info)
+		enable_gpio = info->enable_gpio;
+
+	if (enable_gpio) {
+		pr_debug("Enabling tea5761 at GPIO %d\n",
+			 enable_gpio);
+
+		if (omap_request_gpio(enable_gpio) < 0) {
+			printk(KERN_ERR "Can't request GPIO %d\n",
+			       enable_gpio);
+			return -ENODEV;
+		}
+
+		omap_set_gpio_direction(enable_gpio, 0);
+		udelay(50);
+		omap_set_gpio_dataout(enable_gpio, 1);
+	}
+
+	return 0;
+}
+
 static struct omap2_mcspi_device_config tsc2301_mcspi_config = {
 	.turbo_mode	= 0,
 	.single_channel = 1,
@@ -470,6 +497,11 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
 		.platform_data = &n800_tcm825x_platform_data,
 	},
 #endif
+#if defined(CONFIG_RADIO_TEA5761) || defined(CONFIG_RADIO_TEA5761_MODULE)
+	{
+		I2C_BOARD_INFO("tea5761", 0x10),
+	},
+#endif
 };
 
 void __init nokia_n800_common_init(void)
@@ -500,6 +532,7 @@ static void __init nokia_n800_init(void)
 	n800_audio_init(&tsc2301_config);
 	n800_ts_set_config();
 	tsc2301_dev_init();
+	tea5761_dev_init();
 	omap_register_gpio_switches(n800_gpio_switches,
 				    ARRAY_SIZE(n800_gpio_switches));
 }
diff --git a/drivers/media/radio/radio-tea5761.c b/drivers/media/radio/radio-tea5761.c
index ac0f621..0fb0cdc 100644
--- a/drivers/media/radio/radio-tea5761.c
+++ b/drivers/media/radio/radio-tea5761.c
@@ -23,8 +23,6 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <media/v4l2-common.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
 
 #define DRIVER_NAME "tea5761"
 
@@ -74,14 +72,6 @@
 #define TEA5761_FREQ_LOW	87500
 #define TEA5761_FREQ_HIGH	108000
 
-/* Probe for TEA5761 twice since the version N4B seems to be
- * broken and needs two probes to be found */
-static unsigned short normal_i2c[] = {
-	TEA5761_I2C_ADDR, TEA5761_I2C_ADDR, I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;
-
 struct tea5761_regs {
 	u16 intreg;
 	u16 frqset;
@@ -423,67 +413,22 @@ static struct video_device tea5761_video_device = {
 	.release       = video_device_release
 };
 
-static int tea5761_probe(struct i2c_adapter *adapter, int address,
-			  int kind)
+static int tea5761_i2c_driver_probe(struct i2c_client *client)
 {
-	struct i2c_client *client;
 	struct video_device *video_dev;
 	int err = 0;
-	static const char *client_name = "TEA5761 FM-Radio";
 	struct tea5761_device *tea = &tea5761;
-	struct tea5761_regs   *r = &tea->regs;
 
 	mutex_init(&tea->mutex);
-        /* I2C detection and initialization */
-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-	if (client == NULL) {
-		dev_err(&adapter->dev, DRIVER_NAME
-			": couldn't allocate memory\n");
-		return -ENOMEM;
-	}
-	tea->i2c_dev = client;
 
-	client->addr = address;
-	client->adapter = adapter;
-	client->driver = &tea5761_driver;
-	client->dev.driver = &tea5761_driver.driver;
-	client->flags = 0;
-	strlcpy(client->name, client_name, I2C_NAME_SIZE);
-
-	if (kind < 0) {
-		if (tea5761_read_regs(tea) < 0) {
-			dev_info(&client->dev,
-				 "chip read failed for %d-%04x\n",
-				 adapter->nr, address);
-			goto err_tea_dev;
-		}
-		if (r->chipid != TEA5761_CHIPID) {
-			dev_info(&client->dev,
-				 "bad chipid (0x%04x) at %d-%04x\n",
-				 r->chipid, adapter->nr, address);
-			goto err_tea_dev;
-		}
-		if ((r->manid & 0x0fff) != TEA5761_MANID) {
-			dev_info(&client->dev,
-				 "bad manid (0x%04x) at %d-%04x\n",
-				 r->manid, adapter->nr, address);
-			goto err_tea_dev;
-		}
-	}
-
-	err = i2c_attach_client(client);
-	if (err) {
-		dev_err(&client->dev, "couldn't attach to address %d-%04x\n",
-		        adapter->nr, address);
-		goto err_tea_dev;
-	}
+	tea->i2c_dev = client;
 
 	/* V4L initialization */
 	video_dev = video_device_alloc();
 	if (video_dev == NULL) {
 		dev_err(&client->dev, "couldn't allocate memory\n");
 		err = -ENOMEM;
-		goto err_i2c_attach;
+		goto exit;
 	}
 	tea->video_dev = video_dev;
 
@@ -506,105 +451,39 @@ static int tea5761_probe(struct i2c_adapter *adapter, int address,
 		goto err_video_alloc;
 	}
 
-	dev_info(&client->dev, "tea5761 (version %d) detected at %d-%04x\n",
-		(tea->regs.manid >> 12) & 0xf, adapter->nr, address);
+	dev_info(&client->dev, "tea5761 (version %d) detected\n",
+		(tea->regs.manid >> 12) & 0xf);
 
 	return 0;
 
 err_video_alloc:
 	video_device_release(video_dev);
-err_i2c_attach:
-	i2c_detach_client(client);
-err_tea_dev:
+exit:
 	kfree(client);
 	return err;
 }
 
-static int tea5761_attach_adapter(struct i2c_adapter *adapter)
-{
-	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
-		return -EINVAL;
-
-	return i2c_probe(adapter, &addr_data, tea5761_probe);
-}
-
-static int tea5761_detach_client(struct i2c_client *client)
+static int tea5761_i2c_driver_remove(struct i2c_client *client)
 {
 	struct video_device *vd = i2c_get_clientdata(client);
 
-	i2c_detach_client(client);
 	video_unregister_device(vd);
-	kfree(client);
 
 	return 0;
 }
 
 static struct i2c_driver tea5761_driver = {
-	.id		= I2C_DRIVERID_TUNER,
 	.driver = {
 		.name	= DRIVER_NAME,
 	},
-	.attach_adapter	= tea5761_attach_adapter,
-	.detach_client	= tea5761_detach_client,
+	.probe	= tea5761_i2c_driver_probe,
+	.remove = tea5761_i2c_driver_remove,
 };
 
-#if CONFIG_ARCH_OMAP
-/* No way to pass platform device data. Enable here all the TEA5761
- * devices, since I2C address scanning will need them to respond.
- */
-static int enable_gpio;
-
-static int __init tea5761_dev_init(void)
-{
-	const struct omap_tea5761_config *info;
-
-	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
-	if (info) {
-		enable_gpio = info->enable_gpio;
-	}
-
-	if (enable_gpio) {
-		pr_debug(DRIVER_NAME ": enabling tea5761 at GPIO %d\n",
-			 enable_gpio);
-
-		if (omap_request_gpio(enable_gpio) < 0) {
-			printk(KERN_ERR DRIVER_NAME ": can't request GPIO %d\n",
-			       enable_gpio);
-			return -ENODEV;
-		}
-
-		omap_set_gpio_direction(enable_gpio, 0);
-		udelay(50);
-		omap_set_gpio_dataout(enable_gpio, 1);
-	}
-
-	return 0;
-}
-
-static void __exit tea5761_dev_exit(void)
-{
-	if (enable_gpio) {
-		omap_set_gpio_dataout(enable_gpio, 0);
-		omap_free_gpio(enable_gpio);
-	}
-}
-#else
-static int __init tea5761_dev_init(void)
-{
-}
-
-static void __exit tea5761_dev_exit(void)
-{
-}
-#endif
-
 static int __init tea5761_init(void)
 {
 	int res;
 
-	if ((res = tea5761_dev_init()) < 0)
-		return res;
-
 	if ((res = i2c_add_driver(&tea5761_driver))) {
 		printk(KERN_ERR DRIVER_NAME ": driver registration failed\n");
 		return res;
@@ -616,7 +495,6 @@ static int __init tea5761_init(void)
 static void __exit tea5761_exit(void)
 {
 	i2c_del_driver(&tea5761_driver);
-	tea5761_dev_exit();
 }
 
 MODULE_AUTHOR("Timo Teräs");
-- 
1.5.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] i2c: tea5761: New-style i2c driver

[Tony Lindgren]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 8836 bytes --]

* Eduardo Valentin <edubezval@gmail.com> [080328 14:05]:
> From: Eduardo Valentin <eduardo.valentin@indt.org.br>
> 
> This patch updates the fm radio driver for tea5761 chip.
> It also moves board dependent code to its correct board
> file place.

Pushed.

Tony


> Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
> ---
>  arch/arm/mach-omap2/board-n800.c    |   33 ++++++++
>  drivers/media/radio/radio-tea5761.c |  140 ++--------------------------------
>  2 files changed, 42 insertions(+), 131 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
> index 34f1c37..758e2c1 100644
> --- a/arch/arm/mach-omap2/board-n800.c
> +++ b/arch/arm/mach-omap2/board-n800.c
> @@ -258,6 +258,33 @@ static void tsc2301_dev_init(void)
>  	}
>  }
>  
> +static int __init tea5761_dev_init(void)
> +{
> +	const struct omap_tea5761_config *info;
> +	int enable_gpio = 0;
> +
> +	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
> +	if (info)
> +		enable_gpio = info->enable_gpio;
> +
> +	if (enable_gpio) {
> +		pr_debug("Enabling tea5761 at GPIO %d\n",
> +			 enable_gpio);
> +
> +		if (omap_request_gpio(enable_gpio) < 0) {
> +			printk(KERN_ERR "Can't request GPIO %d\n",
> +			       enable_gpio);
> +			return -ENODEV;
> +		}
> +
> +		omap_set_gpio_direction(enable_gpio, 0);
> +		udelay(50);
> +		omap_set_gpio_dataout(enable_gpio, 1);
> +	}
> +
> +	return 0;
> +}
> +
>  static struct omap2_mcspi_device_config tsc2301_mcspi_config = {
>  	.turbo_mode	= 0,
>  	.single_channel = 1,
> @@ -470,6 +497,11 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
>  		.platform_data = &n800_tcm825x_platform_data,
>  	},
>  #endif
> +#if defined(CONFIG_RADIO_TEA5761) || defined(CONFIG_RADIO_TEA5761_MODULE)
> +	{
> +		I2C_BOARD_INFO("tea5761", 0x10),
> +	},
> +#endif
>  };
>  
>  void __init nokia_n800_common_init(void)
> @@ -500,6 +532,7 @@ static void __init nokia_n800_init(void)
>  	n800_audio_init(&tsc2301_config);
>  	n800_ts_set_config();
>  	tsc2301_dev_init();
> +	tea5761_dev_init();
>  	omap_register_gpio_switches(n800_gpio_switches,
>  				    ARRAY_SIZE(n800_gpio_switches));
>  }
> diff --git a/drivers/media/radio/radio-tea5761.c b/drivers/media/radio/radio-tea5761.c
> index ac0f621..0fb0cdc 100644
> --- a/drivers/media/radio/radio-tea5761.c
> +++ b/drivers/media/radio/radio-tea5761.c
> @@ -23,8 +23,6 @@
>  #include <linux/i2c.h>
>  #include <linux/delay.h>
>  #include <media/v4l2-common.h>
> -#include <asm/arch/gpio.h>
> -#include <asm/arch/board.h>
>  
>  #define DRIVER_NAME "tea5761"
>  
> @@ -74,14 +72,6 @@
>  #define TEA5761_FREQ_LOW	87500
>  #define TEA5761_FREQ_HIGH	108000
>  
> -/* Probe for TEA5761 twice since the version N4B seems to be
> - * broken and needs two probes to be found */
> -static unsigned short normal_i2c[] = {
> -	TEA5761_I2C_ADDR, TEA5761_I2C_ADDR, I2C_CLIENT_END
> -};
> -
> -I2C_CLIENT_INSMOD;
> -
>  struct tea5761_regs {
>  	u16 intreg;
>  	u16 frqset;
> @@ -423,67 +413,22 @@ static struct video_device tea5761_video_device = {
>  	.release       = video_device_release
>  };
>  
> -static int tea5761_probe(struct i2c_adapter *adapter, int address,
> -			  int kind)
> +static int tea5761_i2c_driver_probe(struct i2c_client *client)
>  {
> -	struct i2c_client *client;
>  	struct video_device *video_dev;
>  	int err = 0;
> -	static const char *client_name = "TEA5761 FM-Radio";
>  	struct tea5761_device *tea = &tea5761;
> -	struct tea5761_regs   *r = &tea->regs;
>  
>  	mutex_init(&tea->mutex);
> -        /* I2C detection and initialization */
> -	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
> -	if (client == NULL) {
> -		dev_err(&adapter->dev, DRIVER_NAME
> -			": couldn't allocate memory\n");
> -		return -ENOMEM;
> -	}
> -	tea->i2c_dev = client;
>  
> -	client->addr = address;
> -	client->adapter = adapter;
> -	client->driver = &tea5761_driver;
> -	client->dev.driver = &tea5761_driver.driver;
> -	client->flags = 0;
> -	strlcpy(client->name, client_name, I2C_NAME_SIZE);
> -
> -	if (kind < 0) {
> -		if (tea5761_read_regs(tea) < 0) {
> -			dev_info(&client->dev,
> -				 "chip read failed for %d-%04x\n",
> -				 adapter->nr, address);
> -			goto err_tea_dev;
> -		}
> -		if (r->chipid != TEA5761_CHIPID) {
> -			dev_info(&client->dev,
> -				 "bad chipid (0x%04x) at %d-%04x\n",
> -				 r->chipid, adapter->nr, address);
> -			goto err_tea_dev;
> -		}
> -		if ((r->manid & 0x0fff) != TEA5761_MANID) {
> -			dev_info(&client->dev,
> -				 "bad manid (0x%04x) at %d-%04x\n",
> -				 r->manid, adapter->nr, address);
> -			goto err_tea_dev;
> -		}
> -	}
> -
> -	err = i2c_attach_client(client);
> -	if (err) {
> -		dev_err(&client->dev, "couldn't attach to address %d-%04x\n",
> -		        adapter->nr, address);
> -		goto err_tea_dev;
> -	}
> +	tea->i2c_dev = client;
>  
>  	/* V4L initialization */
>  	video_dev = video_device_alloc();
>  	if (video_dev == NULL) {
>  		dev_err(&client->dev, "couldn't allocate memory\n");
>  		err = -ENOMEM;
> -		goto err_i2c_attach;
> +		goto exit;
>  	}
>  	tea->video_dev = video_dev;
>  
> @@ -506,105 +451,39 @@ static int tea5761_probe(struct i2c_adapter *adapter, int address,
>  		goto err_video_alloc;
>  	}
>  
> -	dev_info(&client->dev, "tea5761 (version %d) detected at %d-%04x\n",
> -		(tea->regs.manid >> 12) & 0xf, adapter->nr, address);
> +	dev_info(&client->dev, "tea5761 (version %d) detected\n",
> +		(tea->regs.manid >> 12) & 0xf);
>  
>  	return 0;
>  
>  err_video_alloc:
>  	video_device_release(video_dev);
> -err_i2c_attach:
> -	i2c_detach_client(client);
> -err_tea_dev:
> +exit:
>  	kfree(client);
>  	return err;
>  }
>  
> -static int tea5761_attach_adapter(struct i2c_adapter *adapter)
> -{
> -	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
> -		return -EINVAL;
> -
> -	return i2c_probe(adapter, &addr_data, tea5761_probe);
> -}
> -
> -static int tea5761_detach_client(struct i2c_client *client)
> +static int tea5761_i2c_driver_remove(struct i2c_client *client)
>  {
>  	struct video_device *vd = i2c_get_clientdata(client);
>  
> -	i2c_detach_client(client);
>  	video_unregister_device(vd);
> -	kfree(client);
>  
>  	return 0;
>  }
>  
>  static struct i2c_driver tea5761_driver = {
> -	.id		= I2C_DRIVERID_TUNER,
>  	.driver = {
>  		.name	= DRIVER_NAME,
>  	},
> -	.attach_adapter	= tea5761_attach_adapter,
> -	.detach_client	= tea5761_detach_client,
> +	.probe	= tea5761_i2c_driver_probe,
> +	.remove = tea5761_i2c_driver_remove,
>  };
>  
> -#if CONFIG_ARCH_OMAP
> -/* No way to pass platform device data. Enable here all the TEA5761
> - * devices, since I2C address scanning will need them to respond.
> - */
> -static int enable_gpio;
> -
> -static int __init tea5761_dev_init(void)
> -{
> -	const struct omap_tea5761_config *info;
> -
> -	info = omap_get_config(OMAP_TAG_TEA5761, struct omap_tea5761_config);
> -	if (info) {
> -		enable_gpio = info->enable_gpio;
> -	}
> -
> -	if (enable_gpio) {
> -		pr_debug(DRIVER_NAME ": enabling tea5761 at GPIO %d\n",
> -			 enable_gpio);
> -
> -		if (omap_request_gpio(enable_gpio) < 0) {
> -			printk(KERN_ERR DRIVER_NAME ": can't request GPIO %d\n",
> -			       enable_gpio);
> -			return -ENODEV;
> -		}
> -
> -		omap_set_gpio_direction(enable_gpio, 0);
> -		udelay(50);
> -		omap_set_gpio_dataout(enable_gpio, 1);
> -	}
> -
> -	return 0;
> -}
> -
> -static void __exit tea5761_dev_exit(void)
> -{
> -	if (enable_gpio) {
> -		omap_set_gpio_dataout(enable_gpio, 0);
> -		omap_free_gpio(enable_gpio);
> -	}
> -}
> -#else
> -static int __init tea5761_dev_init(void)
> -{
> -}
> -
> -static void __exit tea5761_dev_exit(void)
> -{
> -}
> -#endif
> -
>  static int __init tea5761_init(void)
>  {
>  	int res;
>  
> -	if ((res = tea5761_dev_init()) < 0)
> -		return res;
> -
>  	if ((res = i2c_add_driver(&tea5761_driver))) {
>  		printk(KERN_ERR DRIVER_NAME ": driver registration failed\n");
>  		return res;
> @@ -616,7 +495,6 @@ static int __init tea5761_init(void)
>  static void __exit tea5761_exit(void)
>  {
>  	i2c_del_driver(&tea5761_driver);
> -	tea5761_dev_exit();
>  }
>  
>  MODULE_AUTHOR("Timo Teräs");
> -- 
> 1.5.4.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html