Merge tag 'samsung-dt64-4.19' of... (eb3203ab) · Commits · 戴 / test

arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Device tree sources for Exynos5433 TMU sensor configuration
		*
		* Copyright (c) 2016 Jonghwa Lee <jonghwa3.lee@samsung.com>
		*/

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

		#thermal-sensor-cells = <0>;
		samsung,tmu_gain = <8>;
		samsung,tmu_reference_voltage = <23>;
		samsung,tmu_noise_cancel_mode = <4>;
		samsung,tmu_efuse_value = <75>;
		samsung,tmu_min_efuse_value = <40>;
		samsung,tmu_max_efuse_value = <150>;
		samsung,tmu_first_point_trim = <25>;
		samsung,tmu_second_point_trim = <85>;
		samsung,tmu_default_temp_offset = <50>;
		samsung,tmu_mux_addr = <6>;

arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Device tree sources for Exynos5433 TMU sensor configuration
		*
		* Copyright (c) 2016 Chanwoo Choi <cw00.choi@samsung.com>
		*/

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

		#thermal-sensor-cells = <0>;
		samsung,tmu_gain = <8>;
		samsung,tmu_reference_voltage = <16>;
		samsung,tmu_noise_cancel_mode = <4>;
		samsung,tmu_efuse_value = <75>;
		samsung,tmu_min_efuse_value = <40>;
		samsung,tmu_max_efuse_value = <150>;
		samsung,tmu_first_point_trim = <25>;
		samsung,tmu_second_point_trim = <85>;
		samsung,tmu_default_temp_offset = <50>;

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+7 −7

Original line number	Diff line number	Diff line
		@@ -630,7 +630,7 @@
		clocks = <&cmu_peris CLK_PCLK_TMU0_APBIF>,
		<&cmu_peris CLK_SCLK_TMU0>;
		clock-names = "tmu_apbif", "tmu_sclk";
		#include "exynos5433-tmu-sensor-conf.dtsi"
		#thermal-sensor-cells = <0>;
		status = "disabled";
		};

		@@ -641,7 +641,7 @@
		clocks = <&cmu_peris CLK_PCLK_TMU0_APBIF>,
		<&cmu_peris CLK_SCLK_TMU0>;
		clock-names = "tmu_apbif", "tmu_sclk";
		#include "exynos5433-tmu-sensor-conf.dtsi"
		#thermal-sensor-cells = <0>;
		status = "disabled";
		};

		@@ -652,7 +652,7 @@
		clocks = <&cmu_peris CLK_PCLK_TMU1_APBIF>,
		<&cmu_peris CLK_SCLK_TMU1>;
		clock-names = "tmu_apbif", "tmu_sclk";
		#include "exynos5433-tmu-g3d-sensor-conf.dtsi"
		#thermal-sensor-cells = <0>;
		status = "disabled";
		};

		@@ -663,7 +663,7 @@
		clocks = <&cmu_peris CLK_PCLK_TMU1_APBIF>,
		<&cmu_peris CLK_SCLK_TMU1>;
		clock-names = "tmu_apbif", "tmu_sclk";
		#include "exynos5433-tmu-sensor-conf.dtsi"
		#thermal-sensor-cells = <0>;
		status = "disabled";
		};

		@@ -674,7 +674,7 @@
		clocks = <&cmu_peris CLK_PCLK_TMU1_APBIF>,
		<&cmu_peris CLK_SCLK_TMU1>;
		clock-names = "tmu_apbif", "tmu_sclk";
		#include "exynos5433-tmu-sensor-conf.dtsi"
		#thermal-sensor-cells = <0>;
		status = "disabled";
		};

		@@ -1171,7 +1171,7 @@
		power-domains = <&pd_gscl>;
		};

		sysmmu_scaler_0: sysmmu@0x15040000 {
		sysmmu_scaler_0: sysmmu@15040000 {
		compatible = "samsung,exynos-sysmmu";
		reg = <0x15040000 0x1000>;
		interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
		@@ -1182,7 +1182,7 @@
		power-domains = <&pd_mscl>;
		};

		sysmmu_scaler_1: sysmmu@0x15050000 {
		sysmmu_scaler_1: sysmmu@15050000 {
		compatible = "samsung,exynos-sysmmu";
		reg = <0x15050000 0x1000>;
		interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Device tree sources for Exynos7 TMU sensor configuration
		*
		* Copyright (c) 2016 Samsung Electronics Co., Ltd.
		* http://www.samsung.com
		*/

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

		#thermal-sensor-cells = <0>;
		samsung,tmu_gain = <9>;
		samsung,tmu_reference_voltage = <17>;
		samsung,tmu_noise_cancel_mode = <4>;
		samsung,tmu_efuse_value = <75>;
		samsung,tmu_min_efuse_value = <15>;
		samsung,tmu_max_efuse_value = <100>;
		samsung,tmu_first_point_trim = <25>;
		samsung,tmu_second_point_trim = <85>;
		samsung,tmu_default_temp_offset = <50>;
		samsung,tmu_cal_type = <TYPE_ONE_POINT_TRIMMING>;

arch/arm64/boot/dts/exynos/exynos7.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -589,7 +589,7 @@
		clocks = <&clock_peris PCLK_TMU>,
		<&clock_peris SCLK_TMU>;
		clock-names = "tmu_apbif", "tmu_sclk";
		#include "exynos7-tmu-sensor-conf.dtsi"
		#thermal-sensor-cells = <0>;
		};

		thermal-zones {

Admin message