From patchwork Mon Oct 24 11:31:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp479269wru; Mon, 24 Oct 2022 07:18:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6J+9z3vHY+hLNhHFDeAVTXV7cbRBod39tBglPoJIqquXolgyfQxkoT1nckGzFr15/AYhd7 X-Received: by 2002:a05:6402:42d0:b0:457:d16e:283d with SMTP id i16-20020a05640242d000b00457d16e283dmr30745489edc.395.1666621128546; Mon, 24 Oct 2022 07:18:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621128; cv=none; d=google.com; s=arc-20160816; b=VJrxKbyrr9vQvu+3DJVWA2H27loavnLgXjG3uMaSKslLvrLHjHftDlwx7tcJ+YGYZ9 UNty/ek8sxmwzXaqacoie1ollxPVqvRXNpGCRQ8tstzMgt2TpWVNFTZ55WgULh3EAIH7 5iCFqsxG9dvVeJ3E++qFGAvO9Xj82yOPX25Cus3TGOl2nRUcJUmDirzYPJ51/Xg4tTwp WmRmo/jy20KjX4CKv/czBxHQ+5oy6j59sfwVnwOKbJuQFsRvYRU/RsIGD1BID07tHvhp NgJVJaKM+CWHYT7DbNKs+3nZ8D0/opLRx2iG+3GFx1NJeCEgahm2EXkythu5HR9qqX2i 8xDQ== 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=v52LsNJRhRYgK1188VNSSNj6AzDEb8TE9Fh67feCAl4=; b=NxP3jDYB81mLOrRw+NaEzZOE9FCRaqcr5yi/tI8CC7JfTf1cybonNcXqTw6RcF4MgA nk6FEIol0pXR24lWxJF4ijSyIc4jJXD3poEfdeQw6jPv+L3Md/jPmHEBISZAuskV05kE 0SdvUJkrdArukPqLIjnSbZEC49XkgaGxrZ2TyTslrn5bO5fkHZJGQrce+6MRtkZWBe++ PeQefgyjTKI5USUBLVW8HcXMpwmSGCYN3Qy4YwXLutYvpzA/pew5uq2t8Xc33J1HOfsS HA9HRWy1+qA5/isAES93oIlFZvAcynq6iwAZY0VmaZ3UBpitAMx0A/D6WQ7CsVrdc7nm cXjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KLQ8Ws6d; 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 fk4-20020a056402398400b00459b51c2b25si26802299edb.438.2022.10.24.07.18.15; Mon, 24 Oct 2022 07:18:48 -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=KLQ8Ws6d; 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 S233996AbiJXOMJ (ORCPT + 99 others); Mon, 24 Oct 2022 10:12:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235387AbiJXOJL (ORCPT ); Mon, 24 Oct 2022 10:09:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAFCAC4C1A; Mon, 24 Oct 2022 05:51:02 -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 ams.source.kernel.org (Postfix) with ESMTPS id 5DFFFB8169E; Mon, 24 Oct 2022 12:29:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3D11C433D6; Mon, 24 Oct 2022 12:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614589; bh=c0fLL7Bh+LtakEfa2Bn6MBNMSqnGSRdb47GlY6/se8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KLQ8Ws6ddUYLCiKDOpRrFli2pADnVl4asqs7S/eZzm0tbf5lxzv4Zlp5ssI0PAiKD N1KFvshLHh2Dv394DQNdCtm4C+5MO/CHDpspISeCvaV9DO3n0F7ZMpUtgUrClT+Rj4 ocd2UsIUFnA4xMF/+IHfe5HhbI2jKm2ccsVc6h8c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Knecht , Dmitry Baryshkov , Bjorn Andersson , Bryan ODonoghue , Daniel Lezcano , Sasha Levin Subject: [PATCH 5.10 289/390] thermal/drivers/qcom/tsens-v0_1: Fix MSM8939 fourth sensor hw_id Date: Mon, 24 Oct 2022 13:31:26 +0200 Message-Id: <20221024113035.274825292@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747578916255077203?= X-GMAIL-MSGID: =?utf-8?q?1747578916255077203?= From: Vincent Knecht [ Upstream commit b0c883e900702f408d62cf92b0ef01303ed69be9 ] Reading temperature from this sensor fails with 'Invalid argument'. Looking at old vendor dts [1], its hw_id should be 3 instead of 4. Change this hw_id accordingly. [1] https://github.com/msm8916-mainline/android_kernel_qcom_msm8916/blob/master/arch/arm/boot/dts/qcom/msm8939-common.dtsi#L511 Fixes: 332bc8ebab2c ("thermal: qcom: tsens-v0_1: Add support for MSM8939") Signed-off-by: Vincent Knecht Reviewed-by: Dmitry Baryshkov Reviewed-by: Bjorn Andersson Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20220811105014.7194-1-vincent.knecht@mailoo.org Signed-off-by: Daniel Lezcano Signed-off-by: Sasha Levin --- drivers/thermal/qcom/tsens-v0_1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c index 4ffa2e2c0145..9b8ba429a304 100644 --- a/drivers/thermal/qcom/tsens-v0_1.c +++ b/drivers/thermal/qcom/tsens-v0_1.c @@ -522,7 +522,7 @@ static const struct tsens_ops ops_8939 = { struct tsens_plat_data data_8939 = { .num_sensors = 10, .ops = &ops_8939, - .hw_ids = (unsigned int []){ 0, 1, 2, 4, 5, 6, 7, 8, 9, 10 }, + .hw_ids = (unsigned int []){ 0, 1, 2, 3, 5, 6, 7, 8, 9, 10 }, .feat = &tsens_v0_1_feat, .fields = tsens_v0_1_regfields,