Merge remote-tracking branch 'dt-rh/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:16:09 +0000 (13:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:16:09 +0000 (13:16 +1100)
14 files changed:
1  2 
Documentation/devicetree/bindings/display/msm/hdmi.txt
Documentation/devicetree/bindings/display/msm/mdp.txt
Documentation/devicetree/bindings/display/renesas,du.txt
Documentation/devicetree/bindings/display/ssd1307fb.txt
Documentation/devicetree/bindings/input/gpio-keys-polled.txt
Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt
Documentation/devicetree/bindings/mmc/mmc.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile
arch/arm64/boot/dts/Makefile
drivers/of/irq.c
drivers/of/of_pci.c
include/linux/of_irq.h

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -46,11 -46,7 +46,12 @@@ extern int of_irq_get(struct device_nod
  extern int of_irq_get_byname(struct device_node *dev, const char *name);
  extern int of_irq_to_resource_table(struct device_node *dev,
                struct resource *res, int nr_irqs);
+ extern void of_msi_configure(struct device *dev, struct device_node *np);
 +extern struct irq_domain *of_msi_get_domain(struct device *dev,
 +                                          struct device_node *np,
 +                                          enum irq_domain_bus_token token);
 +extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
 +                                                     u32 rid);
  #else
  static inline int of_irq_count(struct device_node *dev)
  {
@@@ -69,47 -65,25 +70,43 @@@ static inline int of_irq_to_resource_ta
  {
        return 0;
  }
+ static inline void of_msi_configure(struct device *dev, struct device_node *np)
+ {
+ }
 +static inline struct irq_domain *of_msi_get_domain(struct device *dev,
 +                                                 struct device_node *np,
 +                                                 enum irq_domain_bus_token token)
 +{
 +      return NULL;
 +}
 +static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
 +                                                            u32 rid)
 +{
 +      return NULL;
 +}
  #endif
  
- #if defined(CONFIG_OF)
+ #if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC)
  /*
   * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
   * implements it differently.  However, the prototype is the same for all,
   * so declare it here regardless of the CONFIG_OF_IRQ setting.
   */
  extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
- extern struct device_node *of_irq_find_parent(struct device_node *child);
- extern void of_msi_configure(struct device *dev, struct device_node *np);
 +u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
  
- #else /* !CONFIG_OF */
+ #else /* !CONFIG_OF && !CONFIG_SPARC */
  static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
                                                int index)
  {
        return 0;
  }
- static inline void *of_irq_find_parent(struct device_node *child)
- {
-       return NULL;
- }
 +
 +static inline u32 of_msi_map_rid(struct device *dev,
 +                               struct device_node *msi_np, u32 rid_in)
 +{
 +      return rid_in;
 +}
  #endif /* !CONFIG_OF */
  
  #endif /* __OF_IRQ_H */