From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B1AFC433F5 for ; Thu, 23 Sep 2021 15:15:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13C7061107 for ; Thu, 23 Sep 2021 15:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241939AbhIWPQj (ORCPT ); Thu, 23 Sep 2021 11:16:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241890AbhIWPQj (ORCPT ); Thu, 23 Sep 2021 11:16:39 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0ED4C061756 for ; Thu, 23 Sep 2021 08:15:07 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id r2so6648844pgl.10 for ; Thu, 23 Sep 2021 08:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1Mari3rXpEVIL/MKBwf7Gl4BPU8uaHHJQrmX15CzPOg=; b=f9a6wPA2/Ed139nmoq+9njwD0XVqlnEzQYvyODTZpMjfsazNea0OMf6K0Q+Jft1DeD O3FhuKxely5MvxnjeP+Hw71KjtWnQUgQEKTgW858KuxrO17LKhJt/1jpZbnDDE/l6Tup efMI/YAFqUm1STPTUJTNjMUuXTnoBMmzTf5CI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1Mari3rXpEVIL/MKBwf7Gl4BPU8uaHHJQrmX15CzPOg=; b=7wC885bNQQAKcxACeqDJxo+BsfDeXF2WST5V6ZQSjmKCYcROSCqPOzcMREEx+KXCab 260Vc/O3e9ZzfeMrE0rJ2ZiovuAj1lJxDGmWwC/Pca5yHpICbl5nRuy9g5pRNMyNIRPg a/4b+A0zxLgUXKYMoCt6Fc7U4cE1quuZbblcSE1hiMym6z64okQVmMFpwcq/BuQbEZK+ 9Z/ao+PPIDWiBE2a22UehZ2mklt7AxS0VeNsDnduSrUE1NtOu/ta+RyYgVDS8X1BeGRZ MixfwItPGc3lMoIUhIvd+cYEkLIRv7BoJmQXT+HGCjoEyYaLDjmqNZT5CVKB0PWtFv7q AaRA== X-Gm-Message-State: AOAM530KC/MTqhU7TJWxTM2svrnpi/yublDtvuooTXkoRF+gsuGVviHN VWNfkqi6GZUh1PbT7auEWmbTAw== X-Google-Smtp-Source: ABdhPJzwhEuRwdUoHrmNTU5q/yYWuNBJursV7vpG2LiRw6Ys4fKbud5vR0OVEyxYD9sVkTgMk3WULg== X-Received: by 2002:a63:e413:: with SMTP id a19mr4695277pgi.408.1632410107206; Thu, 23 Sep 2021 08:15:07 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:4b4:fd97:7a10:9739]) by smtp.gmail.com with ESMTPSA id x9sm9591749pjp.50.2021.09.23.08.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 08:15:06 -0700 (PDT) From: Douglas Anderson To: Bjorn Andersson Cc: Douglas Anderson , Andy Gross , Matthias Kaehlcke , Rob Herring , Stephen Boyd , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: qcom: sc7180: Base homestar's power coefficients in reality Date: Thu, 23 Sep 2021 08:14:04 -0700 Message-Id: <20210923081352.1.I2a2ee0ac428a63927324d65022929565aa7d8361@changeid> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 --- 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