Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dts: DRA7: Add PMU nodes
  ARM: dts: OMAP5: add pmu node
  ti_config_fragments/baseport.cfg: Fix a comment using unsupported format

Conflicts:
	arch/arm/boot/dts/dra72x.dtsi
	arch/arm/boot/dts/dra74x.dtsi

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/dra72x.dtsi
index 485589f,e5a3d23..e707009
--- 1/arch/arm/boot/dts/dra72x.dtsi
--- 2/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@@ -38,7 -23,8 +38,12 @@@
                };
        };
  
 +      thermal-zones {
 +              #include "omap4-cpu-thermal.dtsi"
 +      };
++
+       pmu {
+               compatible = "arm,cortex-a15-pmu";
+               interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>;
+       };
  };

diff --cc arch/arm/boot/dts/dra74x.dtsi
index 79b5e79,3be544c..6a24d83
--- 1/arch/arm/boot/dts/dra74x.dtsi
--- 2/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@@ -43,29 -39,9 +43,35 @@@
                };
        };
  
 +      ocp {
 +              omap_dwc3_4@48940000 {
 +                      compatible = "ti,dwc3";
 +                      ti,hwmods = "usb_otg_ss4";
 +                      reg = <0x48940000 0x10000>;
 +                      interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      utmi-mode = <2>;
 +                      ranges;
 +                      status = "disabled";
 +                      usb4: usb@48950000 {
 +                              compatible = "snps,dwc3";
 +                              reg = <0x48950000 0x17000>;
 +                              interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
 +                              tx-fifo-resize;
 +                              maximum-speed = "high-speed";
 +                              dr_mode = "otg";
 +                      };
 +              };
 +      };
 +
 +      thermal-zones {
 +              #include "omap4-cpu-thermal.dtsi"
 +      };
++
+       pmu {
+               compatible = "arm,cortex-a15-pmu";
+               interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI DIRECT_IRQ(132) IRQ_TYPE_LEVEL_HIGH>;
+       };
  };

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