Merge tag 'omap-for-v4.1/fixes-0' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap non-urgent fixes for v4.1" from Tony Lindgren:

Fixes for omaps that were not considered urgent enough for the -rc cycle.

This is mostly to enable errata 798181 and thermal support for dra7,
configure ocp2scp for am437x, remove dead code for OMAP4_ERRATA_I688
and fix build warnings for omap1510 only config.

* tag 'omap-for-v4.1/fixes-0' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  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: 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

Signed-off-by: Olof Johansson <olof@lixom.net>

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 6463f9ef2b54..31497a45afb0 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>;
         };
 };
 
@@ -552,3 +554,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>;
+                        };
+                };
+       };
+};