Merge branch 'devicetree/merge' into devicetree/next

Main node required properties:

- compatible : should be one of:

	"arm,cortex-a15-gic"

	"arm,cortex-a9-gic"

	"arm,cortex-a7-gic"

	"arm,arm11mp-gic"

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Specifies the number of cells needed to encode an

  the GIC cpu interface register base and size.

Optional

- interrupts	: Interrupt source of the parent interrupt controller. Only

  present on secondary GICs.

- interrupts	: Interrupt source of the parent interrupt controller on

  secondary GICs, or VGIC maintainance interrupt on primary GIC (see

  below).

- cpu-offset	: per-cpu offset within the distributor and cpu interface

  regions, used when the GIC doesn't have banked registers. The offset is

		      <0xfff10100 0x100>;

	};

* GIC virtualization extensions (VGIC)

For ARM cores that support the virtualization extensions, additional

properties must be described (they only exist if the GIC is the

primary interrupt controller).

Required properties:

- reg : Additional regions specifying the base physical address and

  size of the VGIC registers. The first additional region is the GIC

  virtual interface control register base and size. The 2nd additional

  region is the GIC virtual cpu interface register base and size.

- interrupts : VGIC maintainance interrupt.

Example:

	interrupt-controller@2c001000 {

		compatible = "arm,cortex-a15-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		reg = <0x2c001000 0x1000>,

		      <0x2c002000 0x1000>,

		      <0x2c004000 0x2000>,

		      <0x2c006000 0x2000>;

		interrupts = <1 9 0xf04>;

	};

#include <linux/of.h>

/*

 * irq_of_parse_and_map() is used ba all OF enabled platforms; but 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 void of_irq_init(const struct of_device_id *matches);

#endif /* CONFIG_OF_IRQ */

#endif /* CONFIG_OF */

#else /* !CONFIG_OF */

static inline unsigned int irq_of_parse_and_map(struct device_node *dev,

						int index)

{

	return 0;

}

#endif /* !CONFIG_OF */

#endif /* __OF_IRQ_H */