[PATCH] radio-bcm2048: Fix region selection

[PATCH] radio-bcm2048: Fix region selection

[Pali Rohár]

From: maxx <maxx@spaceboyz.net>

This actually fixes region selection for BCM2048 FM receiver. To select
the japanese FM-band an additional bit in FM_CTRL register needs to be
set. This might not sound so important but it enables at least me to
listen to some 'very interesting' radio transmission below normal
FM-band.

Patch writen by maxx@spaceboyz.net

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Cc: maxx@spaceboyz.net
---
 drivers/staging/media/bcm2048/radio-bcm2048.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index aeb6c3c..1482d4b 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -739,7 +739,20 @@ static int bcm2048_set_region(struct bcm2048_device *bdev, u8 region)
 		return -EINVAL;
 
 	mutex_lock(&bdev->mutex);
+
 	bdev->region_info = region_configs[region];
+
+	bdev->cache_fm_ctrl &= ~BCM2048_BAND_SELECT;
+	if (region > 2) {
+		bdev->cache_fm_ctrl |= BCM2048_BAND_SELECT;
+		err = bcm2048_send_command(bdev, BCM2048_I2C_FM_CTRL,
+					bdev->cache_fm_ctrl);
+		if (err) {
+			mutex_unlock(&bdev->mutex);
+			goto done;
+		}
+	}
+
 	mutex_unlock(&bdev->mutex);
 
 	if (bdev->frequency < region_configs[region].bottom_frequency ||
-- 
1.7.9.5

Re: [PATCH] radio-bcm2048: Fix region selection

[Greg Kroah-Hartman]

On Fri, May 15, 2015 at 11:32:51PM +0200, Pali Rohár wrote:
> From: maxx <maxx@spaceboyz.net>

I need a real name here, sorry.

greg k-h

Re: [PATCH] radio-bcm2048: Fix region selection

[Hans Verkuil]

On 05/15/2015 11:32 PM, Pali Rohár wrote:
> From: maxx <maxx@spaceboyz.net>
> 
> This actually fixes region selection for BCM2048 FM receiver. To select
> the japanese FM-band an additional bit in FM_CTRL register needs to be
> set. This might not sound so important but it enables at least me to
> listen to some 'very interesting' radio transmission below normal
> FM-band.
> 
> Patch writen by maxx@spaceboyz.net
> 
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> Cc: maxx@spaceboyz.net

Looks good to me. If someone can repost with correct names and SoBs, then I'll
apply.

Regards,

	Hans

> ---
>  drivers/staging/media/bcm2048/radio-bcm2048.c |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
> index aeb6c3c..1482d4b 100644
> --- a/drivers/staging/media/bcm2048/radio-bcm2048.c
> +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
> @@ -739,7 +739,20 @@ static int bcm2048_set_region(struct bcm2048_device *bdev, u8 region)
>  		return -EINVAL;
>  
>  	mutex_lock(&bdev->mutex);
> +
>  	bdev->region_info = region_configs[region];
> +
> +	bdev->cache_fm_ctrl &= ~BCM2048_BAND_SELECT;
> +	if (region > 2) {
> +		bdev->cache_fm_ctrl |= BCM2048_BAND_SELECT;
> +		err = bcm2048_send_command(bdev, BCM2048_I2C_FM_CTRL,
> +					bdev->cache_fm_ctrl);
> +		if (err) {
> +			mutex_unlock(&bdev->mutex);
> +			goto done;
> +		}
> +	}
> +
>  	mutex_unlock(&bdev->mutex);
>  
>  	if (bdev->frequency < region_configs[region].bottom_frequency ||
> 

Re: [PATCH] radio-bcm2048: Fix region selection

[Pali Rohár]

On Friday 05 June 2015 13:36:40 Hans Verkuil wrote:
> On 05/15/2015 11:32 PM, Pali Rohár wrote:
> > From: maxx <maxx@spaceboyz.net>
> > 
> > This actually fixes region selection for BCM2048 FM receiver. To select
> > the japanese FM-band an additional bit in FM_CTRL register needs to be
> > set. This might not sound so important but it enables at least me to
> > listen to some 'very interesting' radio transmission below normal
> > FM-band.
> > 
> > Patch writen by maxx@spaceboyz.net
> > 
> > Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> > Cc: maxx@spaceboyz.net
> 
> Looks good to me. If someone can repost with correct names and SoBs, then I'll
> apply.
> 

Jan, will you resend patch in correct format with correct names?

-- 
Pali Rohár
pali.rohar@gmail.com

[PATCH v2] radio-bcm2048: Fix region selection

[Pali Rohár]

From: Jan Roemisch <maxx@spaceboyz.net>

This patch fixes region selection for lower bottom_frequency in BCM2048 FM
receiver. It also removes "Japan wide band" region since this is impossible
to do just like that.

Signed-off-by: Jan Roemisch <maxx@spaceboyz.net>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
---
 drivers/staging/media/bcm2048/radio-bcm2048.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index e9d0691..134e2af 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -342,14 +342,6 @@ static struct region_info region_configs[] = {
 		.deemphasis		= 50,
 		.region			= 3,
 	},
-	/* Japan wide band */
-	{
-		.channel_spacing	= 10,
-		.bottom_frequency	= 76000,
-		.top_frequency		= 108000,
-		.deemphasis		= 50,
-		.region			= 4,
-	},
 };
 
 /*
@@ -741,6 +733,18 @@ static int bcm2048_set_region(struct bcm2048_device *bdev, u8 region)
 
 	mutex_lock(&bdev->mutex);
 	bdev->region_info = region_configs[region];
+
+	if (region_configs[region].bottom_frequency < 87500)
+		bdev->cache_fm_ctrl |= BCM2048_BAND_SELECT;
+	else
+		bdev->cache_fm_ctrl &= ~BCM2048_BAND_SELECT;
+
+	err = bcm2048_send_command(bdev, BCM2048_I2C_FM_CTRL,
+					bdev->cache_fm_ctrl);
+	if (err) {
+		mutex_unlock(&bdev->mutex);
+		goto done;
+	}
 	mutex_unlock(&bdev->mutex);
 
 	if (bdev->frequency < region_configs[region].bottom_frequency ||
-- 
1.7.10.4

Re: [PATCH] radio-bcm2048: Fix region selection

[Pavel Machek]

On Sat 2015-05-16 17:20:50, Jan Roemisch wrote:
> Removed "Japan wide band" region since this is impossible to do just
> like that. Additionally it's now possible to go back to non-Japanese regions
> without having to reload the module.

Acked-by: Pavel Machek <pavel@ucw.cz>

But note that you'll probably need to do one more resend, with

Signed-off-by:

line.

Thanks and best regards,
									Pavel

> Greetings
> Jan Roemisch
> 
> On Sat, May 16, 2015 at 07:06:17AM -0700, Greg KH wrote:
> > On Sat, May 16, 2015 at 01:22:27PM +0200, Jan Roemisch wrote:
> > > Oh sorry, the real name is Jan Roemisch.
> > 
> > Ok, thanks, can someone please fix up the patches and resend them?
> > 
> > greg k-h
> > 

> diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
> index 5382506..d2e7f1e 100644
> --- a/drivers/staging/media/bcm2048/radio-bcm2048.c
> +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
> @@ -342,14 +342,6 @@ static struct region_info region_configs[] = {
>  		.deemphasis		= 50,
>  		.region			= 3,
>  	},
> -	/* Japan wide band */
> -	{
> -		.channel_spacing	= 10,
> -		.bottom_frequency	= 76000,
> -		.top_frequency		= 108000,
> -		.deemphasis		= 50,
> -		.region			= 4,
> -	},
>  };
>  
>  /*
> @@ -741,6 +733,18 @@ static int bcm2048_set_region(struct bcm2048_device *bdev, u8 region)
>  
>  	mutex_lock(&bdev->mutex);
>  	bdev->region_info = region_configs[region];
> +
> +	if (region_configs[region].bottom_frequency < 87500)
> +		bdev->cache_fm_ctrl |= BCM2048_BAND_SELECT;
> +	else
> +		bdev->cache_fm_ctrl &= ~BCM2048_BAND_SELECT;
> +
> +	err = bcm2048_send_command(bdev, BCM2048_I2C_FM_CTRL,
> +					bdev->cache_fm_ctrl);
> +	if (err) {
> +		mutex_unlock(&bdev->mutex);
> +		goto done;
> +	}
>  	mutex_unlock(&bdev->mutex);
>  
>  	if (bdev->frequency < region_configs[region].bottom_frequency ||


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH] radio-bcm2048: Fix region selection

[Jan Roemisch]

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

Removed "Japan wide band" region since this is impossible to do just
like that. Additionally it's now possible to go back to non-Japanese regions
without having to reload the module.

Greetings
Jan Roemisch

On Sat, May 16, 2015 at 07:06:17AM -0700, Greg KH wrote:
> On Sat, May 16, 2015 at 01:22:27PM +0200, Jan Roemisch wrote:
> > Oh sorry, the real name is Jan Roemisch.
> 
> Ok, thanks, can someone please fix up the patches and resend them?
> 
> greg k-h
> 

[-- Attachment #2: radio-bcm2048-region-fix.diff --]
[-- Type: text/plain, Size: 1095 bytes --]

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 5382506..d2e7f1e 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -342,14 +342,6 @@ static struct region_info region_configs[] = {
 		.deemphasis		= 50,
 		.region			= 3,
 	},
-	/* Japan wide band */
-	{
-		.channel_spacing	= 10,
-		.bottom_frequency	= 76000,
-		.top_frequency		= 108000,
-		.deemphasis		= 50,
-		.region			= 4,
-	},
 };
 
 /*
@@ -741,6 +733,18 @@ static int bcm2048_set_region(struct bcm2048_device *bdev, u8 region)
 
 	mutex_lock(&bdev->mutex);
 	bdev->region_info = region_configs[region];
+
+	if (region_configs[region].bottom_frequency < 87500)
+		bdev->cache_fm_ctrl |= BCM2048_BAND_SELECT;
+	else
+		bdev->cache_fm_ctrl &= ~BCM2048_BAND_SELECT;
+
+	err = bcm2048_send_command(bdev, BCM2048_I2C_FM_CTRL,
+					bdev->cache_fm_ctrl);
+	if (err) {
+		mutex_unlock(&bdev->mutex);
+		goto done;
+	}
 	mutex_unlock(&bdev->mutex);
 
 	if (bdev->frequency < region_configs[region].bottom_frequency ||

Re: [PATCH] radio-bcm2048: Fix region selection

[Greg KH]

On Sat, May 16, 2015 at 01:22:27PM +0200, Jan Roemisch wrote:
> Oh sorry, the real name is Jan Roemisch.

Ok, thanks, can someone please fix up the patches and resend them?

greg k-h

Re: [PATCH] radio-bcm2048: Fix region selection

[Jan Roemisch]

Oh sorry, the real name is Jan Roemisch.

Greetings
Jan