From patchwork Mon Oct 24 11:32:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9914 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp584148wru; Mon, 24 Oct 2022 11:05:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM44lzFsSs412+YsBfBJimyahusAF+iQgwfGXgXxu0ZesqAoDIzpO6REx4HGjTaOigGBPj3k X-Received: by 2002:a17:907:2cf1:b0:78d:c7a1:172d with SMTP id hz17-20020a1709072cf100b0078dc7a1172dmr28204005ejc.51.1666634746643; Mon, 24 Oct 2022 11:05:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666634746; cv=none; d=google.com; s=arc-20160816; b=kDNKUNN6YP4zy2NnXnxBAsQATZbcd6TyBJ4rWDMvXHj2wJfF+Ymffxp2xZ0eIeyjpv dLwXpwYwnjmlUuG6J1UyPc+8QQAygtxe4i0ldFiizW8UnDgO5MRN/UclkItWFGK9WJ06 ox7dFDWU+K9Zid8qdeD9/Wu5pSJf11KDQdGHkU/YE3XiN/Q7/bQ8bkc5Rt91pGhLXinL r+mqF8gdSeaqII7l/m+1DAaETXfc99M+azyEQUnvmQelG0J33vw1xY8i472Kb4R9tBTQ BFNl6Kish9BLAXeSd39K0JXn1VeJFh//FHNap6OTbe+xODjzWxMXGgr+UfJH979ZRunI gODg== 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=HhQxP9ru7uKXsp5DxNQrr0N8bgdDeSkj+3vf081fs8/px+lKAq4Ps+5bOYu4mokqU0 GJO5GbZ8SzyRwRBLozAVerkVn7AMgvBTektRw+4tKdWZ7ZVb3H50ZyfqBIKyeRjVSNKY OvN01CVZilYKSOnIDd8UF/ZBCLSVvki6Mz4WTL5ywcyqOEMeVKThN8tkO/HHF90Oug15 s0LMJEdnOTMnJ8WkdsAKQKqq20ImZWnzDhkAe84b6d9xLpocuH1G/5lsrImr/qqVYtqS hxHXTTWuFiv/lZqWGSOGLFwpaawOrt4ovrFKv198jqIY1xRvrBwyxEZaEtbekOcbCYyI eylA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CWdni22k; 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 ae4-20020a17090725c400b0079800b81731si455868ejc.82.2022.10.24.11.05.21; Mon, 24 Oct 2022 11:05: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=CWdni22k; 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 S231591AbiJXRui (ORCPT + 99 others); Mon, 24 Oct 2022 13:50:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231172AbiJXRuE (ORCPT ); Mon, 24 Oct 2022 13:50:04 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 494F01EAE0; Mon, 24 Oct 2022 09:27:05 -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 sin.source.kernel.org (Postfix) with ESMTPS id 1D8B6CE16EF; Mon, 24 Oct 2022 12:51:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31B67C433C1; Mon, 24 Oct 2022 12:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615891; bh=EToABdKvy4XhxuhBiW5VUN7zQrDrFjx5hkuwfUdi6NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CWdni22kjOIThsFE2Nz6oqU0TLzJDbgVqHnBjLr+Op8JcH5RLwNOopM9HBUSEoZ5X F9a4+0y8R9qfLPH8F+ZXSV7F5WvjDal2/j/BLUzCoM7Mroh+pbOVoLgrNQuf6qx9cN 68xpDd3iysh9AA5tbfjzNINULfDxkgVg8Ysrt0dQ= 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.15 395/530] thermal/drivers/qcom/tsens-v0_1: Fix MSM8939 fourth sensor hw_id Date: Mon, 24 Oct 2022 13:32:19 +0200 Message-Id: <20221024113102.960625388@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747593195877885931?= X-GMAIL-MSGID: =?utf-8?q?1747593195877885931?= 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,