From patchwork Wed Oct 19 08:32:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4844 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp223785wrs; Wed, 19 Oct 2022 02:38:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5cTVvpwwHXOG8jghtjKbdXcSJgRdywylQk6eGUekZGP0CjeycyL5t0WaLqu6h8u4Wk+5dF X-Received: by 2002:a05:6a00:1781:b0:561:7f7f:dc38 with SMTP id s1-20020a056a00178100b005617f7fdc38mr7836021pfg.42.1666172308804; Wed, 19 Oct 2022 02:38:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172308; cv=none; d=google.com; s=arc-20160816; b=bHHbkIlV+MCWSynHj5O2IN6HkVYkmyZ2h/G5a+uSvBe3mdT4rwCXkoeM+1lg6FpJ8F crxhoIWCNrs7SyaIuu6WMC4hJBowS89QsroM/xArqKV4/DcaxyhzTJnH0hmBVZo+5uTC VwoWxYuH79rlmA/mUGbLQfTi0HpXgVyJVTSXwit9PRHJJxPJIKfFnI9U4M2v4VUjxmov hBrtPODfIeI+G4ALNkrE0A74UuU/IZcOq8ynF8KUBwWCdlqmJjbWw8yGugzEDThaM2l7 djUJ4eJjR6G88OjxAJlZieoqLQGv+JwCDmYyacDw5c/i8PxjMKzlRIcTI3EGfD1EWau9 wVnA== 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=oBrT6TR0WFZr08DQddYVyvrUM6feAxRhSk2hEnX4FZk=; b=Wdfvm9kHd4y+M26CK4VbNVHowyuEeayuGMWe2xsw1iT8y73zl4S7kjOJAMxTjwndKq 4xMtiCk7ARJ+JJG0UF6+Uit3yl8NuZWjyfQnKwAvl/wnCcNFeQ+TWterP/6VBEWaC80e +fkeeJMEM05ct7Kcmo4UmmO9in9JtrnSOSj1Ffg80BcNAGeaKVnfhSOZmF+hGnb43bBd SX5GpeEoCNhUxCXdze/22is+eOPqp+hVw7vxgUOnwVXzT2oqT37C07mSNabpE3q3j1zm B+UCE1HLIlw+0yzeqt+EiNCY3uh8c1lHyWNOy9sw/CpS8Fx+0dbvAkv4o4DouEPeIESk 5vhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iSj2wHnc; 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 s187-20020a632cc4000000b0045e96393e37si17643564pgs.20.2022.10.19.02.38.16; Wed, 19 Oct 2022 02:38:28 -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=iSj2wHnc; 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 S233277AbiJSJU2 (ORCPT + 99 others); Wed, 19 Oct 2022 05:20:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233455AbiJSJTR (ORCPT ); Wed, 19 Oct 2022 05:19:17 -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 DB4CFDCACD; Wed, 19 Oct 2022 02:08:20 -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 40DE761880; Wed, 19 Oct 2022 09:07:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51B09C433D7; Wed, 19 Oct 2022 09:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170430; bh=EToABdKvy4XhxuhBiW5VUN7zQrDrFjx5hkuwfUdi6NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSj2wHncG2xXVg5AtClwlA8CZH5HeXyjL0reFSNJLpYckrxHyb1srOCEIQjbiX5Lq jY6AqHnsEwxGfxl1DKPrkGO98NAzN3JklDrQlrOoSH3QVCLT+JDILC0igqRTOrsBLp OgCKmfY+Txhn0KXOCaCrmJN8Pz4uNikR/6hheP8k= 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 6.0 653/862] thermal/drivers/qcom/tsens-v0_1: Fix MSM8939 fourth sensor hw_id Date: Wed, 19 Oct 2022 10:32:20 +0200 Message-Id: <20221019083318.788220703@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?1747108294969362449?= X-GMAIL-MSGID: =?utf-8?q?1747108294969362449?= 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 f136cb350238..327f37202c69 100644 --- a/drivers/thermal/qcom/tsens-v0_1.c +++ b/drivers/thermal/qcom/tsens-v0_1.c @@ -604,7 +604,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,