From patchwork Wed Oct 19 08:28:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp223896wrs; Wed, 19 Oct 2022 02:38:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6mR0lBQQSjnhO+CTKo5CmfhONRKBfc+Vk0VWE3HGfX53RvnxcWtCGglxIhwCnjJ02BrQ4J X-Received: by 2002:a17:90b:3912:b0:20d:4151:1b65 with SMTP id ob18-20020a17090b391200b0020d41511b65mr45003229pjb.233.1666172326348; Wed, 19 Oct 2022 02:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172326; cv=none; d=google.com; s=arc-20160816; b=FxDqS622WomuWW65VumJHMAYmspqWptRlydh6mTb7xwH3ncIEoHiK/e13L3UGRLkC6 UR/KW5rQgx5cbWBn61vAHz2JbebibEiJPAS0+At21Y39iSAJjvuoqNfe6BhNSCCR/UgQ 6PwLs213mfadzVezyMoE9REL+3/0f36p8QZewUb9ygpSRwb9OyFq+S/zWte5SBZrOg5o +NLnqxDwrY63QpEQUolnOvkc905D6D6ydHB9pUkcIfyGmOHhKzpN3Vhphgf87iYYQp5n NiKKcgsnSQNiiVJo/AxvYtjtLWDXre6770fkYaTYg/4hTiDrmH+jHUnb8/mjkPT1QBiX KuwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=N3VrGUAzY/octMyFqwA1wBfYcQb63pqp1GywAhKn+Bo=; b=KDguDlkXyPBsvmkZGKpQvzgvvLHIBQfNEbKo/3pZqYmKc2Irn2PP1Nx6X0dvDMdfjE Vly7azMyhxShlB1k0LkqMAUSZKurcX7g6S/6MeGmZiXitcDxLTSNg0LcHPLgac6y+8QX 9KXLzzISQSU4LToOL0AvvQpCuGR6sBXbiduuAlnRTnnqDOVj+bu4IH6SMWXB8tmwdXZS 7gxf9fU6z5Op53Nadhlicbg2cv0Mtrb0DJpzlLk4CUBSbv/5FP7sUSpKpWQ67GfxLqsh DghKwNncbJiWy6wY/QunZ9V/fn4QS8vEyG2sgJnmwkLNCJleTxPaFiBAQc8cqpvz8uC9 zL/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iJLc9EuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 125-20020a630583000000b0043ac3ec9d9esi17583030pgf.595.2022.10.19.02.38.33; Wed, 19 Oct 2022 02:38:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iJLc9EuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233395AbiJSJWT (ORCPT + 99 others); Wed, 19 Oct 2022 05:22:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230348AbiJSJUd (ORCPT ); Wed, 19 Oct 2022 05:20:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19DC91C41E; Wed, 19 Oct 2022 02:09:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 563F96186E; Wed, 19 Oct 2022 08:57:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 554EBC433D7; Wed, 19 Oct 2022 08:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169852; bh=ydGjh0C3/rjhYKtzdIX5zVrzBYzbNRasu01fnkBC9AA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJLc9EuUoJjcGqY3dACCxIjOFhgxcPi5LpGXdhgNDc/HvRbFLpxSNv4gOyLbNgDuo LhLTS6m1tOMHXh2P7W/ajCLMKLoa3zNvVjBF6ksuwP4gk45mQEJ2XeOYxHcT+aQcmx BNBs3zpTetdXcNiFUf0LyPOigVnn9dv+ARwENWCw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthias Kaehlcke , Stephen Boyd , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.0 433/862] arm64: dts: qcom: sc7180-trogdor: Keep pm6150_adc enabled for TZ Date: Wed, 19 Oct 2022 10:28:40 +0200 Message-Id: <20221019083309.103905831@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747108313039323258?= X-GMAIL-MSGID: =?utf-8?q?1747108313039323258?= From: Stephen Boyd [ Upstream commit 144fbd028fdec2deeb3b99d5e60dbf3167950ebe ] 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 Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220827004901.511543-1-swboyd@chromium.org Signed-off-by: Sasha Levin --- 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(-) 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 @@ }; &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 @@ ap_ts_pen_1v8: &i2c4 { }; &pm6150_adc { - status = "disabled"; - /delete-node/ charger-thermistor@4f; };