From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 453CC2236FB; Mon, 23 Jun 2025 22:08:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716525; cv=none; b=HK6/XSv+GaeXiwvSSt9jp6bJhZHP/LwuZbO7Qj8UuvGCk5WkhkrzY1qWDRmRbhuO++X12CxmOQRlS61n3fJNajqeKldGnO+MAbOvo+gZrjp4dsfjfJk63UWMzZkXPUfDgjnMnvfVseoFOj+PAcqgeBanxS0zTb41ILKHnRRmato= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716525; c=relaxed/simple; bh=Fyf18v+0il09TXhE3W5XXJUa2s+z1wqr3JX2AtLTpsw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ThHctebRG0zjSe08IwPwDzfGW9C9wIUD6J7vvDABi/sqvrp3/0AHezUraZExW6KobzexJmFeAPzK4PLUAftzOFf/CGmHfMPtr4BCUMI+3axOkDNjPkhmICrKlwXoTsK7ydGIDo7vGp3hBqnSAg6ViGFNxDyTXz/8b8wdxO2t7JM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WUTxcPm5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WUTxcPm5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84297C4CEEA; Mon, 23 Jun 2025 22:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716524; bh=Fyf18v+0il09TXhE3W5XXJUa2s+z1wqr3JX2AtLTpsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUTxcPm5hNYwQ1h+F9HdBZvaAEevlCG11BCV1YcBrcuQtrQ7dHeFbXhJjz4QIHHcA sizCqWdLhq3d3ICu86QMQwfzW8yr48LElNJzVLxt1zrxZT2wSw+KJJPM7I6QypE1en qzW1G2/d8ZDPThyafkX68KBmaCvCL0LEOYQTR/Cg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marcelo Schmitt , Sean Nyekjaer , Jonathan Cameron Subject: [PATCH 5.15 361/411] iio: accel: fxls8962af: Fix temperature calculation Date: Mon, 23 Jun 2025 15:08:25 +0200 Message-ID: <20250623130642.729666134@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130632.993849527@linuxfoundation.org> References: <20250623130632.993849527@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Nyekjaer commit 16038474e3a0263572f36326ef85057aaf341814 upstream. According to spec temperature should be returned in milli degrees Celsius. Add in_temp_scale to calculate from Celsius to milli Celsius. Fixes: a3e0b51884ee ("iio: accel: add support for FXLS8962AF/FXLS8964AF accelerometers") Cc: stable@vger.kernel.org Reviewed-by: Marcelo Schmitt Signed-off-by: Sean Nyekjaer Link: https://patch.msgid.link/20250505-fxls-v4-1-a38652e21738@geanix.com Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/accel/fxls8962af-core.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) --- a/drivers/iio/accel/fxls8962af-core.c +++ b/drivers/iio/accel/fxls8962af-core.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -416,8 +417,16 @@ static int fxls8962af_read_raw(struct ii *val = FXLS8962AF_TEMP_CENTER_VAL; return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - *val = 0; - return fxls8962af_read_full_scale(data, val2); + switch (chan->type) { + case IIO_TEMP: + *val = MILLIDEGREE_PER_DEGREE; + return IIO_VAL_INT; + case IIO_ACCEL: + *val = 0; + return fxls8962af_read_full_scale(data, val2); + default: + return -EINVAL; + } case IIO_CHAN_INFO_SAMP_FREQ: return fxls8962af_read_samp_freq(data, val, val2); default: @@ -494,6 +503,7 @@ static int fxls8962af_set_watermark(stru .type = IIO_TEMP, \ .address = FXLS8962AF_TEMP_OUT, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ BIT(IIO_CHAN_INFO_OFFSET),\ .scan_index = -1, \ .scan_type = { \