summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorSubrata Banik <subrata.banik@intel.com>2019-08-01 10:50:35 +0530
committerSubrata Banik <subrata.banik@intel.com>2019-08-02 04:34:18 +0000
commitc077b2274b661fb57ffed66b105ece88e30c73b2 (patch)
tree215148906dd7d3edf8ac1caa9c41d089959747d0 /src/mainboard
parent92dc39129156307913dbf3c07f926554f0c14ab8 (diff)
soc/intel/skylake: Make use of common thermal code for SKL
This patch ensures skylake soc is using common thermal code from intel common block. TEST=Build and boot soraka Change-Id: I0812daa3536051918ccac973fde8d7f4f949609d Signed-off-by: Subrata Banik <subrata.banik@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34648 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Aamir Bohra <aamir.bohra@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/poppy/variants/atlas/devicetree.cb3
-rw-r--r--src/mainboard/google/poppy/variants/baseboard/devicetree.cb5
-rw-r--r--src/mainboard/google/poppy/variants/nami/devicetree.cb5
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/devicetree.cb5
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/devicetree.cb3
-rw-r--r--src/mainboard/google/poppy/variants/rammus/devicetree.cb5
-rw-r--r--src/mainboard/google/poppy/variants/soraka/devicetree.cb5
7 files changed, 14 insertions, 17 deletions
diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
index 7fcb3b8b3e..ac86e79f22 100644
--- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
@@ -64,7 +64,6 @@ chip soc/intel/skylake
register "tdp_pl2_override" = "15"
register "psys_pmax" = "45"
register "tcc_offset" = "10"
- register "pch_trip_temp" = "75"
register "pirqa_routing" = "PCH_IRQ11"
register "pirqb_routing" = "PCH_IRQ10"
@@ -182,6 +181,7 @@ chip soc/intel/skylake
#| I2C2 | Trackpad |
#| I2C3 | Camera |
#| I2C4 | Audio |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -217,6 +217,7 @@ chip soc/intel/skylake
.speed_mhz = 1,
.early_init = 1,
},
+ .pch_thermal_trip = 75,
}"
# Touchscreen
register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3"
diff --git a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb
index 727a10f5f4..d9604746dd 100644
--- a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb
@@ -177,6 +177,7 @@ chip soc/intel/skylake
#| I2C3 | Pen |
#| I2C4 | Camera |
#| I2C5 | Audio |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -226,6 +227,7 @@ chip soc/intel/skylake
.sda_hold = 36,
},
},
+ .pch_thermal_trip = 75,
}"
# Touchscreen
@@ -270,9 +272,6 @@ chip soc/intel/skylake
# Use default SD card detect GPIO configuration
register "sdcard_cd_gpio_default" = "GPP_E15"
- # PCH Trip Temperature in degree C
- register "pch_trip_temp" = "75"
-
device cpu_cluster 0 on
device lapic 0 on end
end
diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb
index 7c11ea19c4..3d37eda207 100644
--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb
@@ -219,6 +219,7 @@ chip soc/intel/skylake
#| I2C1 | Trackpad |
#| I2C2 | Pen |
#| I2C3 | Audio |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -263,6 +264,7 @@ chip soc/intel/skylake
.sda_hold = 36,
},
},
+ .pch_thermal_trip = 75,
}"
# Must leave UART0 enabled or SD/eMMC will not work as PCI
@@ -285,9 +287,6 @@ chip soc/intel/skylake
register "tcc_offset" = "3" # TCC of 97C
register "psys_pmax" = "101"
- # PCH Trip Temperature in degree C
- register "pch_trip_temp" = "75"
-
device cpu_cluster 0 on
device lapic 0 on end
end
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
index 1e4133b4f7..ef5e8ad921 100644
--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
@@ -189,6 +189,7 @@ chip soc/intel/skylake
#| I2C3 | Pen |
#| I2C4 | Camera |
#| I2C5 | Audio |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -247,6 +248,7 @@ chip soc/intel/skylake
.sda_hold = 36,
},
},
+ .pch_thermal_trip = 75,
}"
# Touch Screen
@@ -291,9 +293,6 @@ chip soc/intel/skylake
# Use default SD card detect GPIO configuration
register "sdcard_cd_gpio_default" = "GPP_E15"
- # PCH Trip Temperature in degree C
- register "pch_trip_temp" = "75"
-
device cpu_cluster 0 on
device lapic 0 on end
end
diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
index bf1897c120..75fcf9c54f 100644
--- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
@@ -67,7 +67,6 @@ chip soc/intel/skylake
register "tdp_pl2_override" = "18"
register "psys_pmax" = "45"
register "tcc_offset" = "10"
- register "pch_trip_temp" = "75"
register "pirqa_routing" = "PCH_IRQ11"
register "pirqb_routing" = "PCH_IRQ10"
@@ -201,6 +200,7 @@ chip soc/intel/skylake
#| I2C3 | Camera |
#| I2C4 | Audio |
#| I2C5 | Rear Camera & SAR |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -241,6 +241,7 @@ chip soc/intel/skylake
.speed_mhz = 1,
.early_init = 1,
},
+ .pch_thermal_trip = 75,
}"
# Touchscreen
register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3"
diff --git a/src/mainboard/google/poppy/variants/rammus/devicetree.cb b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
index 1f73a5903e..70a4667e9e 100644
--- a/src/mainboard/google/poppy/variants/rammus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
@@ -172,6 +172,7 @@ chip soc/intel/skylake
#| I2C0 | Touchscreen |
#| I2C1 | Trackpad |
#| I2C5 | Audio |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -207,6 +208,7 @@ chip soc/intel/skylake
.speed_mhz = 1,
.early_init = 1,
},
+ .pch_thermal_trip = 75,
}"
# Touchscreen
@@ -242,9 +244,6 @@ chip soc/intel/skylake
# Use default SD card detect GPIO configuration
register "sdcard_cd_gpio_default" = "GPP_E15"
- # PCH Trip Temperature in degree C
- register "pch_trip_temp" = "75"
-
device cpu_cluster 0 on
device lapic 0 on end
end
diff --git a/src/mainboard/google/poppy/variants/soraka/devicetree.cb b/src/mainboard/google/poppy/variants/soraka/devicetree.cb
index 872e2e5d9a..4711b1f0ae 100644
--- a/src/mainboard/google/poppy/variants/soraka/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/soraka/devicetree.cb
@@ -179,6 +179,7 @@ chip soc/intel/skylake
#| I2C2 | Camera |
#| I2C4 | Camera |
#| I2C5 | Audio |
+ #| pch_thermal_trip | PCH Trip Temperature |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT,
@@ -228,6 +229,7 @@ chip soc/intel/skylake
.sda_hold = 36,
},
},
+ .pch_thermal_trip = 75,
}"
# Touchscreen
@@ -271,9 +273,6 @@ chip soc/intel/skylake
# Use default SD card detect GPIO configuration
register "sdcard_cd_gpio_default" = "GPP_E15"
- # PCH Trip Temperature in degree C
- register "pch_trip_temp" = "75"
-
device cpu_cluster 0 on
device lapic 0 on end
end