Commit 38eb1dbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents db4fd9c5 cdaa8cf3

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
@@ -7007,6 +7007,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
@@ -796,7 +796,7 @@ 
		};



		ocp2scp0: ocp2scp@483a8000 {

			compatible = "ti,omap-ocp2scp";

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

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -815,7 +815,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>;

	};

};
@@ -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>;

			};

		};

       };

};

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+6 −0
Original line number Diff line number Diff line
@@ -167,7 +167,13 @@ 


			macb1: ethernet@f802c000 {

				phy-mode = "rmii";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "okay";



				ethernet-phy@1 {

					reg = <0x1>;

				};

			};



			dbgu: serial@ffffee00 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE