[PATCH] mfd: timberdale: Use DMA for ks8842

[PATCH] mfd: timberdale: Use DMA for ks8842

[Richard Röjfors]

This patch defines platform data for the ks8842 int the timberdale
MFD.
The platform data contains DMA channels to be used by the driver.

Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
---
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index ac59950..727f62c 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -43,6 +43,8 @@
 
 #include <linux/timb_dma.h>
 
+#include <linux/ks8842.h>
+
 #include "timberdale.h"
 
 #define DRIVER_NAME "timberdale"
@@ -161,6 +163,12 @@ static const __devinitconst struct resource timberdale_spi_resources[] = {
 	},
 };
 
+static __devinitdata struct ks8842_platform_data
+	timberdale_ks8842_platform_data = {
+	.rx_dma_channel = DMA_ETH_RX,
+	.tx_dma_channel = DMA_ETH_TX
+};
+
 static const __devinitconst struct resource timberdale_eth_resources[] = {
 	{
 		.start	= ETHOFFSET,
@@ -389,6 +397,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
 		.name = "ks8842",
 		.num_resources = ARRAY_SIZE(timberdale_eth_resources),
 		.resources = timberdale_eth_resources,
+		.platform_data = &timberdale_ks8842_platform_data,
+		.data_size = sizeof(timberdale_ks8842_platform_data)
 	},
 };
 
@@ -447,6 +457,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
 		.name = "ks8842",
 		.num_resources = ARRAY_SIZE(timberdale_eth_resources),
 		.resources = timberdale_eth_resources,
+		.platform_data = &timberdale_ks8842_platform_data,
+		.data_size = sizeof(timberdale_ks8842_platform_data)
 	},
 };
 
@@ -538,6 +550,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
 		.name = "ks8842",
 		.num_resources = ARRAY_SIZE(timberdale_eth_resources),
 		.resources = timberdale_eth_resources,
+		.platform_data = &timberdale_ks8842_platform_data,
+		.data_size = sizeof(timberdale_ks8842_platform_data)
 	},
 };
 

Re: [PATCH] mfd: timberdale: Use DMA for ks8842

[Samuel Ortiz]

Hi Richard,

On Wed, Sep 15, 2010 at 04:49:24PM +0200, Richard Röjfors wrote:
> This patch defines platform data for the ks8842 int the timberdale
> MFD.
> The platform data contains DMA channels to be used by the driver.
Patch applied, thanks.
You may want to rebase your video-in patches so that Mauro will be able to
apply them cleanly.

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 ac59950..727f62c 100644
> --- a/drivers/mfd/timberdale.c
> +++ b/drivers/mfd/timberdale.c
> @@ -43,6 +43,8 @@
>  
>  #include <linux/timb_dma.h>
>  
> +#include <linux/ks8842.h>
> +
>  #include "timberdale.h"
>  
>  #define DRIVER_NAME "timberdale"
> @@ -161,6 +163,12 @@ static const __devinitconst struct resource timberdale_spi_resources[] = {
>  	},
>  };
>  
> +static __devinitdata struct ks8842_platform_data
> +	timberdale_ks8842_platform_data = {
> +	.rx_dma_channel = DMA_ETH_RX,
> +	.tx_dma_channel = DMA_ETH_TX
> +};
> +
>  static const __devinitconst struct resource timberdale_eth_resources[] = {
>  	{
>  		.start	= ETHOFFSET,
> @@ -389,6 +397,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
>  		.name = "ks8842",
>  		.num_resources = ARRAY_SIZE(timberdale_eth_resources),
>  		.resources = timberdale_eth_resources,
> +		.platform_data = &timberdale_ks8842_platform_data,
> +		.data_size = sizeof(timberdale_ks8842_platform_data)
>  	},
>  };
>  
> @@ -447,6 +457,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
>  		.name = "ks8842",
>  		.num_resources = ARRAY_SIZE(timberdale_eth_resources),
>  		.resources = timberdale_eth_resources,
> +		.platform_data = &timberdale_ks8842_platform_data,
> +		.data_size = sizeof(timberdale_ks8842_platform_data)
>  	},
>  };
>  
> @@ -538,6 +550,8 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
>  		.name = "ks8842",
>  		.num_resources = ARRAY_SIZE(timberdale_eth_resources),
>  		.resources = timberdale_eth_resources,
> +		.platform_data = &timberdale_ks8842_platform_data,
> +		.data_size = sizeof(timberdale_ks8842_platform_data)
>  	},
>  };
>  
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/