The patch number 14366 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Andy Walls <[email protected]>
ivtv: Tweak Sony GigaPocket Kikyou card entry based on experiments
Based on experiments by Eric Wescott, edit the Sony GigaPocket (Kikyou)
card entry video and audio mux settings.
Priority: normal
Signed-off-by: Andy Walls <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/ivtv/ivtv-cards.c | 21 ++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff -r e5be44255488 -r cb0b02f2241a linux/drivers/media/video/ivtv/ivtv-cards.c
--- a/linux/drivers/media/video/ivtv/ivtv-cards.c Wed Mar 03 19:47:22
2010 -0300
+++ b/linux/drivers/media/video/ivtv/ivtv-cards.c Wed Mar 03 19:50:36
2010 -0300
@@ -1227,27 +1227,20 @@
.hw_audio_ctrl = IVTV_HW_GPIO,
.hw_all = IVTV_HW_GPIO | IVTV_HW_SAA7115 | IVTV_HW_TUNER,
.video_inputs = {
- { IVTV_CARD_INPUT_VID_TUNER, 0, IVTV_SAA71XX_COMPOSITE5 },
- { IVTV_CARD_INPUT_COMPOSITE1, 1, IVTV_SAA71XX_COMPOSITE4 }, /* rear */
- { IVTV_CARD_INPUT_COMPOSITE2, 2, IVTV_SAA71XX_COMPOSITE1 }, /* front */
+ { IVTV_CARD_INPUT_VID_TUNER, 0, IVTV_SAA71XX_COMPOSITE1 },
+ { IVTV_CARD_INPUT_COMPOSITE1, 1, IVTV_SAA71XX_COMPOSITE1 },
{ IVTV_CARD_INPUT_SVIDEO1, 1, IVTV_SAA71XX_SVIDEO1 },
- { IVTV_CARD_INPUT_SVIDEO2, 2, IVTV_SAA71XX_SVIDEO2 },
},
.audio_inputs = {
{ IVTV_CARD_INPUT_AUD_TUNER, IVTV_GPIO_TUNER },
{ IVTV_CARD_INPUT_LINE_IN1, IVTV_GPIO_LINE_IN },
- /* IVTV_GPIO_RADIO?? pretend to have "radio" for 2nd audio GPIO. */
- { IVTV_CARD_INPUT_LINE_IN2, 2 },
+ { IVTV_CARD_INPUT_LINE_IN2, IVTV_GPIO_LINE_IN },
},
- /*
- * Sony windows software seems to set 0x200 when unmuting.
- * Does it do anything? Not clear what 0x100 does either.
- */
- .gpio_init = { .direction = 0x0381, .initial_value = 0x0320 },
+ .gpio_init = { .direction = 0x03e1, .initial_value = 0x0320 },
.gpio_audio_input = { .mask = 0x0060,
- .tuner = 0x0000,
- .linein = 0x0060,
- .radio = 0x0020 },
+ .tuner = 0x0020,
+ .linein = 0x0000,
+ .radio = 0x0060 },
.gpio_audio_mute = { .mask = 0x0000,
.mute = 0x0000 }, /* 0x200? Disable for now. */
.gpio_audio_mode = { .mask = 0x0080,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/cb0b02f2241a6754d21a73f802b692b5ba343443
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
