ODROID-C4: Fix label redefine in dts

This commit is contained in:
Chris
2020-12-18 10:56:19 +09:00
parent c46afcb6de
commit 45e2c93ea6

View File

@@ -1726,176 +1726,6 @@
cpu_ver_name {
compatible = "amlogic, cpu-major-id-sm1";
};
p_tsensor: p_tsensor@ff634800 {
compatible = "amlogic, r1p1-tsensor";
device_name = "meson-pthermal";
status = "okay";
reg = <0x0 0xff634800 0x0 0x50>,
<0x0 0xff800268 0x0 0x4>;
cal_type = <0x1>;
cal_a = <324>;
cal_b = <424>;
cal_c = <3159>;
cal_d = <9411>;
rtemp = <115000>;
interrupts = <0 35 0>;
clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
clock-names = "ts_comp";
#thermal-sensor-cells = <1>;
};
d_tsensor: d_tsensor@ff634c00 {
compatible = "amlogic, r1p1-tsensor";
device_name = "meson-dthermal";
status = "okay";
reg = <0x0 0xff634c00 0x0 0x50>,
<0x0 0xff800230 0x0 0x4>;
cal_type = <0x1>;
cal_a = <324>;
cal_b = <424>;
cal_c = <3159>;
cal_d = <9411>;
rtemp = <115000>;
interrupts = <0 36 0>;
clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
clock-names = "ts_comp";
#thermal-sensor-cells = <1>;
};
meson_cooldev: meson-cooldev@0 {
status = "okay";
compatible = "amlogic, meson-cooldev";
device_name = "mcooldev";
cooling_devices {
cpufreq_cool_cluster0 {
min_state = <1000000>;
dyn_coeff = <125>;
gpu_pp = <2>;
cluster_id = <0>;
node_name = "cpufreq_cool0";
device_type = "cpufreq";
};
cpucore_cool_cluster0 {
min_state = <1>;
dyn_coeff = <0>;
gpu_pp = <2>;
cluster_id = <0>;
node_name = "cpucore_cool0";
device_type = "cpucore";
};
gpufreq_cool {
min_state = <400>;
dyn_coeff = <215>;
gpu_pp = <2>;
cluster_id = <0>;
node_name = "gpufreq_cool0";
device_type = "gpufreq";
};
gpucore_cool {
min_state = <1>;
dyn_coeff = <0>;
gpu_pp = <2>;
cluster_id = <0>;
node_name = "gpucore_cool0";
device_type = "gpucore";
};
};
cpufreq_cool0:cpufreq_cool0 {
#cooling-cells = <2>; /* min followed by max */
};
cpucore_cool0:cpucore_cool0 {
#cooling-cells = <2>; /* min followed by max */
};
gpufreq_cool0:gpufreq_cool0 {
#cooling-cells = <2>; /* min followed by max */
};
gpucore_cool0:gpucore_cool0 {
#cooling-cells = <2>; /* min followed by max */
};
};/*meson cooling devices end*/
thermal-zones {
soc_thermal: soc_thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
sustainable-power = <1410>;
thermal-sensors = <&p_tsensor 0>;
trips {
pswitch_on: trip-point@0 {
temperature = <60000>;
hysteresis = <5000>;
type = "passive";
};
pcontrol: trip-point@1 {
temperature = <75000>;
hysteresis = <5000>;
type = "passive";
};
phot: trip-point@2 {
temperature = <85000>;
hysteresis = <5000>;
type = "hot";
};
pcritical: trip-point@3 {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
};
};
cooling-maps {
cpufreq_cooling_map {
trip = <&pcontrol>;
cooling-device = <&cpufreq_cool0 0 4>;
contribution = <1024>;
};
cpucore_cooling_map {
trip = <&pcontrol>;
cooling-device = <&cpucore_cool0 0 3>;
contribution = <1024>;
};
gpufreq_cooling_map {
trip = <&pcontrol>;
cooling-device = <&gpufreq_cool0 0 3>;
contribution = <1024>;
};
gpucore_cooling_map {
trip = <&pcontrol>;
cooling-device = <&gpucore_cool0 0 2>;
contribution = <1024>;
};
};
};
ddr_thermal: ddr_thermal {
polling-delay = <2000>;
polling-delay-passive = <1000>;
sustainable-power = <1410>;
thermal-sensors = <&d_tsensor 1>;
trips {
dswitch_on: trip-point@0 {
temperature = <60000>;
hysteresis = <5000>;
type = "passive";
};
dcontrol: trip-point@1 {
temperature = <75000>;
hysteresis = <5000>;
type = "passive";
};
dhot: trip-point@2 {
temperature = <85000>;
hysteresis = <5000>;
type = "hot";
};
dcritical: trip-point@3 {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
};
};
};
};/*thermal zone end*/
};/* end of / */
&pinctrl_aobus {