V4L/DVB (7005): cx23885: SRAM reallocation prior to analog video implementation

We need to clear space large enough for the video and encoder fifos.

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

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index a602ac800a4f664f5e8decbfc684e92701390377..31723dd7cbdc0f65e0aebb974e5cd31d6ded7f5d 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -75,12 +75,12 @@ static LIST_HEAD(cx23885_devlist);
 
 static struct sram_channel cx23885_sram_channels[] = {
        [SRAM_CH01] = {
-               .name           = "test ch1",
+               .name           = "VID A",
                .cmds_start     = 0x10000,
-               .ctrl_start     = 0x10500,
-               .cdt            = 0x10900,
-               .fifo_start     = 0x3000,
-               .fifo_size      = 0x1000,
+               .ctrl_start     = 0x105b0,
+               .cdt            = 0x107b0,
+               .fifo_start     = 0x40,
+               .fifo_size      = 0x2800,
                .ptr1_reg       = DMA1_PTR1,
                .ptr2_reg       = DMA1_PTR2,
                .cnt1_reg       = DMA1_CNT1,
@@ -102,8 +102,8 @@ static struct sram_channel cx23885_sram_channels[] = {
        [SRAM_CH03] = {
                .name           = "TS1 B",
                .cmds_start     = 0x100A0,
-               .ctrl_start     = 0x10780,
-               .cdt            = 0x10400,
+               .ctrl_start     = 0x10630,
+               .cdt            = 0x10870,
                .fifo_start     = 0x5000,
                .fifo_size      = 0x1000,
                .ptr1_reg       = DMA3_PTR1,
@@ -139,7 +139,7 @@ static struct sram_channel cx23885_sram_channels[] = {
                .name           = "TS2 C",
                .cmds_start     = 0x10140,
                .ctrl_start     = 0x10680,
-               .cdt            = 0x10480,
+               .cdt            = 0x108d0,
                .fifo_start     = 0x6000,
                .fifo_size      = 0x1000,
                .ptr1_reg       = DMA5_PTR1,
@@ -207,12 +207,12 @@ static struct sram_channel cx23885_sram_channels[] = {
 
 static struct sram_channel cx23887_sram_channels[] = {
        [SRAM_CH01] = {
-               .name           = "test ch1",
-               .cmds_start     = 0x0,
-               .ctrl_start     = 0x0,
-               .cdt            = 0x0,
-               .fifo_start     = 0x0,
-               .fifo_size      = 0x0,
+               .name           = "VID A",
+               .cmds_start     = 0x10000,
+               .ctrl_start     = 0x105b0,
+               .cdt            = 0x107b0,
+               .fifo_start     = 0x40,
+               .fifo_size      = 0x2800,
                .ptr1_reg       = DMA1_PTR1,
                .ptr2_reg       = DMA1_PTR2,
                .cnt1_reg       = DMA1_CNT1,
@@ -231,12 +231,12 @@ static struct sram_channel cx23887_sram_channels[] = {
                .cnt2_reg       = DMA2_CNT2,
        },
        [SRAM_CH03] = {
-               .name           = "ch3",
-               .cmds_start     = 0x0,
-               .ctrl_start     = 0x0,
-               .cdt            = 0x0,
-               .fifo_start     = 0x0,
-               .fifo_size      = 0x0,
+               .name           = "TS1 B",
+               .cmds_start     = 0x100A0,
+               .ctrl_start     = 0x10780,
+               .cdt            = 0x10400,
+               .fifo_start     = 0x5000,
+               .fifo_size      = 0x1000,
                .ptr1_reg       = DMA3_PTR1,
                .ptr2_reg       = DMA3_PTR2,
                .cnt1_reg       = DMA3_CNT1,