From: Grant Likely <grant.likely@secretlab.ca>
To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
devicetree-discuss@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Thomas Gleixner <tglx@linutronix.de>,
Milton Miller <miltonm@bga.com>,
Rob Herring <rob.herring@calxeda.com>
Subject: [PATCH v5 13/27] of/address: add empty static inlines for !CONFIG_OF
Date: Thu, 16 Feb 2012 02:09:14 -0700 [thread overview]
Message-ID: <1329383368-12122-14-git-send-email-grant.likely@secretlab.ca> (raw)
In-Reply-To: <1329383368-12122-1-git-send-email-grant.likely@secretlab.ca>
As the title says, this patch adds empty implementations for the address
translation functions so that they can be used when CONFIG_OF is disabled.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
---
include/linux/of_address.h | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 3118623..01b925a 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -4,6 +4,7 @@
#include <linux/errno.h>
#include <linux/of.h>
+#ifdef CONFIG_OF_ADDRESS
extern u64 of_translate_address(struct device_node *np, const __be32 *addr);
extern int of_address_to_resource(struct device_node *dev, int index,
struct resource *r);
@@ -25,12 +26,37 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }
#define pci_address_to_pio pci_address_to_pio
#endif
-#ifdef CONFIG_PCI
+#else /* CONFIG_OF_ADDRESS */
+static inline int of_address_to_resource(struct device_node *dev, int index,
+ struct resource *r)
+{
+ return -EINVAL;
+}
+static inline struct device_node *of_find_matching_node_by_address(
+ struct device_node *from,
+ const struct of_device_id *matches,
+ u64 base_address)
+{
+ return NULL;
+}
+static inline void __iomem *of_iomap(struct device_node *device, int index)
+{
+ return NULL;
+}
+static inline const u32 *of_get_address(struct device_node *dev, int index,
+ u64 *size, unsigned int *flags)
+{
+ return NULL;
+}
+#endif /* CONFIG_OF_ADDRESS */
+
+
+#if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,
u64 *size, unsigned int *flags);
extern int of_pci_address_to_resource(struct device_node *dev, int bar,
struct resource *r);
-#else /* CONFIG_PCI */
+#else /* CONFIG_OF_ADDRESS && CONFIG_PCI */
static inline int of_pci_address_to_resource(struct device_node *dev, int bar,
struct resource *r)
{
@@ -42,8 +68,7 @@ static inline const __be32 *of_get_pci_address(struct device_node *dev,
{
return NULL;
}
-#endif /* CONFIG_PCI */
-
+#endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */
#endif /* __OF_ADDRESS_H */
--
1.7.9
next prev parent reply other threads:[~2012-02-16 9:09 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-16 9:09 [PATCH v5 00/27] irq_domain generalization and rework Grant Likely
2012-02-16 9:09 ` [PATCH v5 01/27] irq_domain: add documentation and MAINTAINERS entry Grant Likely
2012-02-16 9:09 ` [PATCH v5 02/27] irq_domain: Be less verbose Grant Likely
2012-02-16 9:09 ` [PATCH v5 03/27] irq_domain: Make irq_domain structure match powerpc's irq_host Grant Likely
2012-02-16 9:09 ` [PATCH v5 04/27] irq_domain: convert microblaze from irq_host to irq_domain Grant Likely
2012-02-16 9:09 ` [PATCH v5 05/27] irq_domain/powerpc: Use common irq_domain structure instead of irq_host Grant Likely
2012-02-16 9:09 ` [PATCH v5 06/27] irq_domain/powerpc: eliminate irq_map; use irq_alloc_desc() instead Grant Likely
2012-04-01 21:27 ` Andreas Schwab
2012-04-02 4:21 ` Benjamin Herrenschmidt
2012-04-02 10:31 ` Andreas Schwab
2012-04-02 21:11 ` Benjamin Herrenschmidt
[not found] ` <1333401070.30734.55.camel__46349.1482347765$1333401169$gmane$org@pasglop>
2012-04-05 12:35 ` Andreas Schwab
2012-04-02 16:29 ` Andreas Schwab
2012-04-02 20:28 ` Grant Likely
2012-04-02 21:55 ` Russell King - ARM Linux
2012-04-02 22:33 ` Benjamin Herrenschmidt
2012-04-02 22:52 ` Russell King - ARM Linux
2012-04-02 23:38 ` Benjamin Herrenschmidt
2012-04-06 11:51 ` Andreas Schwab
2012-04-06 23:37 ` Benjamin Herrenschmidt
2012-04-07 12:27 ` Andreas Schwab
2012-04-11 1:13 ` Benjamin Herrenschmidt
2012-04-11 1:33 ` Benjamin Herrenschmidt
2012-04-11 5:29 ` Benjamin Herrenschmidt
2012-04-11 20:57 ` Grant Likely
2012-04-11 21:37 ` Benjamin Herrenschmidt
2012-04-11 21:47 ` Thomas Gleixner
2012-04-19 18:42 ` Grant Likely
2012-04-03 8:23 ` Thomas Gleixner
2012-04-03 8:20 ` Thomas Gleixner
2012-04-03 12:11 ` Andreas Schwab
2012-04-03 21:43 ` Benjamin Herrenschmidt
2012-04-04 12:51 ` Andreas Schwab
2012-04-04 15:40 ` Grant Likely
2012-04-05 10:51 ` Andreas Schwab
2012-04-06 11:12 ` Thomas Gleixner
2012-04-05 22:10 ` Andreas Schwab
2012-04-06 11:17 ` Thomas Gleixner
2012-04-06 11:25 ` Andreas Schwab
2012-04-06 11:28 ` Thomas Gleixner
2012-04-07 1:29 ` Grant Likely
2012-04-02 20:52 ` Thomas Gleixner
2012-04-02 21:20 ` Benjamin Herrenschmidt
2012-04-02 21:27 ` Thomas Gleixner
2012-04-02 22:32 ` Benjamin Herrenschmidt
2012-04-02 21:22 ` Andreas Schwab
2012-04-03 0:37 ` Benjamin Herrenschmidt
2012-02-16 9:09 ` [PATCH v5 07/27] irq_domain/powerpc: Eliminate virq_is_host() Grant Likely
2012-02-16 9:09 ` [PATCH v5 08/27] irq_domain: Move irq_domain code from powerpc to kernel/irq Grant Likely
2012-02-16 13:23 ` Grant Likely
2012-02-16 17:38 ` Cousson, Benoit
2012-02-16 17:52 ` Cousson, Benoit
2012-02-16 9:09 ` [PATCH v5 09/27] irq_domain: remove NO_IRQ from irq domain code Grant Likely
2012-02-16 9:09 ` [PATCH v5 10/27] irq_domain: Remove references to old irq_host names Grant Likely
2012-02-16 9:09 ` [PATCH v5 11/27] irq_domain: Replace irq_alloc_host() with revmap-specific initializers Grant Likely
2012-02-16 9:09 ` [PATCH v5 12/27] irq_domain: Add support for base irq and hwirq in legacy mappings Grant Likely
2012-02-16 9:09 ` Grant Likely [this message]
2012-02-16 9:09 ` [PATCH v5 14/27] mfd: twl-core.c: Fix the number of interrupts managed by twl4030 Grant Likely
2012-02-16 9:09 ` [PATCH v5 15/27] irq_domain: Remove 'new' irq_domain in favour of the ppc one Grant Likely
2012-02-16 9:09 ` [PATCH v5 16/27] irq_domain: Remove irq_domain_add_simple() Grant Likely
2012-02-16 9:09 ` [PATCH v5 17/27] irq_domain: Create common xlate functions that device drivers can use Grant Likely
2012-02-16 9:09 ` [PATCH v5 18/27] irq_domain: constify irq_domain_ops Grant Likely
2012-02-16 9:09 ` [PATCH v5 19/27] irq_domain/c6x: Convert c6x to use generic irq_domain support Grant Likely
2012-02-16 9:09 ` [PATCH v5 20/27] irq_domain/c6x: constify irq_domain structures Grant Likely
2012-02-21 15:47 ` Mark Salter
2012-02-16 9:09 ` [PATCH v5 21/27] irq_domain/c6x: Use library of xlate functions Grant Likely
2012-02-21 15:48 ` Mark Salter
2012-02-16 9:09 ` [PATCH v5 22/27] irq_domain/powerpc: constify irq_domain_ops Grant Likely
2012-02-16 9:09 ` [PATCH v5 23/27] irq_domain/powerpc: Replace custom xlate functions with library functions Grant Likely
2012-02-16 9:09 ` [PATCH v5 24/27] irq_domain/microblaze: Convert microblaze to use irq_domains Grant Likely
2012-02-16 9:09 ` [PATCH v5 25/27] irq_domain: remove "hint" when allocating irq numbers Grant Likely
2012-02-16 9:09 ` [PATCH v5 26/27] irq_domain: mostly eliminate slow-path revmap lookups Grant Likely
2012-02-16 9:09 ` [PATCH v5 27/27] irq_domain: For NOMAP revmap, allow users to specify the largest usable virq Grant Likely
2012-02-16 22:52 ` [PATCH v5 00/27] irq_domain generalization and rework Andrew Morton
2012-02-16 23:26 ` Russell King - ARM Linux
2012-02-17 18:05 ` Sam Ravnborg
2012-02-17 17:42 ` Cousson, Benoit
2012-02-17 17:55 ` Russell King - ARM Linux
2012-02-21 14:51 ` Cousson, Benoit
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=1329383368-12122-14-git-send-email-grant.likely@secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=benh@kernel.crashing.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miltonm@bga.com \
--cc=rob.herring@calxeda.com \
--cc=tglx@linutronix.de \
/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).