mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 15:49:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'samsung-dt64-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Browse Source 
Samsung DTS ARM64 changes for v4.19

Cleanup from old properties and code-style warnings.

* tag 'samsung-dt64-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: Remove leading 0x from unit addresses in Exynos5433
  arm64: dts: exynos: Remove no longer needed samsung thermal properties

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-07-14 14:23:15 -07:00
parent 85b40cf3a8 17aa1530f1
commit eb3203ab92
5 changed files with 8 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +0,0 @@
// 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>;

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

@@ -1,19 +0,0 @@
// 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>;

14
arch/arm64/boot/dts/exynos/exynos5433.dtsi
View File

@@ -630,7 +630,7 @@ tmu_atlas0: tmu@10060000 {
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 @@ tmu_atlas1: tmu@10068000 {
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 @@ tmu_g3d: tmu@10070000 {
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 @@ tmu_apollo: tmu@10078000 {
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 @@ tmu_isp: tmu@1007c000 {
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 @@ sysmmu_gscl2: sysmmu@13ca0000 {
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 @@ sysmmu_scaler_0: sysmmu@0x15040000 {
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>;

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

@@ -1,21 +0,0 @@
// 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>;

2
arch/arm64/boot/dts/exynos/exynos7.dtsi
View File

@@ -589,7 +589,7 @@ tmuctrl_0: tmu@10060000 {
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 {