Merge remote-tracking branch 'irqchip/irqchip/for-next'

Conflicts:
	arch/arm/mach-exynos/suspend.c

diff --cc Documentation/devicetree/bindings/arm/gic.txt
Simple merge

diff --cc Documentation/devicetree/bindings/arm/samsung/pmu.txt
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
Simple merge

diff --cc arch/arm/boot/dts/dra7-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
index 794de7ddcf490f05f90a9c029f921c0f2620e9fc,c65eea095afa24d38c500ad6ea0f130651f6aa0e..5332b57b4950dbd61fac6ef7cb112c4cd44cffa7
--- 1/arch/arm/boot/dts/dra7.dtsi
--- 2/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@@ -91,104 -99,20 +99,104 @@@
                ti,hwmods = "l3_main_1", "l3_main_2";
                reg = <0x44000000 0x1000000>,
                      <0x45000000 0x1000>;
-               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI DIRECT_IRQ(10) IRQ_TYPE_LEVEL_HIGH>;
+               interrupts-extended = <&crossbar_mpu GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&wakeupgen GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  
 -              prm: prm@4ae06000 {
 -                      compatible = "ti,dra7-prm";
 -                      reg = <0x4ae06000 0x3000>;
 -                      interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
 +              l4_cfg: l4@4a000000 {
 +                      compatible = "ti,dra7-l4-cfg", "simple-bus";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges = <0 0x4a000000 0x22c000>;
  
 -                      prm_clocks: clocks {
 +                      scm: scm@2000 {
 +                              compatible = "ti,dra7-scm-core", "simple-bus";
 +                              reg = <0x2000 0x2000>;
                                #address-cells = <1>;
 -                              #size-cells = <0>;
 +                              #size-cells = <1>;
 +                              ranges = <0 0x2000 0x2000>;
 +
 +                              scm_conf: scm_conf@0 {
 +                                      compatible = "syscon";
 +                                      reg = <0x0 0x1400>;
 +                                      #address-cells = <1>;
 +                                      #size-cells = <1>;
 +
 +                                      pbias_regulator: pbias_regulator {
 +                                              compatible = "ti,pbias-omap";
 +                                              reg = <0xe00 0x4>;
 +                                              syscon = <&scm_conf>;
 +                                              pbias_mmc_reg: pbias_mmc_omap5 {
 +                                                      regulator-name = "pbias_mmc_omap5";
 +                                                      regulator-min-microvolt = <1800000>;
 +                                                      regulator-max-microvolt = <3000000>;
 +                                              };
 +                                      };
 +                              };
 +
 +                              dra7_pmx_core: pinmux@1400 {
 +                                      compatible = "ti,dra7-padconf",
 +                                                   "pinctrl-single";
 +                                      reg = <0x1400 0x0464>;
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      #interrupt-cells = <1>;
 +                                      interrupt-controller;
 +                                      pinctrl-single,register-width = <32>;
 +                                      pinctrl-single,function-mask = <0x3fffffff>;
 +                              };
 +                      };
 +
 +                      cm_core_aon: cm_core_aon@5000 {
 +                              compatible = "ti,dra7-cm-core-aon";
 +                              reg = <0x5000 0x2000>;
 +
 +                              cm_core_aon_clocks: clocks {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                              };
 +
 +                              cm_core_aon_clockdomains: clockdomains {
 +                              };
 +                      };
 +
 +                      cm_core: cm_core@8000 {
 +                              compatible = "ti,dra7-cm-core";
 +                              reg = <0x8000 0x3000>;
 +
 +                              cm_core_clocks: clocks {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                              };
 +
 +                              cm_core_clockdomains: clockdomains {
 +                              };
                        };
 +              };
  
 -                      prm_clockdomains: clockdomains {
 +              l4_wkup: l4@4ae00000 {
 +                      compatible = "ti,dra7-l4-wkup", "simple-bus";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges = <0 0x4ae00000 0x3f000>;
 +
 +                      counter32k: counter@4000 {
 +                              compatible = "ti,omap-counter32k";
 +                              reg = <0x4000 0x40>;
 +                              ti,hwmods = "counter_32k";
 +                      };
 +
 +                      prm: prm@6000 {
 +                              compatible = "ti,dra7-prm";
 +                              reg = <0x6000 0x3000>;
 +                              interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              prm_clocks: clocks {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                              };
 +
 +                              prm_clockdomains: clockdomains {
 +                              };
                        };
                };
  

diff --cc arch/arm/boot/dts/dra72-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/dra72x.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra74x.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos3250.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5420.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap4-panda-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap4-sdp.dts
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra124.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/exynos.c
Simple merge

diff --cc arch/arm/mach-exynos/suspend.c
Simple merge

diff --cc arch/arm/mach-omap2/omap4-common.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra.c
Simple merge

diff --cc drivers/irqchip/Kconfig
Simple merge

diff --cc drivers/irqchip/Makefile
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge