aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-24 11:46:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-24 11:46:18 -0400
commitd56a669ca59c37ed0a7282a251b2f2f22533343a (patch)
treecef7bd4699754057474cc96430864f690f1786e0 /include
parent836ee4874e201a5907f9658fb2bf3527dd952d30 (diff)
parent04fca0e390e80d88c2f959aef86e0bb7f26fea01 (diff)
Merge tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull second batch of devicetree updates from Rob Herring: "As Grant mentioned in the first devicetree pull request, here is the 2nd batch of DT changes for 4.1. The main remaining item here is the endianness bindings and related 8250 driver support. - DT endianness specification bindings - big-endian 8250 serial support - DT overlay unittest updates - various DT doc updates - compile fixes for OF_IRQ=n" * tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: frv: add io{read,write}{16,32}be functions mn10300: add io{read,write}{16,32}be functions Documentation: DT bindings: add doc for Altera's SoCFPGA platform of: base: improve of_get_next_child() kernel-doc Doc: dt: arch_timer: discourage clock-frequency use of: unittest: overlay: Keep track of created overlays of/fdt: fix allocation size for device node path serial: of_serial: Support big-endian register accesses serial: 8250: Add support for big-endian MMIO accesses of: Document {little,big,native}-endian bindings of/fdt: Add endianness helper function for early init code of: Add helper function to check MMIO register endianness of/fdt: Remove "reg" data prints from early_init_dt_scan_memory of: add vendor prefix for Artesyn of: Add dummy of_irq_to_resource_table() for IRQ_OF=n of: OF_IRQ should depend on IRQ_DOMAIN
Diffstat (limited to 'include')
-rw-r--r--include/linux/of.h6
-rw-r--r--include/linux/of_fdt.h2
-rw-r--r--include/linux/of_irq.h9
3 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index 5f124f685e07..ddeaae6d2083 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -305,6 +305,7 @@ extern int of_property_read_string_helper(struct device_node *np,
305extern int of_device_is_compatible(const struct device_node *device, 305extern int of_device_is_compatible(const struct device_node *device,
306 const char *); 306 const char *);
307extern bool of_device_is_available(const struct device_node *device); 307extern bool of_device_is_available(const struct device_node *device);
308extern bool of_device_is_big_endian(const struct device_node *device);
308extern const void *of_get_property(const struct device_node *node, 309extern const void *of_get_property(const struct device_node *node,
309 const char *name, 310 const char *name,
310 int *lenp); 311 int *lenp);
@@ -467,6 +468,11 @@ static inline bool of_device_is_available(const struct device_node *device)
467 return false; 468 return false;
468} 469}
469 470
471static inline bool of_device_is_big_endian(const struct device_node *device)
472{
473 return false;
474}
475
470static inline struct property *of_find_property(const struct device_node *np, 476static inline struct property *of_find_property(const struct device_node *np,
471 const char *name, 477 const char *name,
472 int *lenp) 478 int *lenp)
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 0ff360d5b3b3..587ee507965d 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -33,6 +33,8 @@ extern void *of_fdt_get_property(const void *blob,
33extern int of_fdt_is_compatible(const void *blob, 33extern int of_fdt_is_compatible(const void *blob,
34 unsigned long node, 34 unsigned long node,
35 const char *compat); 35 const char *compat);
36extern bool of_fdt_is_big_endian(const void *blob,
37 unsigned long node);
36extern int of_fdt_match(const void *blob, unsigned long node, 38extern int of_fdt_match(const void *blob, unsigned long node,
37 const char *const *compat); 39 const char *const *compat);
38extern void of_fdt_unflatten_tree(unsigned long *blob, 40extern void of_fdt_unflatten_tree(unsigned long *blob,
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index bfec136a6d1e..d884929a7747 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -37,8 +37,6 @@ extern int of_irq_parse_one(struct device_node *device, int index,
37extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data); 37extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data);
38extern int of_irq_to_resource(struct device_node *dev, int index, 38extern int of_irq_to_resource(struct device_node *dev, int index,
39 struct resource *r); 39 struct resource *r);
40extern int of_irq_to_resource_table(struct device_node *dev,
41 struct resource *res, int nr_irqs);
42 40
43extern void of_irq_init(const struct of_device_id *matches); 41extern void of_irq_init(const struct of_device_id *matches);
44 42
@@ -46,6 +44,8 @@ extern void of_irq_init(const struct of_device_id *matches);
46extern int of_irq_count(struct device_node *dev); 44extern int of_irq_count(struct device_node *dev);
47extern int of_irq_get(struct device_node *dev, int index); 45extern int of_irq_get(struct device_node *dev, int index);
48extern int of_irq_get_byname(struct device_node *dev, const char *name); 46extern int of_irq_get_byname(struct device_node *dev, const char *name);
47extern int of_irq_to_resource_table(struct device_node *dev,
48 struct resource *res, int nr_irqs);
49#else 49#else
50static inline int of_irq_count(struct device_node *dev) 50static inline int of_irq_count(struct device_node *dev)
51{ 51{
@@ -59,6 +59,11 @@ static inline int of_irq_get_byname(struct device_node *dev, const char *name)
59{ 59{
60 return 0; 60 return 0;
61} 61}
62static inline int of_irq_to_resource_table(struct device_node *dev,
63 struct resource *res, int nr_irqs)
64{
65 return 0;
66}
62#endif 67#endif
63 68
64#if defined(CONFIG_OF) 69#if defined(CONFIG_OF)