Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77e3c09e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.1/fixes-0' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents dc0961bc 209431ef

Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

+2 −1
Original line number Diff line number Diff line 
* OMAP OCP2SCP - ocp interface to scp interface



properties:

- compatible : Should be "ti,omap-ocp2scp"

- compatible : Should be "ti,am437x-ocp2scp" for AM437x processor

	       Should be "ti,omap-ocp2scp" for all others

- reg : Address and length of the register set for the device

- #address-cells, #size-cells : Must be present if the device has sub-nodes

- ranges : the child address space are mapped 1:1 onto the parent address space

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -6947,6 +6947,8 @@ Q: http://patchwork.kernel.org/project/linux-omap/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git

S:	Maintained

F:	arch/arm/*omap*/

F:	arch/arm/configs/omap1_defconfig

F:	arch/arm/configs/omap2plus_defconfig

F:	drivers/i2c/busses/i2c-omap.c

F:	drivers/irqchip/irq-omap-intc.c

F:	drivers/mfd/*omap*.c

arch/arm/boot/dts/am4372.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ 
		};



		ocp2scp0: ocp2scp@483a8000 {

			compatible = "ti,omap-ocp2scp";

			compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -806,7 +806,7 @@ 
		};



		ocp2scp1: ocp2scp@483e8000 {

			compatible = "ti,omap-ocp2scp";

			compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

arch/arm/boot/dts/am57xx-beagle-x15.dts

+49 −0
Original line number Diff line number Diff line
@@ -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>;

			};

		};

       };

};

arch/arm/boot/dts/dra7.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -177,6 +177,18 @@ 
			};

		};



		bandgap: bandgap@4a0021e0 {

			reg = <0x4a0021e0 0xc

				0x4a00232c 0xc

				0x4a002380 0x2c

				0x4a0023C0 0x3c

				0x4a002564 0x8

				0x4a002574 0x50>;

				compatible = "ti,dra752-bandgap";

				interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

				#thermal-sensor-cells = <1>;

		};



		cm_core_aon: cm_core_aon@4a005000 {

			compatible = "ti,dra7-cm-core-aon";

			reg = <0x4a005000 0x2000>;
@@ -1426,6 +1438,17 @@ 
			status = "disabled";

		};

	};



	thermal_zones: thermal-zones {

		#include "omap4-cpu-thermal.dtsi"

		#include "omap5-gpu-thermal.dtsi"

		#include "omap5-core-thermal.dtsi"

	};



};



&cpu_thermal {

	polling-delay = <500>; /* milliseconds */

};



/include/ "dra7xx-clocks.dtsi"