lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[018/104] ARM: OMAP: hwmod: Fix the addr space, irq, dma count APIs
3.1-stable review patch.  If anyone has any objections, please let me know.

------------------

From: sricharan <r.sricharan@ti.com>

commit cc1b0765da6078b906772b79ff211b88cc0ae958 upstream.

The address spaces, irqs and dma reqs count APIs return the
number of corresponding entries in a hwmod including a additional
null value or a -1 terminator in the structure introduced recently.
More information here:

- 212738a4: omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs
arrays

- 78183f3f: omap_hwmod: use a null structure record to terminate
omap_hwmod_addr_space arrays

- bc614958: omap_hwmod: use a terminator record with omap_hwmod_dma_info
arrays

The issue with irqs and dma info was originally reported by Benoit Cousson.

The devices which have multiple hwmods and use device_build_ss are
broken with this, as their resources are populated with a extra null
value, subsequently the probe fails. So fix the API not to include
the array terminator in the count.

Reported-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimar@ti.com>
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
arch/arm/mach-omap2/omap_hwmod.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -749,7 +749,7 @@ static int _count_mpu_irqs(struct omap_h
ohii = &oh->mpu_irqs[i++];
} while (ohii->irq != -1);

- return i;
+ return i-1;
}

/**
@@ -772,7 +772,7 @@ static int _count_sdma_reqs(struct omap_
ohdi = &oh->sdma_reqs[i++];
} while (ohdi->dma_req != -1);

- return i;
+ return i-1;
}

/**
@@ -795,7 +795,7 @@ static int _count_ocp_if_addr_spaces(str
mem = &os->addr[i++];
} while (mem->pa_start != mem->pa_end);

- return i;
+ return i-1;
}

/**



\
 
 \ /
  Last update: 2011-12-07 17:27    [W:0.434 / U:10.128 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site