[PATCH v2 11/13] da850: pruss SUART board specific additions.
From: Subhasish Ghosh <hidden>
Date: 2011-02-22 06:26:20
Also in:
lkml
Subsystem:
multifunction devices (mfd), the rest · Maintainers:
Lee Jones, Linus Torvalds
Hello, Have modified this as shown below: Please let me know if this looks ok.
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
+static struct da850_evm_pruss_can_data can_data = {
.version = 1,
};
+static struct resource da850_evm_suart_resource[] =
------------------------->>> Added a separate resource structure for
suart.
+ {
+ .name = "da8xx_mcasp0_iomem",
+ .start = DAVINCI_DA8XX_MCASP0_REG_BASE,
+ .end = DAVINCI_DA8XX_MCASP0_REG_BASE +
+ (SZ_1K * 12) - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
static struct da8xx_pruss_devices pruss_devices[] = {
{
.dev_name = "da8xx_pruss_can",
.pdata = &can_data,
.pdata_size = sizeof(can_data),
.setup = da850_evm_setup_pruss_can,
+ .num_resources = 0,
+ .resources = NULL,
},
{
.dev_name = "da8xx_pruss_uart",
.pdata = &suart_data,
.pdata_size = sizeof(suart_data),
.setup = da850_evm_setup_pruss_suart,
+ .num_resources = ARRAY_SIZE(da850_evm_suart_resource),
+ .resources =
a850_evm_suart_resource, ---------------------------- >>>>> Initialized it
here
},
{
.dev_name = NULL,
diff --git a/drivers/mfd/da8xx_pru.c b/drivers/mfd/da8xx_pru.c
index f7868a4..140bf14 100644
--- a/drivers/mfd/da8xx_pru.c
+++ b/drivers/mfd/da8xx_pru.c@@ -332,6 +332,8 @@ static int pruss_mfd_add_devices(struct platform_device *pdev)
cell.name = (dev_data + count)->dev_name;
cell.platform_data = (dev_data + count)->pdata;
cell.data_size = (dev_data + count)->pdata_size;
+ cell.resources = (dev_data +
ount)->resources; ---------------------->>>Modified the MFD driver to add
the resources.
+ cell.num_resources = (dev_data + count)->num_resources;
diff --git a/drivers/tty/serial/da8xx_pruss/pruss_suart.c b/drivers/tty/serial/da8xx_pruss/pruss_suart.c
+ res = platform_get_resource(pdev, IORESOURCE_MEM,
0); ------------------>> Used platform infrastructure to get the data.
+ if (!res) {
+ dev_err(&pdev->dev, "Failed to get resource");
+ return -ENOMEM;
+ }
+
+ if (!request_mem_region(res->start,
+ resource_size(res),
--------------------------------------------------
From: "Sergei Shtylyov" <redacted>
Sent: Saturday, February 12, 2011 12:20 AM
To: "Subhasish Ghosh" <redacted>
Cc: <redacted>;
[off-list ref]; "Russell King" [off-list ref];
"Kevin Hilman" [off-list ref]; [off-list ref]; "open list"
[off-list ref]; [off-list ref];
[off-list ref]
Subject: Re: [PATCH v2 11/13] da850: pruss SUART board specific additions.
Subhasish Ghosh wrote:quoted
This patch adds the pruss SUART pin mux and registers the device with the pruss mfd driver.quoted
Signed-off-by: Subhasish Ghosh <redacted> --- arch/arm/mach-davinci/board-da850-evm.c | 36 +++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-)quoted
diff --git a/arch/arm/mach-davinci/board-da850-evm.cb/arch/arm/mach-davinci/board-da850-evm.c index f9c38f8..3858516 100644--- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c[...]quoted
@@ -1085,6 +1104,17 @@ static int __init da850_evm_setup_pruss_can(void) return ret; } +static struct da850_evm_pruss_suart_data suart_data = { + .version = 1, + .resource = { + .name = "da8xx_mcasp0_iomem", + .start = DAVINCI_DA8XX_MCASP0_REG_BASE, + .end = DAVINCI_DA8XX_MCASP0_REG_BASE + + (SZ_1K * 12) - 1, + .flags = IORESOURCE_MEM, + }, +}; +I don't think passing a resource thru platform data is good idea... Resources should be bound to the platform device. WBR, Sergei