Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c1ea5b7424e4d1d3f56de1504a257ec2419259e8

Authored by Andy Walls
Committed by Mauro Carvalho Chehab
1 parent 7c12167bae

V4L/DVB: 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.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 1 changed file with 8 additions and 15 deletions Side-by-side Diff

drivers/media/video/ivtv/ivtv-cards.c
Diff comments   View file @ c1ea5b7
... ... @@ -1227,27 +1227,20 @@
1227 1227 .hw_audio_ctrl = IVTV_HW_GPIO,
1228 1228 .hw_all = IVTV_HW_GPIO | IVTV_HW_SAA7115 | IVTV_HW_TUNER,
1229 1229 .video_inputs = {
1230   - { IVTV_CARD_INPUT_VID_TUNER, 0, IVTV_SAA71XX_COMPOSITE5 },
1231   - { IVTV_CARD_INPUT_COMPOSITE1, 1, IVTV_SAA71XX_COMPOSITE4 }, /* rear */
1232   - { IVTV_CARD_INPUT_COMPOSITE2, 2, IVTV_SAA71XX_COMPOSITE1 }, /* front */
  1230 + { IVTV_CARD_INPUT_VID_TUNER, 0, IVTV_SAA71XX_COMPOSITE1 },
  1231 + { IVTV_CARD_INPUT_COMPOSITE1, 1, IVTV_SAA71XX_COMPOSITE1 },
1233 1232 { IVTV_CARD_INPUT_SVIDEO1, 1, IVTV_SAA71XX_SVIDEO1 },
1234   - { IVTV_CARD_INPUT_SVIDEO2, 2, IVTV_SAA71XX_SVIDEO2 },
1235 1233 },
1236 1234 .audio_inputs = {
1237 1235 { IVTV_CARD_INPUT_AUD_TUNER, IVTV_GPIO_TUNER },
1238 1236 { IVTV_CARD_INPUT_LINE_IN1, IVTV_GPIO_LINE_IN },
1239   - /* IVTV_GPIO_RADIO?? pretend to have "radio" for 2nd audio GPIO. */
1240   - { IVTV_CARD_INPUT_LINE_IN2, 2 },
  1237 + { IVTV_CARD_INPUT_LINE_IN2, IVTV_GPIO_LINE_IN },
1241 1238 },
1242   - /*
1243   - * Sony windows software seems to set 0x200 when unmuting.
1244   - * Does it do anything? Not clear what 0x100 does either.
1245   - */
1246   - .gpio_init = { .direction = 0x0381, .initial_value = 0x0320 },
  1239 + .gpio_init = { .direction = 0x03e1, .initial_value = 0x0320 },
1247 1240 .gpio_audio_input = { .mask = 0x0060,
1248   - .tuner = 0x0000,
1249   - .linein = 0x0060,
1250   - .radio = 0x0020 },
  1241 + .tuner = 0x0020,
  1242 + .linein = 0x0000,
  1243 + .radio = 0x0060 },
1251 1244 .gpio_audio_mute = { .mask = 0x0000,
1252 1245 .mute = 0x0000 }, /* 0x200? Disable for now. */
1253 1246 .gpio_audio_mode = { .mask = 0x0080,