Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1345220 > unrolled thread

Improve Terratec Grabby (hw rev 2) support

Back to article view | Back to linux.kernel

Contents

  Improve Terratec Grabby (hw rev 2) support Matthieu Rogez <matthieu.rogez@gmail.com> - 2016-02-28 12:30 +0100
    [PATCH 1/3] [media] em28xx: add support for Terratec Grabby REC button Matthieu Rogez <matthieu.rogez@gmail.com> - 2016-02-28 12:30 +0100
    [PATCH 2/3] [media] em28xx: add support for Terratec Grabby Record led Matthieu Rogez <matthieu.rogez@gmail.com> - 2016-02-28 12:30 +0100
    [PATCH 3/3] [media] em28xx: fix Terratec Grabby AC97 codec detection Matthieu Rogez <matthieu.rogez@gmail.com> - 2016-02-28 12:30 +0100
      Re: [PATCH 3/3] [media] em28xx: fix Terratec Grabby AC97 codec  detection Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-03-03 18:30 +0100

#1345220 — Improve Terratec Grabby (hw rev 2) support

These patches improve support for the Terratec Grabby A/V capture device.
The first two patches add support for the REC button and led.
The third patch fixes AC97 codec detection by delaying card setup until
i2c communication to EMP202 device is reliable.

To test this:
* modprobe em28xx-alsa
* connect Grabby
* mplayer tv:// -tv driver=v4l2:width=720:height=576:device=/dev/video1:input=0:fps=25:norm=SECAM-L:alsa:adevice=plughw.2:audiorate=48000:forceaudio:amode=1:immediatemode=0 -nocache -fps 60

NOTE: for some unknown reason, if em28xx-alsa is not loaded when Grabby is
connected, there will be no sound.
NOTE2: if Grabby is connected without loading em28xx-alsa first, just deconnect
the Grabby and reconnect it.

[toc] | [next] | [standalone]

#1345221 — [PATCH 1/3] [media] em28xx: add support for Terratec Grabby REC button

Terratec Grabby (hw rev 2) REC button uses the standard snapshot button
configuration.

Signed-off-by: Matthieu Rogez <matthieu.rogez@gmail.com>
---
 drivers/media/usb/em28xx/em28xx-cards.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 1f4047b..4051146 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2015,6 +2015,7 @@ struct em28xx_board em28xx_boards[] = {
 			.vmux     = SAA7115_SVIDEO3,
 			.amux     = EM28XX_AMUX_LINE_IN,
 		} },
+		.buttons         = std_snapshot_button,
 	},
 	[EM2860_BOARD_TERRATEC_AV350] = {
 		.name            = "Terratec AV350",
-- 
2.7.1

[toc] | [prev] | [next] | [standalone]

#1345222 — [PATCH 2/3] [media] em28xx: add support for Terratec Grabby Record led

Terratec Grabby (hw rev 2) Record led is connected to GPIO 3
and its logic is inverted: (PIO3 = 0: on, PIO3 = 1: off).

Signed-off-by: Matthieu Rogez <matthieu.rogez@gmail.com>
---
 drivers/media/usb/em28xx/em28xx-cards.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 4051146..5e127e4 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -560,6 +560,16 @@ static struct em28xx_led pctv_80e_leds[] = {
 	{-1, 0, 0, 0},
 };
 
+static struct em28xx_led terratec_grabby_leds[] = {
+	{
+		.role      = EM28XX_LED_ANALOG_CAPTURING,
+		.gpio_reg  = EM2820_R08_GPIO_CTRL,
+		.gpio_mask = EM_GPIO_3,
+		.inverted  = 1,
+	},
+	{-1, 0, 0, 0},
+};
+
 /*
  *  Board definitions
  */
@@ -2016,6 +2026,7 @@ struct em28xx_board em28xx_boards[] = {
 			.amux     = EM28XX_AMUX_LINE_IN,
 		} },
 		.buttons         = std_snapshot_button,
+		.leds            = terratec_grabby_leds,
 	},
 	[EM2860_BOARD_TERRATEC_AV350] = {
 		.name            = "Terratec AV350",
-- 
2.7.1

[toc] | [prev] | [next] | [standalone]

#1345223 — [PATCH 3/3] [media] em28xx: fix Terratec Grabby AC97 codec detection

EMP202 chip inside Terratec Grabby (hw rev 2) seems to require some time before
accessing reliably its registers. Otherwise it returns some values previously
put on the I2C bus.

To account for that period, we delay card setup until we have a proof that
accessing AC97 registers is reliable. We get this proof by polling AC97_RESET
until the expected value is read.

Signed-off-by: Matthieu Rogez <matthieu.rogez@gmail.com>
---
 drivers/media/usb/em28xx/em28xx-cards.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 5e127e4..2e04902 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -37,6 +37,7 @@
 #include <media/i2c-addr.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
+#include <sound/ac97_codec.h>
 
 #include "em28xx.h"
 
@@ -2563,6 +2564,24 @@ static inline void em28xx_set_model(struct em28xx *dev)
 	dev->def_i2c_bus = dev->board.def_i2c_bus;
 }
 
+/* Wait until AC97_RESET reports the expected value (or reading error)
+ * before proceeding.
+ * This can help ensuring AC97 register accesses are reliable.
+ */
+static int em28xx_wait_until_ac97_features_equals(struct em28xx *dev,
+						  int expected_feat)
+{
+	int feat;
+
+	do {
+		feat = em28xx_read_ac97(dev, AC97_RESET);
+		if (feat < 0)
+			return feat;
+	} while (feat != expected_feat);
+
+	return 0;
+}
+
 /* Since em28xx_pre_card_setup() requires a proper dev->model,
  * this won't work for boards with generic PCI IDs
  */
@@ -2668,6 +2687,13 @@ static void em28xx_pre_card_setup(struct em28xx *dev)
 		em28xx_write_reg(dev, EM2820_R08_GPIO_CTRL, 0xfd);
 		msleep(70);
 		break;
+
+	case EM2860_BOARD_TERRATEC_GRABBY:
+		/* HACK?: Ensure AC97 register reading is reliable before
+		 * proceeding. In practice, this will wait about 1.6 seconds.
+		 */
+		em28xx_wait_until_ac97_features_equals(dev, 0x6a90);
+		break;
 	}
 
 	em28xx_gpio_set(dev, dev->board.tuner_gpio);
-- 
2.7.1

[toc] | [prev] | [next] | [standalone]

#1349425 — Re: [PATCH 3/3] [media] em28xx: fix Terratec Grabby AC97 codec detection

Em Sun, 28 Feb 2016 12:26:23 +0100
Matthieu Rogez <matthieu.rogez@gmail.com> escreveu:

> EMP202 chip inside Terratec Grabby (hw rev 2) seems to require some time before
> accessing reliably its registers. Otherwise it returns some values previously
> put on the I2C bus.
> 
> To account for that period, we delay card setup until we have a proof that
> accessing AC97 registers is reliable. We get this proof by polling AC97_RESET
> until the expected value is read.
> 
> Signed-off-by: Matthieu Rogez <matthieu.rogez@gmail.com>
> ---
>  drivers/media/usb/em28xx/em28xx-cards.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index 5e127e4..2e04902 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -37,6 +37,7 @@
>  #include <media/i2c-addr.h>
>  #include <media/tveeprom.h>
>  #include <media/v4l2-common.h>
> +#include <sound/ac97_codec.h>
>  
>  #include "em28xx.h"
>  
> @@ -2563,6 +2564,24 @@ static inline void em28xx_set_model(struct em28xx *dev)
>  	dev->def_i2c_bus = dev->board.def_i2c_bus;
>  }
>  
> +/* Wait until AC97_RESET reports the expected value (or reading error)
> + * before proceeding.
> + * This can help ensuring AC97 register accesses are reliable.
> + */
> +static int em28xx_wait_until_ac97_features_equals(struct em28xx *dev,
> +						  int expected_feat)
> +{
> +	int feat;
> +
> +	do {
> +		feat = em28xx_read_ac97(dev, AC97_RESET);
> +		if (feat < 0)
> +			return feat;
> +	} while (feat != expected_feat);

Please add some sort of timeout here... We don't want the Kernel to
be in a dead lock here...

> +
> +	return 0;
> +}
> +
>  /* Since em28xx_pre_card_setup() requires a proper dev->model,
>   * this won't work for boards with generic PCI IDs
>   */
> @@ -2668,6 +2687,13 @@ static void em28xx_pre_card_setup(struct em28xx *dev)
>  		em28xx_write_reg(dev, EM2820_R08_GPIO_CTRL, 0xfd);
>  		msleep(70);
>  		break;
> +
> +	case EM2860_BOARD_TERRATEC_GRABBY:
> +		/* HACK?: Ensure AC97 register reading is reliable before
> +		 * proceeding. In practice, this will wait about 1.6 seconds.
> +		 */
> +		em28xx_wait_until_ac97_features_equals(dev, 0x6a90);
> +		break;
>  	}
>  
>  	em28xx_gpio_set(dev, dev->board.tuner_gpio);


-- 
Thanks,
Mauro

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web