From: Andre Heider <a.heider@gmail.com>
To: linux-omap@vger.kernel.org
Cc: "Matt Porter" <mporter@linaro.org>,
"Hans J . Koch" <hjk@hansjkoch.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Benoît Cousson" <bcousson@baylibre.com>,
"Paul Walmsley" <paul@pwsan.com>,
"Tony Lindgren" <tony@atomide.com>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCH 08/13] uio: uio_pruss: make the UIO SRAM memory region optional
Date: Sun, 29 Jun 2014 18:21:42 +0200 [thread overview]
Message-ID: <1404058907-21112-9-git-send-email-a.heider@gmail.com> (raw)
In-Reply-To: <1404058907-21112-1-git-send-email-a.heider@gmail.com>
Skip creating the UIO SRAM memory region if no SRAM genalloc has been
passed along. This will be the case for am33xx SoCs.
The order of the memory regions is not changed for already supported
platforms. That is to keep the current behavior for existing userland
drivers.
For am33x this gives one memory region less. This behavior is in line
with downstream patches and userland driver support for this SoC family.
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
drivers/uio/uio_pruss.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
index 50ff206..afaf726 100644
--- a/drivers/uio/uio_pruss.c
+++ b/drivers/uio/uio_pruss.c
@@ -111,7 +111,7 @@ static int pruss_probe(struct platform_device *pdev)
struct uio_pruss_dev *gdev;
struct resource *regs_prussio;
struct device *dev = &pdev->dev;
- int ret = -ENODEV, cnt = 0;
+ int ret = -ENODEV, cnt = 0, i;
struct uio_pruss_pdata *pdata = dev_get_platdata(dev);
dma_addr_t ddr_paddr;
@@ -160,17 +160,24 @@ static int pruss_probe(struct platform_device *pdev)
gdev->hostirq_start = platform_get_irq(pdev, 0);
for (cnt = 0, p = gdev->info; cnt < MAX_PRUSS_EVT; cnt++, p++) {
- p->mem[0].addr = regs_prussio->start;
- p->mem[0].size = resource_size(regs_prussio);
- p->mem[0].memtype = UIO_MEM_PHYS;
-
- p->mem[1].addr = gdev->sram_paddr;
- p->mem[1].size = sram_pool_sz;
- p->mem[1].memtype = UIO_MEM_PHYS;
+ i = 0;
+
+ p->mem[i].addr = regs_prussio->start;
+ p->mem[i].size = resource_size(regs_prussio);
+ p->mem[i].memtype = UIO_MEM_PHYS;
+ i++;
+
+ if (gdev->sram_vaddr) {
+ p->mem[i].addr = gdev->sram_paddr;
+ p->mem[i].size = sram_pool_sz;
+ p->mem[i].memtype = UIO_MEM_PHYS;
+ i++;
+ }
- p->mem[2].addr = ddr_paddr;
- p->mem[2].size = extram_pool_sz;
- p->mem[2].memtype = UIO_MEM_PHYS;
+ p->mem[i].addr = ddr_paddr;
+ p->mem[i].size = extram_pool_sz;
+ p->mem[i].memtype = UIO_MEM_PHYS;
+ i++;
p->name = kasprintf(GFP_KERNEL, "pruss_evt%d", cnt);
p->version = DRV_VERSION;
--
2.0.0
next prev parent reply other threads:[~2014-06-29 16:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-29 16:21 [PATCH 00/13] uio_pruss: add support for devicetree and am33xx Andre Heider
[not found] ` <1404058907-21112-1-git-send-email-a.heider-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-06-29 16:21 ` [PATCH 01/13] uio: uio_pruss: use struct device Andre Heider
2014-06-29 16:21 ` [PATCH 05/13] ARM: OMAP2+: hwmod: Introduce a flag to deassert the HW reset line Andre Heider
2014-06-29 16:21 ` [PATCH 06/13] ARM: AM33XX: hwmod: deassert PRUSS' hardreset lines Andre Heider
2014-06-29 16:21 ` [PATCH 02/13] uio: uio_pruss: use devm_kzalloc() Andre Heider
2014-06-30 9:38 ` Mark Rutland
2014-06-30 19:42 ` Andre Heider
2014-06-29 16:21 ` [PATCH 03/13] uio: uio_pruss: use devm_ioremap_resource() Andre Heider
2014-06-29 16:21 ` [PATCH 04/13] uio: uio_pruss: use dmam_alloc_coherent() Andre Heider
2014-06-29 16:21 ` [PATCH 07/13] Documentation: devicetree: add bindings for TI PRUSS Andre Heider
2014-06-30 9:33 ` Mark Rutland
2014-06-30 19:36 ` Andre Heider
2014-06-29 16:21 ` Andre Heider [this message]
2014-06-29 16:21 ` [PATCH 09/13] uio: uio_pruss: add devicetree support Andre Heider
2014-06-30 9:36 ` Mark Rutland
2014-06-30 19:39 ` Andre Heider
2014-06-29 16:21 ` [PATCH 10/13] uio: uio_pruss: add runtime pm support Andre Heider
2014-06-29 16:21 ` [PATCH 11/13] uio: uio_pruss: enable the driver for am33xx SoCs Andre Heider
2014-06-29 16:21 ` [PATCH 12/13] ARM: dts: am33xx: add the PRUSSv2 device Andre Heider
2014-06-30 9:36 ` Mark Rutland
2014-06-30 19:40 ` Andre Heider
2014-06-29 16:21 ` [PATCH 13/13] ARM: dts: am335x-boneblack: enable " Andre Heider
2014-07-07 8:48 ` [PATCH 00/13] uio_pruss: add support for devicetree and am33xx Andre Heider
2014-07-07 17:50 ` Paul Walmsley
2014-07-09 10:16 ` Hans J. Koch
2014-07-09 13:19 ` Andre Heider
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404058907-21112-9-git-send-email-a.heider@gmail.com \
--to=a.heider@gmail.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hjk@hansjkoch.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=mporter@linaro.org \
--cc=paul@pwsan.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).