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

Commit 403ea7f6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v3.19-rockchip-dts4' of... 

Merge tag 'v3.19-rockchip-dts4' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "last dts changes for 3.19" from Jason Cooper:

- rk3288 thermal driver that got accepted into the thermal tree
- mmc fifo sizes for Cortex-A9 SoCs
- labels for the leds on the RadxaRock
- core system supply for the Marsboard

* tag 'v3.19-rockchip-dts4' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: Add input voltage supply regulators in pmic for Marsboard
  ARM: dts: rockchip: set FIFO size for SDMMC, SDIO and EMMC on rk3066 and rk3188
  ARM: dts: rockchip: add label property for leds on Radxa Rock
  ARM: dts: rockchip: enable thermal on rk3288-evb board
  ARM: dts: rockchip: add main thermal info to rk3288
  ARM: dts: rockchip: add RK3288 Thermal data

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f3507cc5 288ce4a8

arch/arm/boot/dts/rk3066a-marsboard.dts

+14 −0
Original line number Diff line number Diff line
@@ -60,6 +60,14 @@ 
		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

	};



	vsys: vsys-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vsys";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

	};

};



&i2c1 {
@@ -72,8 +80,14 @@ 
		interrupt-parent = <&gpio6>;

		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;



		vcc1-supply = <&vsys>;

		vcc2-supply = <&vsys>;

		vcc3-supply = <&vsys>;

		vcc4-supply = <&vsys>;

		vcc5-supply = <&vcc_io>;

		vcc6-supply = <&vcc_io>;

		vcc7-supply = <&vsys>;

		vccio-supply = <&vsys>;



		regulators {

			vcc_rtc: regulator@0 {

arch/arm/boot/dts/rk3188-radxarock.dts

+4 −1
Original line number Diff line number Diff line
@@ -43,16 +43,19 @@ 
		compatible = "gpio-leds";



		green {

			label = "rock:green:user1";

			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		yellow {

		blue {

			label = "rock:blue:user2";

			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		sleep {

			label = "rock:red:power";

			gpios = <&gpio0 15 0>;

			default-state = "off";

		};

arch/arm/boot/dts/rk3288-evb.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -148,6 +148,12 @@ 
	status = "okay";

};



&tsadc {

	rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */

	rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */

	status = "okay";

};



&pinctrl {

	backlight {

		bl_en: bl-en {

arch/arm/boot/dts/rk3288-thermal.dtsi

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for RK3288 SoC thermal

 *

 * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include <dt-bindings/thermal/thermal.h>



reserve_thermal: reserve_thermal {

	polling-delay-passive = <1000>; /* milliseconds */

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



	thermal-sensors = <&tsadc 0>;

};



cpu_thermal: cpu_thermal {

	polling-delay-passive = <1000>; /* milliseconds */

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



	thermal-sensors = <&tsadc 1>;



	trips {

		cpu_alert0: cpu_alert0 {

			temperature = <70000>; /* millicelsius */

			hysteresis = <2000>; /* millicelsius */

			type = "passive";

		};

		cpu_crit: cpu_crit {

			temperature = <90000>; /* millicelsius */

			hysteresis = <2000>; /* millicelsius */

			type = "critical";

		};

	};



	cooling-maps {

		map0 {

			trip = <&cpu_alert0>;

			cooling-device =

				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

		};

	};

};



gpu_thermal: gpu_thermal {

	polling-delay-passive = <1000>; /* milliseconds */

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



	thermal-sensors = <&tsadc 2>;



	trips {

		gpu_alert0: gpu_alert0 {

			temperature = <70000>; /* millicelsius */

			hysteresis = <2000>; /* millicelsius */

			type = "passive";

		};

		gpu_crit: gpu_crit {

			temperature = <90000>; /* millicelsius */

			hysteresis = <2000>; /* millicelsius */

			type = "critical";

		};

	};



	cooling-maps {

		map0 {

			trip = <&gpu_alert0>;

			cooling-device =

				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

		};

	};

};

arch/arm/boot/dts/rk3288.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/pinctrl/rockchip.h>

#include <dt-bindings/clock/rk3288-cru.h>

#include <dt-bindings/thermal/thermal.h>

#include "skeleton.dtsi"



/ {
@@ -68,6 +69,7 @@ 
				 216000  900000

				 126000  900000

			>;

			#cooling-cells = <2>; /* min followed by max */

			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;

		};
@@ -357,6 +359,25 @@ 
		status = "disabled";

	};



	thermal-zones {

		#include "rk3288-thermal.dtsi"

	};



	tsadc: tsadc@ff280000 {

		compatible = "rockchip,rk3288-tsadc";

		reg = <0xff280000 0x100>;

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;

		clock-names = "tsadc", "apb_pclk";

		resets = <&cru SRST_TSADC>;

		reset-names = "tsadc-apb";

		pinctrl-names = "default";

		pinctrl-0 = <&otp_out>;

		#thermal-sensor-cells = <1>;

		rockchip,hw-tshut-temp = <95000>;

		status = "disabled";

	};



	usb_host0_ehci: usb@ff500000 {

		compatible = "generic-ehci";

		reg = <0xff500000 0x100>;
@@ -1016,6 +1037,12 @@ 
			};

		};



		tsadc {

			otp_out: otp-out {

				rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		pwm0 {

			pwm0_pin: pwm0-pin {

				rockchip,pins = <7 0 RK_FUNC_1 &pcfg_pull_none>;