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

Commit b1ee27d4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-1' of... 

Merge tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "Samsung DT updates for v4.4" from Kukjin Kim:

- New board support
  : add exynos5250-snow-rev5 DT file to support Snow Rev5+ board
  : add exynos5422-odroidxu4 DT file to support Odroid XU4 board
  : split exynos5422-odroidxu3-audio DT file from odroidxu3-common

- USE GPIO constants for flags cells for exynos boards
- fix cpu compatible value to 'arm926ej-s' for s3c2416

- add DMA support for serial ports for exynos4
- add suspend opp for exynos4412
- remove regulator-compatible usage for exynos4412-trats2

- enable EC vboot context support for Peach boards
- move display-timings node to DP for exynos5250-arndale, smdk5250 and smdk5420

- for exynos4412-odroid/odroidu3
  : unify voltage regulator style and
  : remove redundant pinctrl settings
  : add pwm-fan node and use it as a colling device

- for exynos5422-odroidxu3
  : fix power off method and LEDs

- dt-bindings
  : grounded AC0KB pin on S2MPS11
  : entry how to use PWM FAN as a cooling device

* tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (22 commits)
  ARM: dts: Use GPIO constants for flags cells in exynos5440 boards
  ARM: dts: Use GPIO constants for flags cells in exynos5420/5422/5800 boards
  ARM: dts: Use GPIO constants for flags cells in exynos4412 boards
  ARM: dts: Use GPIO constants for flags cells in exynos4120 boards
  ARM: dts: Use GPIO constants for flags cells in exynos3250 boards
  ARM: dts: Enable EC vboot context support on Peach boards
  ARM: dts: Remove regulator-compatible usage in exynos4412-trats2
  ARM: dts: Move display-timings node from fimd to dp in exynos5250-arndale, smdk5250 and smdk5420
  ARM: dts: Add Exynos5250 Snow Rev5+ support on exynos5250-snow-rev5
  ARM: dts: Unify voltage regulator style in exynos4412-odroid
  ARM: dts: Remove redundant pinctrl settings in exynos4412-odroid
  ARM: dts: Fix cpu compatible value for s3c2416
  ARM: dts: Add support Odroid XU4 board for exynos5422-odroidxu4
  ARM: dts: Split audio configuration to separate exynos5422-odroidxu3-audio
  ARM: dts: Fix power off method for exynos5422-odroidxu3-common
  dt-bindings: Document grounded ACOKB pin on S2MPS11
  ARM: dts: use pwm-fan device as a cooling device for exynos4412-odroidu3
  ARM: dts: Add pwm-fan node for exynos4412-odroidu3
  dt-bindings: Documentation entry to explain how to use PWM FAN as a cooling device
  ARM: dts: add suspend opp to exynos4412
  ...
parents 8ee57b81 df829b06

Documentation/devicetree/bindings/hwmon/pwm-fan.txt

+27 −2
Original line number Diff line number Diff line
@@ -3,10 +3,35 @@ Bindings for a fan connected to the PWM lines 
Required properties:

- compatible	: "pwm-fan"

- pwms		: the PWM that is used to control the PWM fan

- cooling-levels      : PWM duty cycle values in a range from 0 to 255

			which correspond to thermal cooling states



Example:

	pwm-fan {

	fan0: pwm-fan {

		compatible = "pwm-fan";

		status = "okay";

		cooling-min-state = <0>;

		cooling-max-state = <3>;

		#cooling-cells = <2>;

		pwms = <&pwm 0 10000 0>;

		cooling-levels = <0 102 170 230>;

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			     thermal-sensors = <&tmu 0>;

			     polling-delay-passive = <0>;

			     polling-delay = <0>;

			     trips {

					cpu_alert1: cpu-alert1 {

						    temperature = <100000>; /* millicelsius */

						    hysteresis = <2000>; /* millicelsius */

						    type = "passive";

					};

			     };

			     cooling-maps {

					map0 {

						    trip = <&cpu_alert1>;

						    cooling-device = <&fan0 0 1>;

					};

			     };

		};

Documentation/devicetree/bindings/mfd/s2mps11.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ Optional properties: 
- interrupt-parent: Specifies the phandle of the interrupt controller to which

  the interrupts from s2mps11 are delivered to.

- interrupts: Interrupt specifiers for interrupt sources.

- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is

  connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1

  register to turn off the power. Usually the ACOKB is pulled up to VBATT so

  when PWRHOLD pin goes low, the rising ACOKB will trigger power off.



Optional nodes:

- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ 
	exynos5250-arndale.dtb \

	exynos5250-smdk5250.dtb \

	exynos5250-snow.dtb \

	exynos5250-snow-rev5.dtb \

	exynos5250-spring.dtb \

	exynos5260-xyref5260.dtb \

	exynos5410-smdk5410.dtb \
@@ -126,6 +127,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ 
	exynos5420-smdk5420.dtb \

	exynos5422-odroidxu3.dtb \

	exynos5422-odroidxu3-lite.dtb \

	exynos5422-odroidxu4.dtb \

	exynos5440-sd5v1.dtb \

	exynos5440-ssdk5440.dtb \

	exynos5800-peach-pi.dtb

arch/arm/boot/dts/exynos3250-monk.dts

+4 −4
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ 
		regulator-name = "V_EMMC_2.8V-fixed";

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

		gpio = <&gpk0 2 0>;

		gpio = <&gpk0 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	i2c_max77836: i2c-gpio-0 {

		compatible = "i2c-gpio";

		gpios = <&gpd0 2 0>, <&gpd0 3 0>;

		gpios = <&gpd0 2 GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;
@@ -266,14 +266,14 @@ 
				regulator-name = "V_EMMC_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				samsung,ext-control-gpios = <&gpk0 2 0>;

				samsung,ext-control-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;

			};



			ldo12_reg: LDO12 {

				regulator-name = "V_EMMC_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				samsung,ext-control-gpios = <&gpk0 2 0>;

				samsung,ext-control-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;

			};



			ldo13_reg: LDO13 {

arch/arm/boot/dts/exynos3250-rinato.dts

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


	i2c_max77836: i2c-gpio-0 {

		compatible = "i2c-gpio";

		gpios = <&gpd0 2 0>, <&gpd0 3 0>;

		gpios = <&gpd0 2 GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;
@@ -188,8 +188,8 @@ 
		reg = <0>;

		vdd3-supply = <&ldo16_reg>;

		vci-supply = <&ldo20_reg>;

		reset-gpios = <&gpe0 1 0>;

		te-gpios = <&gpx0 6 0>;

		reset-gpios = <&gpe0 1 GPIO_ACTIVE_HIGH>;

		te-gpios = <&gpx0 6 GPIO_ACTIVE_HIGH>;

		power-on-delay= <30>;

		power-off-delay= <120>;

		reset-delay = <5>;
@@ -368,14 +368,14 @@ 
				regulator-name = "V_EMMC_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				samsung,ext-control-gpios = <&gpk0 2 0>;

				samsung,ext-control-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;

			};



			ldo12_reg: LDO12 {

				regulator-name = "V_EMMC_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				samsung,ext-control-gpios = <&gpk0 2 0>;

				samsung,ext-control-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;

			};



			ldo13_reg: LDO13 {