Skip to contentSkip to conversation

mfd: Add timb-radio to the timberdale MFD

PATCH In review Richard Röjfors 3 participants 6 messages Feb 14, 2010 – Feb 20, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: Add timb-radio to the timberdale MFD

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

---

drivers/mfd/timberdale.c +64 -0
index 603cf06..1ed44d2 100644
@@ -37,6 +37,8 @@
 #include <linux/spi/max7301.h>
 #include <linux/spi/mc33880.h>
 
+#include <media/timb_radio.h>
+
 #include "timberdale.h"
 
 #define DRIVER_NAME "timberdale"
@@ -213,6 +215,40 @@ const static __devinitconst struct resource timberdale_uartlite_resources[] = {
 	},
 };
 
+const static __devinitconst struct resource timberdale_radio_resources[] = {
+	{
+		.start	= RDSOFFSET,
+		.end	= RDSEND,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= IRQ_TIMBERDALE_RDS,
+		.end	= IRQ_TIMBERDALE_RDS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = {
+	I2C_BOARD_INFO("tef6862", 0x60)
+};
+
+static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = {
+	I2C_BOARD_INFO("saa7706h", 0x1C)
+};
+
+static __devinitdata struct timb_radio_platform_data
+	timberdale_radio_platform_data = {
+	.i2c_adapter = 0,
+	.tuner = {
+		.module_name = "tef6862",
+		.info = &timberdale_tef6868_i2c_board_info
+	},
+	.dsp = {
+		.module_name = "saa7706h",
+		.info = &timberdale_saa7706_i2c_board_info
+	}
+};
+
 const static __devinitconst struct resource timberdale_dma_resources[] = {
 	{
 		.start	= DMAOFFSET,
@@ -240,6 +276,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
 		.data_size = sizeof(timberdale_gpio_platform_data),
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
@@ -282,6 +325,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
 		.resources = timberdale_mlogicore_resources,
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
@@ -314,6 +364,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
 		.data_size = sizeof(timberdale_gpio_platform_data),
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
@@ -348,6 +405,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
 		.data_size = sizeof(timberdale_gpio_platform_data),
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
#1 lore raw
Quoted 4 lines · Richard Röjfors

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

Hi Richard,

I'm trying to apply it to my git tree (http://git.linuxtv.org/v4l-dvb.git),
but it is failing:

patching file drivers/mfd/timberdale.c
Hunk #1 FAILED at 37.
Hunk #2 FAILED at 215.
Hunk #3 FAILED at 276.
Hunk #4 FAILED at 325.
Hunk #5 FAILED at 364.
Hunk #6 FAILED at 405.
6 out of 6 hunks FAILED -- saving rejects to file drivers/mfd/timberdale.c.rej Patch doesn't apply

Could you please verify what's going wrong?

Quoted 125 lines

---

drivers/mfd/timberdale.c +20 -0
index 603cf06..1ed44d2 100644
@@ -37,6 +37,8 @@
 #include <linux/spi/max7301.h>
 #include <linux/spi/mc33880.h>
 
+#include <media/timb_radio.h>
+
 #include "timberdale.h"
 
 #define DRIVER_NAME "timberdale"
@@ -213,6 +215,40 @@ const static __devinitconst struct resource
 timberdale_uartlite_resources[] = {
     },
 };
 
+const static __devinitconst struct resource
 timberdale_radio_resources[] = {
+    {
+        .start    = RDSOFFSET,
+        .end    = RDSEND,
+        .flags    = IORESOURCE_MEM,
+    },
+    {
+        .start    = IRQ_TIMBERDALE_RDS,
+        .end    = IRQ_TIMBERDALE_RDS,
+        .flags    = IORESOURCE_IRQ,
+    },
+};
+
+static __devinitdata struct i2c_board_info
 timberdale_tef6868_i2c_board_info = {
+    I2C_BOARD_INFO("tef6862", 0x60)
+};
+
+static __devinitdata struct i2c_board_info

timberdale_saa7706_i2c_board_info = {

drivers/mfd/timberdale.c +23 -0
+    I2C_BOARD_INFO("saa7706h", 0x1C)
+};
+
+static __devinitdata struct timb_radio_platform_data
+    timberdale_radio_platform_data = {
+    .i2c_adapter = 0,
+    .tuner = {
+        .module_name = "tef6862",
+        .info = &timberdale_tef6868_i2c_board_info
+    },
+    .dsp = {
+        .module_name = "saa7706h",
+        .info = &timberdale_saa7706_i2c_board_info
+    }
+};
+
 const static __devinitconst struct resource timberdale_dma_resources[] = {
     {
         .start    = DMAOFFSET,
@@ -240,6 +276,13 @@ static __devinitdata struct mfd_cell
 timberdale_cells_bar0_cfg0[] = {
         .data_size = sizeof(timberdale_gpio_platform_data),
     },
     {
+        .name = "timb-radio",
+        .num_resources = ARRAY_SIZE(timberdale_radio_resources),
+        .resources = timberdale_radio_resources,
+        .platform_data = &timberdale_radio_platform_data,
+        .data_size = sizeof(timberdale_radio_platform_data),
+    },
+    {
         .name = "xilinx_spi",
         .num_resources = ARRAY_SIZE(timberdale_spi_resources),

.resources = timberdale_spi_resources,

drivers/mfd/timberdale.c +7 -0
@@ -282,6 +325,13 @@ static __devinitdata struct mfd_cell
 timberdale_cells_bar0_cfg1[] = {
         .resources = timberdale_mlogicore_resources,
     },
     {
+        .name = "timb-radio",
+        .num_resources = ARRAY_SIZE(timberdale_radio_resources),
+        .resources = timberdale_radio_resources,
+        .platform_data = &timberdale_radio_platform_data,
+        .data_size = sizeof(timberdale_radio_platform_data),
+    },
+    {
         .name = "xilinx_spi",
         .num_resources = ARRAY_SIZE(timberdale_spi_resources),

.resources = timberdale_spi_resources,

drivers/mfd/timberdale.c +7 -0
@@ -314,6 +364,13 @@ static __devinitdata struct mfd_cell
 timberdale_cells_bar0_cfg2[] = {
         .data_size = sizeof(timberdale_gpio_platform_data),
     },
     {
+        .name = "timb-radio",
+        .num_resources = ARRAY_SIZE(timberdale_radio_resources),
+        .resources = timberdale_radio_resources,
+        .platform_data = &timberdale_radio_platform_data,
+        .data_size = sizeof(timberdale_radio_platform_data),
+    },
+    {
         .name = "xilinx_spi",
         .num_resources = ARRAY_SIZE(timberdale_spi_resources),

.resources = timberdale_spi_resources,

drivers/mfd/timberdale.c +7 -0
@@ -348,6 +405,13 @@ static __devinitdata struct mfd_cell
 timberdale_cells_bar0_cfg3[] = {
         .data_size = sizeof(timberdale_gpio_platform_data),
     },
     {
+        .name = "timb-radio",
+        .num_resources = ARRAY_SIZE(timberdale_radio_resources),
+        .resources = timberdale_radio_resources,
+        .platform_data = &timberdale_radio_platform_data,
+        .data_size = sizeof(timberdale_radio_platform_data),
+    },
+    {
         .name = "xilinx_spi",
         .num_resources = ARRAY_SIZE(timberdale_spi_resources),

.resources = timberdale_spi_resources,

Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Cheers,
Mauro
#2 lore raw
Quoted 10 lines · Mauro Carvalho Chehab
Quoted 4 lines · Richard Röjfors

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

Hi Richard,

I'm trying to apply it to my git tree (http://git.linuxtv.org/v4l-dvb.git),
but it is failing:

Ah, this patch was against your linux-next.git at kernel.org.

I will generate a new patch against the proper git.

--Richard

#3 lore raw
In reply to Mauro Carvalho Chehab
Quoted 10 lines · Mauro Carvalho Chehab
Quoted 4 lines · Richard Röjfors

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

Hi Richard,

I'm trying to apply it to my git tree (http://git.linuxtv.org/v4l-dvb.git),
but it is failing:

Hi Mauro,

Right now my mail client, icedove, confuses me. Just upgraded to ver 3. It seem to add in an extra space to lines not starting with a plus in the patch.

I attached the patch.

Sorry for the inconvenience.

--Richard

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

---

drivers/mfd/timberdale.c +64 -0
index 603cf06..1ed44d2 100644
@@ -37,6 +37,8 @@
 #include <linux/spi/max7301.h>
 #include <linux/spi/mc33880.h>
 
+#include <media/timb_radio.h>
+
 #include "timberdale.h"
 
 #define DRIVER_NAME "timberdale"
@@ -213,6 +215,40 @@ const static __devinitconst struct resource timberdale_uartlite_resources[] = {
 	},
 };
 
+const static __devinitconst struct resource timberdale_radio_resources[] = {
+	{
+		.start	= RDSOFFSET,
+		.end	= RDSEND,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= IRQ_TIMBERDALE_RDS,
+		.end	= IRQ_TIMBERDALE_RDS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = {
+	I2C_BOARD_INFO("tef6862", 0x60)
+};
+
+static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = {
+	I2C_BOARD_INFO("saa7706h", 0x1C)
+};
+
+static __devinitdata struct timb_radio_platform_data
+	timberdale_radio_platform_data = {
+	.i2c_adapter = 0,
+	.tuner = {
+		.module_name = "tef6862",
+		.info = &timberdale_tef6868_i2c_board_info
+	},
+	.dsp = {
+		.module_name = "saa7706h",
+		.info = &timberdale_saa7706_i2c_board_info
+	}
+};
+
 const static __devinitconst struct resource timberdale_dma_resources[] = {
 	{
 		.start	= DMAOFFSET,
@@ -240,6 +276,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
 		.data_size = sizeof(timberdale_gpio_platform_data),
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
@@ -282,6 +325,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
 		.resources = timberdale_mlogicore_resources,
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
@@ -314,6 +364,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
 		.data_size = sizeof(timberdale_gpio_platform_data),
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
@@ -348,6 +405,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
 		.data_size = sizeof(timberdale_gpio_platform_data),
 	},
 	{
+		.name = "timb-radio",
+		.num_resources = ARRAY_SIZE(timberdale_radio_resources),
+		.resources = timberdale_radio_resources,
+		.platform_data = &timberdale_radio_platform_data,
+		.data_size = sizeof(timberdale_radio_platform_data),
+	},
+	{
 		.name = "xilinx_spi",
 		.num_resources = ARRAY_SIZE(timberdale_spi_resources),
 		.resources = timberdale_spi_resources,
#4 lore raw
Quoted 13 lines · Richard Röjfors
Quoted 11 lines · Mauro Carvalho Chehab
Quoted 4 lines · Richard Röjfors

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

Hi Richard,

I'm trying to apply it to my git tree
(http://git.linuxtv.org/v4l-dvb.git),
but it is failing:

Quoted 5 lines

Hi Mauro,

Right now my mail client, icedove, confuses me. Just upgraded to ver 3. It seem to add in an extra space to lines not starting with a plus in the patch.

I had that problem with something called Thunderbird. Perhaps you could use the hints in Documentation/email-clients.txt but change Thunderbird to icedove. (?)

Quoted 5 lines

I attached the patch.

Sorry for the inconvenience.

--Richard

Signature · 1 line
~Randy
#5 lore raw
Quoted 16 lines · Randy Dunlap
Quoted 15 lines · Richard Röjfors
Quoted 11 lines · Mauro Carvalho Chehab
Quoted 4 lines · Richard Röjfors

This patch addes timb-radio to all configurations of the timberdale MFD.

Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data.

Hi Richard,

I'm trying to apply it to my git tree
(http://git.linuxtv.org/v4l-dvb.git),
but it is failing:

Hi Mauro,

Quoted 7 lines
Quoted 3 lines

Right now my mail client, icedove, confuses me. Just upgraded to ver 3. It seem to add in an extra space to lines not starting with a plus in the patch.

I had that problem with something called Thunderbird. Perhaps you could use the hints in Documentation/email-clients.txt but change Thunderbird to icedove. (?)

icedove is debians fork of thunderbird, so I think it's basically the same client. So if people using it isn't aware of it I think we should change it to Thunderbird/Icedove in the documentation

--Richard