Skip to contentSkip to conversation

dt: disable self-tests for !OF_IRQ

PATCH In review Rob Herring 2 participants 3 messages Nov 7, 2013 – Nov 8, 2013 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dt: disable self-tests for !OF_IRQ

From: Rob Herring <rob.herring-bsGFqQB8/[email protected]>

Fix OF selftest compile on sparc which does not enable OF_IRQ.

drivers/of/selftest.c:177: undefined reference to of_irq_parse_one' drivers/of/selftest.c:197: undefined reference to of_irq_parse_one' drivers/of/selftest.c:248: undefined reference to `of_irq_parse_one'

---
 drivers/of/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/of/Kconfig +1 -0
index 9d2009a..9b28f8b 100644
@@ -17,6 +17,7 @@ config PROC_DEVICETREE
 
 config OF_SELFTEST
 	bool "Device Tree Runtime self tests"
+	depends on OF_IRQ
 	help
 	  This option builds in test cases for the device tree infrastructure
 	  that are executed one at boot time, and the results dumped to the
Signature · 6 lines
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

PATCH 2/2 dt/irq: add empty of_irq_count for !OF_IRQ

From: Rob Herring <rob.herring-bsGFqQB8/[email protected]>

Add an empty version of of_irq_count for !OF_IRQ. This fixes build error on sparc in linux-next:

drivers/gpio/gpio-bcm-kona.c:542: undefined reference to `of_irq_count'

---
 include/linux/of_irq.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
include/linux/of_irq.h +9 -1
index c0d6dfe..3f23b44 100644
@@ -37,12 +37,20 @@ extern int of_irq_parse_one(struct device_node *device, int index,
 extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data);
 extern int of_irq_to_resource(struct device_node *dev, int index,
 			      struct resource *r);
-extern int of_irq_count(struct device_node *dev);
 extern int of_irq_to_resource_table(struct device_node *dev,
 		struct resource *res, int nr_irqs);
 
 extern void of_irq_init(const struct of_device_id *matches);
 
+#ifdef CONFIG_OF_IRQ
+extern int of_irq_count(struct device_node *dev);
+#else
+static inline int of_irq_count(struct device_node *dev)
+{
+	return 0;
+}
+#endif
+
 #if defined(CONFIG_OF)
 /*
  * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
Signature · 6 lines
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Acked-by on v1 1/2
#2 lore raw
In reply to Rob Herring
Quoted 9 lines · Rob Herring

From: Rob Herring <rob.herring-bsGFqQB8/[email protected]>

Fix OF selftest compile on sparc which does not enable OF_IRQ.

drivers/of/selftest.c:177: undefined reference to of_irq_parse_one' drivers/of/selftest.c:197: undefined reference to of_irq_parse_one' drivers/of/selftest.c:248: undefined reference to `of_irq_parse_one'

g.

Quoted 19 lines
---
 drivers/of/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/of/Kconfig +1 -0
index 9d2009a..9b28f8b 100644
@@ -17,6 +17,7 @@ config PROC_DEVICETREE
 
 config OF_SELFTEST
 	bool "Device Tree Runtime self tests"
+	depends on OF_IRQ
 	help
 	  This option builds in test cases for the device tree infrastructure
 	  that are executed one at boot time, and the results dumped to the
Signature · 1 line
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html