Pull DT fixes from Rob Herring: "I think this should be all for 4.4: - Fix incorrect warning about overlapping memory regions - Export of_irq_find_parent again which was made static in 4.4, but has users pending for 4.5. - Fix of_msi_map_rid declaration location - Fix re-entrancy for of_fdt_unflatten_tree - Clean-up of phys_addr_t printks" * tag 'devicetree-fixes-for-4.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: of/irq: move of_msi_map_rid declaration to the correct ifdef section of/irq: Export of_irq_find_parent again of/fdt: Add mutex protection for calls to __unflatten_device_tree() of/address: fix typo in comment block of of_translate_one() of: do not use 0x in front of %pa of: Fix comparison of reserved memory regions
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -46,12 +46,14 @@ extern int of_irq_get(struct device_node *dev, int index); · 45 unmodified lines | ||
| 46 | 46 | extern int of_irq_get_byname(struct device_node *dev, const char *name); |
| 47 | 47 | extern int of_irq_to_resource_table(struct device_node *dev, |
| 48 | 48 | struct resource *res, int nr_irqs); |
| 49 | +extern struct device_node *of_irq_find_parent(struct device_node *child); | |
| 49 | 50 | extern struct irq_domain *of_msi_get_domain(struct device *dev, |
| 50 | 51 | struct device_node *np, |
| 51 | 52 | enum irq_domain_bus_token token); |
| 52 | 53 | extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev, |
| 53 | 54 | u32 rid); |
| 54 | 55 | extern void of_msi_configure(struct device *dev, struct device_node *np); |
| 56 | +u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in); | |
| 55 | 57 | #else |
| 56 | 58 | static inline int of_irq_count(struct device_node *dev) |
| 57 | 59 | { |
| @@ -70,6 +72,11 @@ static inline int of_irq_to_resource_table(struct device_node *dev, · 12 unmodified lines | ||
| 70 | 72 | { |
| 71 | 73 | return 0; |
| 72 | 74 | } |
| 75 | +static inline void *of_irq_find_parent(struct device_node *child) | |
| 76 | +{ | |
| 77 | + return NULL; | |
| 78 | +} | |
| 79 | + | |
| 73 | 80 | static inline struct irq_domain *of_msi_get_domain(struct device *dev, |
| 74 | 81 | struct device_node *np, |
| 75 | 82 | enum irq_domain_bus_token token) |
| @@ -84,6 +91,11 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev · 8 unmodified lines | ||
| 84 | 91 | static inline void of_msi_configure(struct device *dev, struct device_node *np) |
| 85 | 92 | { |
| 86 | 93 | } |
| 94 | +static inline u32 of_msi_map_rid(struct device *dev, | |
| 95 | + struct device_node *msi_np, u32 rid_in) | |
| 96 | +{ | |
| 97 | + return rid_in; | |
| 98 | +} | |
| 87 | 99 | #endif |
| 88 | 100 | |
| 89 | 101 | #if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC) |
| @@ -93,7 +105,6 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) · 3 unmodified lines | ||
| 93 | 105 | * so declare it here regardless of the CONFIG_OF_IRQ setting. |
| 94 | 106 | */ |
| 95 | 107 | extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); |
| 96 | −u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in); | |
| 97 | 108 | |
| 98 | 109 | #else /* !CONFIG_OF && !CONFIG_SPARC */ |
| 99 | 110 | static inline unsigned int irq_of_parse_and_map(struct device_node *dev, |
| @@ -101,12 +112,6 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, · 1 unmodified line | ||
| 101 | 112 | { |
| 102 | 113 | return 0; |
| 103 | 114 | } |
| 104 | − | |
| 105 | −static inline u32 of_msi_map_rid(struct device *dev, | |
| 106 | − struct device_node *msi_np, u32 rid_in) | |
| 107 | −{ | |
| 108 | − return rid_in; | |
| 109 | −} | |
| 110 | 115 | #endif /* !CONFIG_OF */ |
| 111 | 116 | |
| 112 | 117 | #endif /* __OF_IRQ_H */ |