OSDN Git Service

arm64: dts: qcom: sc7180: Base homestar's power coefficients in reality
authorDouglas Anderson <dianders@chromium.org>
Thu, 23 Sep 2021 15:14:04 +0000 (08:14 -0700)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Fri, 24 Sep 2021 23:28:32 +0000 (18:28 -0500)
commitbe4c096e6ba7728f4a1ead1de820d75436aedbd9
treecf1930fdf50d77aee35fd71dffcf3cf45e239e38
parent6cadaa14f290a0b7c2f3b2b7afd3192c5b49473f
arm64: dts: qcom: sc7180: Base homestar's power coefficients in reality

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>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210923081352.1.I2a2ee0ac428a63927324d65022929565aa7d8361@changeid
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi