Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Here's the usual "low-priority fixes that didn't make it into the last
  few -rcs, with a twist: We had a fixes pull request that I didn't send
  in time to get into 4.0, so we'll send some of them to Greg for
  -stable as well.

  Contents here is as usual not all that controversial:

   - a handful of randconfig fixes from Arnd, in particular for older
     Samsung platforms

   - Exynos fixes, !SMP building, DTS updates for MMC and lid switch

   - Kbuild fix to create output subdirectory for DTB files

   - misc minor fixes for OMAP"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
  ARM: at91/dt: sama5d3 xplained: add phy address for macb1
  kbuild: Create directory for target DTB
  ARM: mvebu: Disable CPU Idle on Armada 38x
  ARM: DRA7: Enable Cortex A15 errata 798181
  ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
  ARM: dts: DRA7: Add bandgap and related thermal nodes
  bus: ocp2scp: SYNC2 value should be changed to 0x6
  ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
  ARM: OMAP2+: remove superfluous NULL pointer check
  ARM: EXYNOS: Fix build breakage cpuidle on !SMP
  ARM: dts: fix lid and power pin-functions for exynos5250-spring
  ARM: dts: fix mmc node updates for exynos5250-spring
  ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
  MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
  ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
  ARM: cns3xxx: don't export static symbol
  ARM: S3C24XX: avoid a Kconfig warning
  ARM: S3C24XX: fix header file inclusions
  ARM: S3C24XX: fix building without PM_SLEEP
  ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
  ...

1 files changed, 49 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index bd48dba16748..e580f4ffbde0 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -87,6 +87,7 @@
                 gpios =  <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>;
                 gpio-fan,speed-map = <0     0>,
                                      <13000 1>;
+                #cooling-cells = <2>;
         };
 
         extcon_usb1: extcon_usb1 {
@@ -442,6 +443,7 @@
                 pinctrl-0 = <&tmp102_pins_default>;
                 interrupt-parent = <&gpio7>;
                 interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
+                #thermal-sensor-cells = <1>;
         };
 };
 
@@ -551,3 +553,50 @@
 &usb2 {
         dr_mode = "peripheral";
 };
+
+&cpu_trips {
+        cpu_alert1: cpu_alert1 {
+                temperature = <50000>; /* millicelsius */
+                hysteresis = <2000>; /* millicelsius */
+                type = "active";
+        };
+};
+
+&cpu_cooling_maps {
+        map1 {
+                trip = <&cpu_alert1>;
+                cooling-device = <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+        };
+};
+
+&thermal_zones {
+        board_thermal: board_thermal {
+                polling-delay-passive = <1250>; /* milliseconds */
+                polling-delay = <1500>; /* milliseconds */
+
+                                /* sensor       ID */
+                thermal-sensors = <&tmp102     0>;
+
+                board_trips: trips {
+                        board_alert0: board_alert {
+                                temperature = <40000>; /* millicelsius */
+                                hysteresis = <2000>; /* millicelsius */
+                                type = "active";
+                        };
+
+                        board_crit: board_crit {
+                                temperature = <105000>; /* millicelsius */
+                                hysteresis = <0>; /* millicelsius */
+                                type = "critical";
+                        };
+                };
+
+                board_cooling_maps: cooling-maps {
+                        map0 {
+                                trip = <&board_alert0>;
+                                cooling-device =
+                                  <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                        };
+                };
+       };
+};