From patchwork Sat Aug 27 00:49:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 600746 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A448ECAAD5 for ; Sat, 27 Aug 2022 00:49:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233981AbiH0AtG (ORCPT ); Fri, 26 Aug 2022 20:49:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231784AbiH0AtF (ORCPT ); Fri, 26 Aug 2022 20:49:05 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FA3CEA339 for ; Fri, 26 Aug 2022 17:49:04 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id f4so2781866pgc.12 for ; Fri, 26 Aug 2022 17:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=97zZ08Utl6HARnTvGZcj5Kpy48/dl3mZFonKGspCb6I=; b=HA9yAAoleCjowV5YLuTXR7dgCp/RWxiop4nJUvuJ12gtW6IHgIsQp+4AZT9z96nG9+ Ot4q/4vAg0a5FughnQQ/mnp/8ipCGNhv64yUejNAwG7JJl87b6Oz+PWF7UP1Pub8pva0 23I/W26sQG4N9k+fiVmoV3Im8gX5638Gwi21s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=97zZ08Utl6HARnTvGZcj5Kpy48/dl3mZFonKGspCb6I=; b=c5f5AD/5vLyHj7qw6l31TCDWrh+zySbOAjx5ViZLafC0xthUdOfwi9oWxP41dLQCMp S4WrtO5vn4wsk1b/+fbdukV86Pu1iYhSJMpvbER7u33Be5toNR707PECsZY0tdoiaKNE owPEG52AHMzOH4sWf1GkdSWmCK/cGY/FNOsQ17FJKcbqa6X2FGW2ebGttetzNGKQVFQJ k46mRbgsQaOF5lbBhOKJwFrAAIKzeAZO3iiiKUq+1TIUekvNhcsirVbDz8zet4+n9Wg5 UkhqgUx3SCzzHDzI5FcnncNy8jc1HLw2KvcLuv0PH/4LbLLxwP17vvDksiMQQTg4iWNJ Bw1g== X-Gm-Message-State: ACgBeo0pttcDwKrPq9IDt7qFyv8Hfq20cnxKKOKezXvHs1wFYFh86AQK QOt8aYUhY8tXlVqVlMWG8CpqrQ== X-Google-Smtp-Source: AA6agR49bSDIhKd84+MMDwGyg4jTeGcSAp1B7s/VdMYbgVRXKFMixBFV+Xhl1fa2VkE/f2ieM7yKng== X-Received: by 2002:a05:6a00:22c8:b0:537:275e:e483 with SMTP id f8-20020a056a0022c800b00537275ee483mr6298686pfj.54.1661561343582; Fri, 26 Aug 2022 17:49:03 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:4e6f:7e52:9ad5:809f]) by smtp.gmail.com with ESMTPSA id z10-20020a62d10a000000b00537d0ed05ecsm1842969pfg.216.2022.08.26.17.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 17:49:02 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-arm-msm@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH] arm64: dts: qcom: sc7180-trogdor: Keep pm6150_adc enabled for TZ Date: Fri, 26 Aug 2022 17:49:00 -0700 Message-Id: <20220827004901.511543-1-swboyd@chromium.org> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There's still a thermal zone using pm6150_adc in the pm6150.dtsi file, pm6150_thermal. It's not super obvious because it indirectly uses the adc through an iio channel in pm6150_temp. Let's keep this enabled on lazor and coachz so that reading the temperature of the pm6150_thermal zone continues to work. Otherwise we get -EINVAL when reading the zone, and I suspect the PMIC temperature trip doesn't work properly so we don't shutdown when the PMIC overheats. Cc: Matthias Kaehlcke Fixes: b8d1e3d33487 ("arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors") Signed-off-by: Stephen Boyd Reviewed-by: Matthias Kaehlcke --- arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 -- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 -- 2 files changed, 4 deletions(-) base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts index 8290d036044a..edfcd47e1a00 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts @@ -24,8 +24,6 @@ &charger_thermal { }; &pm6150_adc { - status = "disabled"; - /delete-node/ skin-temp-thermistor@4e; /delete-node/ charger-thermistor@4f; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 2cf7d5212c61..002663d752da 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -55,8 +55,6 @@ &panel { }; &pm6150_adc { - status = "disabled"; - /delete-node/ charger-thermistor@4f; };