public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: qcom: sc7180: Base homestar's power coefficients in reality
@ 2021-09-23 15:14 Douglas Anderson
  2021-09-24 18:24 ` Matthias Kaehlcke
  2021-09-24 23:29 ` (subset) " Bjorn Andersson
  0 siblings, 2 replies; 3+ messages in thread
From: Douglas Anderson @ 2021-09-23 15:14 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Douglas Anderson, Andy Gross, Matthias Kaehlcke, Rob Herring,
	Stephen Boyd, devicetree, linux-arm-msm, linux-kernel

The commit 82ea7d411d43 ("arm64: dts: qcom: sc7180: Base dynamic CPU
power coefficients in reality") and the commit be0416a3f917 ("arm64:
dts: qcom: Add sc7180-trogdor-homestar") passed each other in the
tubes that make up the Internet. Despite the fact the patches didn't
cause a merge conflict, they need to account for each other. Do that.

Fixes: 82ea7d411d43 ("arm64: dts: qcom: sc7180: Base dynamic CPU power coefficients in reality")
Fixes: be0416a3f917 ("arm64: dts: qcom: Add sc7180-trogdor-homestar")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---

 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index cd3054226865..382f8c6f1576 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -51,7 +51,7 @@ skin_temp_thermal: skin-temp-thermal {
 			polling-delay = <0>;
 
 			thermal-sensors = <&pm6150_adc_tm 1>;
-			sustainable-power = <814>;
+			sustainable-power = <965>;
 
 			trips {
 				skin_temp_alert0: trip-point0 {
-- 
2.33.0.464.g1972c5931b-goog


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-24 23:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-23 15:14 [PATCH] arm64: dts: qcom: sc7180: Base homestar's power coefficients in reality Douglas Anderson
2021-09-24 18:24 ` Matthias Kaehlcke
2021-09-24 23:29 ` (subset) " Bjorn Andersson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox