[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1403267328-23085-1-git-send-email-matthias.bgg@gmail.com>
Date: Fri, 20 Jun 2014 14:28:48 +0200
From: Matthias Brugger <matthias.bgg@...il.com>
To: linux-kernel@...r.kernel.org
Cc: robh+dt@...nel.org, pawel.moll@....com, mark.rutland@....com,
ijc+devicetree@...lion.org.uk, galak@...eaurora.org,
rdunlap@...radead.org, linux@....linux.org.uk,
daniel.lezcano@...aro.org, tglx@...utronix.de,
grant.likely@...aro.org, matthias.bgg@...il.com,
thierry.reding@...il.com, florian.vaussard@...l.ch,
jic23@...nel.org, jason@...edaemon.net, andrew@...n.ch,
silvio.fricke@...il.com, heiko.stuebner@...com, olof@...om.net,
sebastian.hesselbarth@...il.com, sboyd@...eaurora.org,
gregory.clement@...e-electrons.com, arnd@...db.de,
robherring2@...il.com, marc.zyngier@....com,
maxime.ripard@...e-electrons.com, soren.brinkmann@...inx.com,
shawn.guo@...escale.com, anders.berg@....com,
linus.walleij@...aro.org, devicetree@...r.kernel.org,
linux-doc@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: [PATCH v9.1] of: Provide function to request and map memory
A call to of_iomap does not request the memory region.
This patch adds the function of_io_request_and_map which requests
the memory region before mapping it.
Signed-off-by: Matthias Brugger <matthias.bgg@...il.com>
Suggested-by: Thomas Gleixner <tglx@...utronix.de>
Suggested-by: Rob Herring <robh@...nel.org>
Acked-by: Grant Likely <grant.likely@...aro.org>
---
Changes for v9.1:
- fixed the Author email address
drivers/of/address.c | 29 +++++++++++++++++++++++++++++
include/linux/of_address.h | 8 ++++++++
2 files changed, 37 insertions(+)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index cb4242a..09074ba 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -721,3 +721,32 @@ void __iomem *of_iomap(struct device_node *np, int index)
return ioremap(res.start, resource_size(&res));
}
EXPORT_SYMBOL(of_iomap);
+
+/*
+ * of_io_request_and_map - Requests a resource and maps the memory mapped IO
+ * for a given device_node
+ * @device: the device whose io range will be mapped
+ * @index: index of the io range
+ * @name: name of the resource
+ *
+ * Returns a pointer to the requested and mapped memory
+ */
+void __iomem *of_io_request_and_map(struct device_node *np, int index,
+ char *name)
+{
+ struct resource res;
+ void __iomem *mem;
+
+ if (of_address_to_resource(np, index, &res))
+ return NULL;
+
+ if (!request_mem_region(res.start, resource_size(&res), name))
+ return NULL;
+
+ mem = ioremap(res.start, resource_size(&res));
+ if (!mem)
+ release_mem_region(res.start, resource_size(&res));
+
+ return mem;
+}
+EXPORT_SYMBOL(of_io_request_and_map);
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 5f6ed6b..725b875 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -96,6 +96,8 @@ static inline struct of_pci_range *of_pci_range_parser_one(
extern int of_address_to_resource(struct device_node *dev, int index,
struct resource *r);
void __iomem *of_iomap(struct device_node *node, int index);
+void __iomem *of_io_request_and_map(struct device_node *device,
+ int index, char *name);
#else
static inline int of_address_to_resource(struct device_node *dev, int index,
struct resource *r)
@@ -107,6 +109,12 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
{
return NULL;
}
+
+static inline void __iomem *of_io_request_and_map(struct device_node *device,
+ int index, char *name)
+{
+ return NULL;
+}
#endif
#if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists