Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit d8d12b4367e2e759f65c5f9dcb94d21ec237bbc5

Authored by Steven Toth
Committed by Mauro Carvalho Chehab
1 parent 6df516905b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (8471): cx23885: Reallocated the sram to avoid concurrent VIDB/C issues. 

This may be cx23885 chip specific and may not work on the cx23887.
Analog and mpeg encoder streaming are still to be tested.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 1 changed file with 9 additions and 6 deletions Side-by-side Diff

drivers/media/video/cx23885/cx23885-core.c
Diff comments   View file @ d8d12b4
... ... @@ -80,8 +80,8 @@
80 80 [SRAM_CH01] = {
81 81 .name = "VID A",
82 82 .cmds_start = 0x10000,
83   - .ctrl_start = 0x105b0,
84   - .cdt = 0x107b0,
  83 + .ctrl_start = 0x10380,
  84 + .cdt = 0x104c0,
85 85 .fifo_start = 0x40,
86 86 .fifo_size = 0x2800,
87 87 .ptr1_reg = DMA1_PTR1,
... ... @@ -104,8 +104,8 @@
104 104 [SRAM_CH03] = {
105 105 .name = "TS1 B",
106 106 .cmds_start = 0x100A0,
107   - .ctrl_start = 0x10670,
108   - .cdt = 0x10810,
  107 + .ctrl_start = 0x10400,
  108 + .cdt = 0x10580,
109 109 .fifo_start = 0x5000,
110 110 .fifo_size = 0x1000,
111 111 .ptr1_reg = DMA3_PTR1,
... ... @@ -140,8 +140,8 @@
140 140 [SRAM_CH06] = {
141 141 .name = "TS2 C",
142 142 .cmds_start = 0x10140,
143   - .ctrl_start = 0x10680,
144   - .cdt = 0x108d0,
  143 + .ctrl_start = 0x10440,
  144 + .cdt = 0x105e0,
145 145 .fifo_start = 0x6000,
146 146 .fifo_size = 0x1000,
147 147 .ptr1_reg = DMA5_PTR1,
... ... @@ -1043,6 +1043,9 @@
1043 1043  
1044 1044 dprintk(1, "%s() w: %d, h: %d, f: %d\n", __func__,
1045 1045 buf->vb.width, buf->vb.height, buf->vb.field);
  1046 +
  1047 + /* Stop the fifo and risc engine for this port */
  1048 + cx_clear(port->reg_dma_ctl, port->dma_ctl_val);
1046 1049  
1047 1050 /* setup fifo + format */
1048 1051 cx23885_sram_channel_setup(dev,