* [PATCH] mfd: Add in XIIC to some configurations of timberdale
@ 2010-03-16 9:43 Richard Röjfors
2010-03-19 16:41 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Richard Röjfors @ 2010-03-16 9:43 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz
This patch adds in the Xilinx I2C bus driver to some of the
configurations of the timberdale MFD.
It provides the I2C devices to the XIIC via platform data in a
similar way as done to the ocores driver.
Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
---
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 1ed44d2..1d52349 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -30,6 +30,7 @@
#include <linux/i2c.h>
#include <linux/i2c-ocores.h>
+#include <linux/i2c-xiic.h>
#include <linux/i2c/tsc2007.h>
#include <linux/spi/spi.h>
@@ -68,6 +69,12 @@ static struct i2c_board_info timberdale_i2c_board_info[] = {
},
};
+static __devinitdata struct xiic_i2c_platform_data
+timberdale_xiic_platform_data = {
+ .devices = timberdale_i2c_board_info,
+ .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
+};
+
static __devinitdata struct ocores_i2c_platform_data
timberdale_ocores_platform_data = {
.regstep = 4,
@@ -76,6 +83,19 @@ timberdale_ocores_platform_data = {
.num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
};
+const static __devinitconst struct resource timberdale_xiic_resources[] = {
+ {
+ .start = XIICOFFSET,
+ .end = XIICEND,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = IRQ_TIMBERDALE_I2C,
+ .end = IRQ_TIMBERDALE_I2C,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
const static __devinitconst struct resource timberdale_ocores_resources[] = {
{
.start = OCORESOFFSET,
@@ -269,6 +289,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
.resources = timberdale_uart_resources,
},
{
+ .name = "xiic-i2c",
+ .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
+ .resources = timberdale_xiic_resources,
+ .platform_data = &timberdale_xiic_platform_data,
+ .data_size = sizeof(timberdale_xiic_platform_data),
+ },
+ {
.name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources,
@@ -313,6 +340,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
.resources = timberdale_uartlite_resources,
},
{
+ .name = "xiic-i2c",
+ .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
+ .resources = timberdale_xiic_resources,
+ .platform_data = &timberdale_xiic_platform_data,
+ .data_size = sizeof(timberdale_xiic_platform_data),
+ },
+ {
.name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources,
@@ -357,6 +391,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
.resources = timberdale_uart_resources,
},
{
+ .name = "xiic-i2c",
+ .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
+ .resources = timberdale_xiic_resources,
+ .platform_data = &timberdale_xiic_platform_data,
+ .data_size = sizeof(timberdale_xiic_platform_data),
+ },
+ {
.name = "timb-gpio",
.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
.resources = timberdale_gpio_resources,
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mfd: Add in XIIC to some configurations of timberdale
2010-03-16 9:43 [PATCH] mfd: Add in XIIC to some configurations of timberdale Richard Röjfors
@ 2010-03-19 16:41 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2010-03-19 16:41 UTC (permalink / raw)
To: Richard Röjfors; +Cc: linux-kernel
Hi Richard,
On Tue, Mar 16, 2010 at 10:43:28AM +0100, Richard Röjfors wrote:
> This patch adds in the Xilinx I2C bus driver to some of the
> configurations of the timberdale MFD.
>
> It provides the I2C devices to the XIIC via platform data in a
> similar way as done to the ocores driver.
Thanks, patch applied.
Cheers,
Samuel.
> Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
> ---
> diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
> index 1ed44d2..1d52349 100644
> --- a/drivers/mfd/timberdale.c
> +++ b/drivers/mfd/timberdale.c
> @@ -30,6 +30,7 @@
>
> #include <linux/i2c.h>
> #include <linux/i2c-ocores.h>
> +#include <linux/i2c-xiic.h>
> #include <linux/i2c/tsc2007.h>
>
> #include <linux/spi/spi.h>
> @@ -68,6 +69,12 @@ static struct i2c_board_info timberdale_i2c_board_info[] = {
> },
> };
>
> +static __devinitdata struct xiic_i2c_platform_data
> +timberdale_xiic_platform_data = {
> + .devices = timberdale_i2c_board_info,
> + .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
> +};
> +
> static __devinitdata struct ocores_i2c_platform_data
> timberdale_ocores_platform_data = {
> .regstep = 4,
> @@ -76,6 +83,19 @@ timberdale_ocores_platform_data = {
> .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
> };
>
> +const static __devinitconst struct resource timberdale_xiic_resources[] = {
> + {
> + .start = XIICOFFSET,
> + .end = XIICEND,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = IRQ_TIMBERDALE_I2C,
> + .end = IRQ_TIMBERDALE_I2C,
> + .flags = IORESOURCE_IRQ,
> + },
> +};
> +
> const static __devinitconst struct resource timberdale_ocores_resources[] = {
> {
> .start = OCORESOFFSET,
> @@ -269,6 +289,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
> .resources = timberdale_uart_resources,
> },
> {
> + .name = "xiic-i2c",
> + .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
> + .resources = timberdale_xiic_resources,
> + .platform_data = &timberdale_xiic_platform_data,
> + .data_size = sizeof(timberdale_xiic_platform_data),
> + },
> + {
> .name = "timb-gpio",
> .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
> .resources = timberdale_gpio_resources,
> @@ -313,6 +340,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
> .resources = timberdale_uartlite_resources,
> },
> {
> + .name = "xiic-i2c",
> + .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
> + .resources = timberdale_xiic_resources,
> + .platform_data = &timberdale_xiic_platform_data,
> + .data_size = sizeof(timberdale_xiic_platform_data),
> + },
> + {
> .name = "timb-gpio",
> .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
> .resources = timberdale_gpio_resources,
> @@ -357,6 +391,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
> .resources = timberdale_uart_resources,
> },
> {
> + .name = "xiic-i2c",
> + .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
> + .resources = timberdale_xiic_resources,
> + .platform_data = &timberdale_xiic_platform_data,
> + .data_size = sizeof(timberdale_xiic_platform_data),
> + },
> + {
> .name = "timb-gpio",
> .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
> .resources = timberdale_gpio_resources,
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-19 16:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-16 9:43 [PATCH] mfd: Add in XIIC to some configurations of timberdale Richard Röjfors
2010-03-19 16:41 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox