From patchwork Wed May 4 13:36:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12837948 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BDA4C4332F for ; Wed, 4 May 2022 13:36:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350628AbiEDNkI (ORCPT ); Wed, 4 May 2022 09:40:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237418AbiEDNkH (ORCPT ); Wed, 4 May 2022 09:40:07 -0400 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30105.outbound.protection.outlook.com [40.107.3.105]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7768923BE9; Wed, 4 May 2022 06:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BwVxqwhDBji3xX6TAbAYM+7K+2tTgcVMPtF74Wz4WnCls0XY4KnR4VuFFaLz4LzofYy9wH1SBEY4xwyAd6UuAhhsJNdj6mRF05eWWwtAfe/Cp0NV6a8xE15pDZs6qlDQG9T4aDcL8qWCGNEpr8mKSWpxcDUMz2WnOIHqCW4js3p6i+GF48vEbCs9u9c52l3biRlDIPymidNsovYgoRzBXUvGpoD3eZr7II1G8byZe1WMiFws1B28aQk9r09fGz8qZeu6Ff1lcX2I++5/qNUe1RYBmRAj9XF+0p2s4bAVK5ovQ4VnGLqkzsWzKHr29uXRp0y4Qb03JcogFArC+t852g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CYKSHwURzhuyVCQ1gP8JGPV0Vq//cdhPy0rFDO7w1Ks=; b=Iq9yIrEt8EX/dGPc0KtzMvoC3//CxNUyMNJ4SKy2asL5BYwEdqdTIJc5R/Kfb7FIZtR7hckYoP7aB9lJpLLv/jC25Ot5rWGKqlvHXL6t7rPceaYHTRJpTsv7+kWITKGWZ94iYbMKNzTIuDzfnjZH115BALEWl+1Ex8yotcCVvnV2nxSDNUQYrMuL4xZuyHc/2IfEKRDT0T1jntlpAMFVli/9eefC5H8xwSShWYxK9uVvKXzyjbIYTgcV2Bsl8ygknNImHcwhFXmWCFunoPCp9JO/+VroO0mI0NsP+lJ4DKntngE38MnJlurYr+8hOPqAHM19ADmMwzDHHP++QhfZHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=kernel.org smtp.mailfrom=leica-geosystems.com.cn; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com.cn; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com.cn; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CYKSHwURzhuyVCQ1gP8JGPV0Vq//cdhPy0rFDO7w1Ks=; b=AqwdqcWEcMKNEkB7dIUjB2PODZM5vf63LzLIqT9JTZLAswKSRNQTx/I9EvVe1CvB8HBaphwSRT1g6JWJ95kgCfmCmdnyw56DhoOKv52R77G5B74PCu/CJ8jvRwRIXCDyVWrZIx2bGM/eR8YjJeoWSPBFIxsIyJ89aVhCZxVefdY= Received: from AM6PR01CA0072.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::49) by DB6PR0601MB2246.eurprd06.prod.outlook.com (2603:10a6:4:1c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 13:36:28 +0000 Received: from VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:e0:cafe::aa) by AM6PR01CA0072.outlook.office365.com (2603:10a6:20b:e0::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24 via Frontend Transport; Wed, 4 May 2022 13:36:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT101.mail.protection.outlook.com (10.152.13.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 13:36:28 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org, Rob Herring Subject: [PATCH V3 1/5] dt-bindings: iio: accel: sca3300: Document murata,scl3300 Date: Wed, 4 May 2022 13:36:08 +0000 Message-Id: <20220504133612.604304-2-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 447b2e6f-5460-45d2-ab7a-08da2dd317b4 X-MS-TrafficTypeDiagnostic: DB6PR0601MB2246:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wzCPpdrWpIHDEBlZn5iUYtbBoS87ZiisUlkRBOzBT6XRzjeE6qNXj8GFSsvr+xTj54oMWY0ex8nFB7hfHOKD2lQdxHo9OxkoN+Zf7hTHu/9GQrGomRm208qcTw7973bFhDpCIPPTr4+96+IArsem6y/CNIWqlk9M9qK0N0euZB8U4RbujsU5IdOBChp7P9+vsVT2qsg0kJ/FNpFkmICc58D5uYDb1ouu5b1DhGT8eSK1rxMTqC5/bhvFWaRpiTfbcTJRrKIN9YkItaerYw8LNOw0R1YMGY2miGZJY/YWa5vy9HNBS48g7AHRl+pEYbusLXk86aKFxd957NsojjQg2hmnaa2HLjU0AHkgdJkGnwzWCJctH5td8MOgQ3Ds7h73BV5qxvVXPtHXGOIDO/OC1HC0IxrcyCLbRF8CVYJ0lewkLZ0LKlIQr/alezdFu8JKYkqXDilhFfXNFTDwMviy5vfa8syJ/CTUJIUrDYONK97wXRecWqsWEopWyD+26g0B2Ll82WRKqEDxPzHW6b6tK92xnzxIRe5zNzTuWGB6+k5sWsDlLegN1jkShgtjoxosTEpyWQ3XuPdpeGWOsu5k/qDzWf75VuEyyqpibd46eX7ua8nU8ncqjilGXImO0FrxGERK/xKtvGntMxtRczWmTqqdhijemNme3rWFF3AAH1RjGqJc4jXC4Zo5OBVRwe3V X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:aherlnxbspsrv01.lgs-net.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(36736006)(70586007)(6506007)(508600001)(5660300002)(4744005)(316002)(6486002)(86362001)(4326008)(356005)(8676002)(70206006)(81166007)(8936002)(6666004)(36756003)(956004)(2616005)(186003)(40460700003)(1076003)(47076005)(336012)(82310400005)(36860700001)(2906002)(6512007)(26005)(118246002);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 13:36:28.3068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 447b2e6f-5460-45d2-ab7a-08da2dd317b4 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[aherlnxbspsrv01.lgs-net.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0601MB2246 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add DT bindings for Murata scl3300 inclinometer. Reviewed-by: Rob Herring Reviewed-by: Andy Shevchenko Reviewed-by: Jonathan Cameron Signed-off-by: LI Qingwu --- Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml b/Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml index 55fd3548e3b6..f6e2a16a710b 100644 --- a/Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml +++ b/Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml @@ -17,6 +17,7 @@ properties: compatible: enum: - murata,sca3300 + - murata,scl3300 reg: maxItems: 1 From patchwork Wed May 4 13:36:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12837950 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 464F1C433FE for ; Wed, 4 May 2022 13:36:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350662AbiEDNkS (ORCPT ); Wed, 4 May 2022 09:40:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350673AbiEDNkQ (ORCPT ); Wed, 4 May 2022 09:40:16 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2136.outbound.protection.outlook.com [40.107.20.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7F6627FC8; Wed, 4 May 2022 06:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VS9yQ9otSjXwYPSAxLaKNPT2/aJq1k6/iuenTlx5XrZtjm8a5uIqJ2X8ghJBYn9EWFPofSpwSJH8CKRuxQ1TNWAEGOdo54IW+U2/jC6euT1xOovPtslvDveFmpG7mCwVTNrQw0yiAsXJrOTt4BVPEzRxUw3QSw71H7VnNrEgrMrrySwh2fC0aGOuqFKlp84geQ7SQaqeGSqhoE9y7532ZwzSmAPTf7xAh/67T6mmen2bNEvW58WNn2htw4Zg9zPb6DZeg0DN3r0GZl3O1G0yj62NvegD6QdgRtBnjRWBj5qhB9wFJ4rNu9tXCYzejzA7X2IErL+FnKr0i8xmizaHBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mJUmEvv2c6LraUNp/KlZPX+OSdAyISjFAXhudAgYtDM=; b=HusOqUCXV0cQJE9l92q3L5k4U+Jv/cJ7zl+cjOuL1QsqfLjO1AuXgPtPn0BqNNaNapb4YnLuw7Ti3BDePWqcaOAHEsHCwj3GA14AXR0jRwcHguIwEWaVYhVny2bs+vKapwnhRKnVs6CWyLpKnnA+taJ/0i8tAhBoClVqHr0Vv0FIZTdmLa/xmvrOg/YMRudc98gC4tfii5rH0xc3iy3a65pHoBkA7gI1yJWSACcB593dtBPXFb0aPtsk31rmPFv//GhpaGaBnac6+W5w99/NGDNYJC+0GzM70ShmEpDvSaAHi7khKSNNP6KhdTlumX4bm0gAru8BT7WnSasY8AbjNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=kernel.org smtp.mailfrom=leica-geosystems.com.cn; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com.cn; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com.cn; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mJUmEvv2c6LraUNp/KlZPX+OSdAyISjFAXhudAgYtDM=; b=oyL2695Jr0jlLmBIyexZolK7nuLaLK0e7ahFQv9Su74nPLdVNVPu9XX/M0P7DjFF81xmKw7cshzFkzKVh7PXnnvRPmRJ3uzTfrUS5wIwXJOlg6t8iWR7Zl3JEZ7MSIZysi0vX21l2jx4lYhta6FVvuYlpw48huziEsneQjpRhTY= Received: from AM6PR01CA0062.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::39) by HE1PR0601MB2634.eurprd06.prod.outlook.com (2603:10a6:3:56::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Wed, 4 May 2022 13:36:31 +0000 Received: from VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:e0:cafe::c3) by AM6PR01CA0062.outlook.office365.com (2603:10a6:20b:e0::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24 via Frontend Transport; Wed, 4 May 2022 13:36:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT101.mail.protection.outlook.com (10.152.13.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 13:36:30 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org, Rob Herring Subject: [PATCH V3 2/5] iio: accel: sca3300: add define for temp channel for reuse. Date: Wed, 4 May 2022 13:36:09 +0000 Message-Id: <20220504133612.604304-3-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65cfd1e6-9a8d-49e8-1ebd-08da2dd31913 X-MS-TrafficTypeDiagnostic: HE1PR0601MB2634:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iONPeTdKqYmU9qetYyEeJcNLXf7edUpzS95/lfkmD5tFtMZxqVQ1LbT0vcdtEWT9H8FF62oTZWWf43FbqAxUuO7xnUJgyADJL+hnkSFC+VmMpU4oNPJd+laTe+hCgFY5Nd6gjlLCJg7saE6p+BsxUcFOurghMtlaKqenXDpSAK9usnOESQfDkzweS3pc6bLPu4AiNlx5R6Ck6cgh0ol1wdJTpzivJaOq7RiS76jQbHx7NIxx3qHGouGjOfEhg2mLkTvWczKWsWO15KgOGvD5Ar1/3tw81ucW9+HHVPW62US9AaFgvqvteNVQ4xJuZUMr3DwnGcQTRrngcnVwJ0OPIuoptEv4YlkfreHi460LvjA++EIWcRwXweJhJSGdgD0meFzr7x0Qui7JIxH75jwaWS0VJPwuzX6fhnCWPKFPmX8qi+UDlKmyHFDGXM71jedwGcCy8g7dvGJbgCoXujM0Fm6iy4BicjxJmM5Dfa6rK5B8drK8JsSHcb/kSfC8ebEIy8GKlSrTupCkyfOEpvGA2tSsouNfFt3/EVkpdJ5FSrK1Oz/Jbnq1SeoRYlmOz424pREi/Dy9a2FW4/kmczJzkIXe7v/InbEbmZ5DMI2/iaLebGZ7tp1HIuXvj+pNlGFEnsDHcUlwjFIwwDBWD959ylrBIDTvYwcMoYLeWOsoAmNMCTRW3+IbwMFazeElABr3 X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:aherlnxbspsrv01.lgs-net.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(336012)(186003)(40460700003)(6512007)(26005)(6666004)(1076003)(5660300002)(6506007)(36860700001)(956004)(2616005)(83380400001)(47076005)(2906002)(8936002)(82310400005)(8676002)(36736006)(4326008)(70206006)(70586007)(6486002)(316002)(508600001)(118246002)(356005)(36756003)(86362001)(81166007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 13:36:30.6035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65cfd1e6-9a8d-49e8-1ebd-08da2dd31913 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[aherlnxbspsrv01.lgs-net.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0601MB2634 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add define of SCA3300_TEMP_CHANNEL for reuse. Reviewed-by: Rob Herring Reviewed-by: Andy Shevchenko Reviewed-by: Jonathan Cameron Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index f7ef8ecfd34a..ff16d2cc8c70 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -72,22 +72,24 @@ enum sca3300_scan_indexes { }, \ } +#define SCA3300_TEMP_CHANNEL(index, reg) { \ + .type = IIO_TEMP, \ + .address = reg, \ + .scan_index = index, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .scan_type = { \ + .sign = 's', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_CPU, \ + }, \ +} + static const struct iio_chan_spec sca3300_channels[] = { SCA3300_ACCEL_CHANNEL(SCA3300_ACC_X, 0x1, X), SCA3300_ACCEL_CHANNEL(SCA3300_ACC_Y, 0x2, Y), SCA3300_ACCEL_CHANNEL(SCA3300_ACC_Z, 0x3, Z), - { - .type = IIO_TEMP, - .address = 0x5, - .scan_index = SCA3300_TEMP, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .scan_type = { - .sign = 's', - .realbits = 16, - .storagebits = 16, - .endianness = IIO_CPU, - }, - }, + SCA3300_TEMP_CHANNEL(SCA3300_TEMP, 0x05), IIO_CHAN_SOFT_TIMESTAMP(4), }; From patchwork Wed May 4 13:36:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12837949 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E812CC433F5 for ; Wed, 4 May 2022 13:36:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350641AbiEDNkR (ORCPT ); Wed, 4 May 2022 09:40:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350663AbiEDNkQ (ORCPT ); Wed, 4 May 2022 09:40:16 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60110.outbound.protection.outlook.com [40.107.6.110]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E267924BC9; Wed, 4 May 2022 06:36:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=APLUdT6iyOJHNxSK2VsScME3WLSsPMJQ/fpsiL8dORcSoUsYzykw85Ua/oHUIID2fsRUu3xO/Lr1vVLV7Au+LmqWqaREQ8qfXxNoQf4xtRD8iNbuZkuvGbyY8cB5GJTRSv7wf2g5oMCsjM6jZ4UJ2pFs4Luw/ibVOU6nKgcqKV2CpODOxX1d39BFOedtdfb+6q/PDZZCVSzHpapQVasUHPdEZfFNNrcUL7MuXNsSZU4JaQ+sGcNzB3QNFPN+E7XjuByvUAtotfLhs3ZpPdbRW1UR/NEVMYzsRfeFZeXMSF2ZVO5sw0d6+sH4yM7jB5A1sJiKYZHyLYHO7xep//8v2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3xCGUCuSDLGTJuXRZI98hvUTqJnk0E2N7Q+HvE5qIAU=; b=NXFh1/82OwKRdbr3Q1plVhG5ScjxY43xxsCAFt2cEI1dpxlXTgLrt+5kSywgPXFMar5ccH4HRMNV+oMBCid3ijXgSW3wH91kgv+F5300NQFA+CK6rQzoVKq0bzw5rQYz+0hVSaYxtOfmW4V3/st56INk9N1JUSyeQxlp+TIoQ2PTXs+Uabjkd+1fqRI+hZCerjIgUOGGakUYR5vcsi/3es/2jjah+GNxqQ8Bc/hNbteFWI667SVXdp5/ip8YFG1+Q8oAjORJjbgWK3LH8pbnVtsmZDvW8u9648wJMx05EdNh1bhrUrFllQrAgROdScuoGT17jHHHx3hlLOxDSgoGkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=kernel.org smtp.mailfrom=leica-geosystems.com.cn; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com.cn; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com.cn; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3xCGUCuSDLGTJuXRZI98hvUTqJnk0E2N7Q+HvE5qIAU=; b=Ss0P8PwxwYAt4msovAXh0t3QWmq7p3ZIeiYaqd7PFP8j+WcEbdbsgHeM83snT9ss5j1mpqqwZTY+se8JxTZvdmJMMEX/Zp6cUY/41BRX6FzjxvcdGkCKUEYDV6p5ra5Nqng0M9wbl598i+WKVmtGYDyJ4ue+JFNJdx56xiD5QpQ= Received: from AM6PR01CA0045.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::22) by AM0PR06MB5619.eurprd06.prod.outlook.com (2603:10a6:208:11d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Wed, 4 May 2022 13:36:33 +0000 Received: from VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:e0:cafe::d2) by AM6PR01CA0045.outlook.office365.com (2603:10a6:20b:e0::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14 via Frontend Transport; Wed, 4 May 2022 13:36:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT101.mail.protection.outlook.com (10.152.13.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 13:36:32 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org, Rob Herring Subject: [PATCH V3 3/5] iio: accel: sca3300: modified to support multi chips Date: Wed, 4 May 2022 13:36:10 +0000 Message-Id: <20220504133612.604304-4-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 603aa8f8-a816-4867-e3d6-08da2dd31a41 X-MS-TrafficTypeDiagnostic: AM0PR06MB5619:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iYm2wVEZlJA2QzCs3oTNlcFqKby98sm5HurJqgFJN0JJTCuvHruGa5w+/ByWbIumYLTLlc4FfXH1RItDDhZtpwNZPaJ9VjlE9jIhwuvS/YY+pLIyx06HCwK5S2iwIVbKCBkEUfZ+N87Df/uXYVYmU29gaTLTK16f9LKvtYa1MvWnuXEvr7eW/11eqoolcNWTNBwt0RUZ3NUOBFVFIZtOi40z4/B4KHHP3sj2VZU9zGEG4prGiQmj/e4ou11ccLbFPP2ddTyi9Chl2lAUjq0F4ER6wPrVirBFg6lZzsijRutHwUGohaGBJHkcQb2UbWf0+yBbBpp5DMm9D13vgCqq8hLwtshvYuWx/kjr3MlfbpUZ3zgUtUi4Be8eYvFNB0LUZQu3LCfHSj7hcXIbBOeBDCVZBfRrbtqiTJZfp4Sd8ymBfRa3koRvh1ZmHmVlcacRklYW3+ekvBMm817/P873CBWyngPQQNMhwSeyYRwylCsK020tFRTSxmIBJz+s1Zv3eME+BhQxKp0gsFdSrWeFnLxpbzdiaXpPtOYK8NO7IzKzX11kAh0dKRmktvQEi6VDtqrH5BHqqrQY77WROLBFrH6asHMkIZ7j991ppPhwOkqpX+zrmIyXxhOHPWNuUZljaG324gFJj9cvt3dVlr9x4fPvCCN56GDRQHz4zYmVlmJ3xWFb3wUZzi79MJwqD7Fm X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:aherlnxbspsrv01.lgs-net.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(70586007)(70206006)(40460700003)(356005)(8936002)(83380400001)(26005)(118246002)(82310400005)(8676002)(4326008)(6512007)(36736006)(6666004)(316002)(6506007)(6486002)(2906002)(86362001)(336012)(36756003)(1076003)(47076005)(508600001)(186003)(956004)(2616005)(36860700001)(81166007)(5660300002);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 13:36:32.5878 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 603aa8f8-a816-4867-e3d6-08da2dd31a41 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[aherlnxbspsrv01.lgs-net.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR06MB5619 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The drive support sca3300 only. There are some other similar chips, for instance, SCL3300. Prepare the way for multiple chips and additional channels. Modify the driver to read the device id. Add the tables for the corresponding id to support multiple chips. Add prepares for the addition of extra channels. Add prepares for handling the operation modes for multiple chips. Reviewed-by: Rob Herring Reviewed-by: Andy Shevchenko Reviewed-by: Jonathan Cameron Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 180 ++++++++++++++++++++++++++++-------- 1 file changed, 141 insertions(+), 39 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index ff16d2cc8c70..1e0e6a2f7a63 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -37,7 +37,6 @@ /* Device ID */ #define SCA3300_REG_WHOAMI 0x10 -#define SCA3300_WHOAMI_ID 0x51 /* Device return status and mask */ #define SCA3300_VALUE_RS_ERROR 0x3 @@ -93,15 +92,35 @@ static const struct iio_chan_spec sca3300_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(4), }; -static const int sca3300_lp_freq[] = {70, 70, 70, 10}; -static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}, {0, 185}}; +static const int sca3300_freq_tbl[] = {70, 10}; +static const int sca3300_freq_modes_map[] = {0, 0, 0, 1}; +static const int sca3300_accel_scale_tbl[][2] = {{0, 370}, {0, 741}, {0, 185}}; +static const int sca3300_accel_scale_modes_map[] = {0, 1, 2, 2}; + +static const int sca3300_avail_modes_map[] = {0, 1, 2, 3}; static const unsigned long sca3300_scan_masks[] = { BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | BIT(SCA3300_TEMP), 0 }; +struct sca3300_chip_info { + const struct iio_chan_spec *channels; + const int (*accel_scale_table)[2]; + const int *accel_scale_modes_map; + const unsigned long *scan_masks; + const int *avail_modes_table; + const int *freq_modes_map; + const int *freq_table; + const u8 num_accel_scales; + const u8 num_avail_modes; + const u8 num_channels; + const u8 num_freqs; + const u8 chip_id; + const char *name; +}; + /** * struct sca3300_data - device data * @spi: SPI device structure @@ -117,10 +136,28 @@ struct sca3300_data { s16 channels[4]; s64 ts __aligned(sizeof(s64)); } scan; + const struct sca3300_chip_info *chip; u8 txbuf[4] ____cacheline_aligned; u8 rxbuf[4]; }; +static const struct sca3300_chip_info sca3300_chip_tbl[] = { + { .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale_tbl)*2, + .accel_scale_modes_map = sca3300_accel_scale_modes_map, + .accel_scale_table = sca3300_accel_scale_tbl, + .num_channels = ARRAY_SIZE(sca3300_channels), + .freq_modes_map = sca3300_freq_modes_map, + .avail_modes_table = sca3300_avail_modes_map, + .freq_table = sca3300_freq_tbl, + .scan_masks = sca3300_scan_masks, + .channels = sca3300_channels, + .num_avail_modes = 4, + .name = "sca3300", + .chip_id = 0x51, + .num_freqs = 2, + }, +}; + DECLARE_CRC8_TABLE(sca3300_crc_table); static int sca3300_transfer(struct sca3300_data *sca_data, int *val) @@ -227,36 +264,80 @@ static int sca3300_write_reg(struct sca3300_data *sca_data, u8 reg, int val) return sca3300_error_handler(sca_data); } +static int sca3300_set_op_mode(struct sca3300_data *sca_data, int index) +{ + int mode; + + if ((index < 0) || (index >= sca_data->chip->num_avail_modes)) + return -EINVAL; + + mode = sca_data->chip->avail_modes_table[index]; + + return sca3300_write_reg(sca_data, SCA3300_REG_MODE, mode); +} + +static int sca3300_get_op_mode(struct sca3300_data *sca_data, int *index) +{ + int reg_val; + int ret; + int i; + + ret = sca3300_read_reg(sca_data, SCA3300_REG_MODE, ®_val); + if (ret) + return ret; + + for (i = 0; i < sca_data->chip->num_avail_modes; i++) { + if (sca_data->chip->avail_modes_table[i] == reg_val) { + *index = i; + break; + } + } + + return ret; +} + static int sca3300_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int val, int val2, long mask) { struct sca3300_data *data = iio_priv(indio_dev); + int mode = -1; int reg_val; + int index; int ret; int i; switch (mask) { case IIO_CHAN_INFO_SCALE: - if (val) + if (chan->type != IIO_ACCEL) return -EINVAL; - - for (i = 0; i < ARRAY_SIZE(sca3300_accel_scale); i++) { - if (val2 == sca3300_accel_scale[i][1]) - return sca3300_write_reg(data, SCA3300_REG_MODE, i); + for (i = 0; i < data->chip->num_avail_modes; i++) { + index = data->chip->accel_scale_modes_map[i]; + if ((val == data->chip->accel_scale_table[index][0]) && + (val2 == data->chip->accel_scale_table[index][1])) { + mode = i; + break; + } } - return -EINVAL; - + return sca3300_set_op_mode(data, mode); case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_val); + ret = sca3300_get_op_mode(data, ®_val); if (ret) return ret; - /* freq. change is possible only for mode 3 and 4 */ - if (reg_val == 2 && val == sca3300_lp_freq[3]) - return sca3300_write_reg(data, SCA3300_REG_MODE, 3); - if (reg_val == 3 && val == sca3300_lp_freq[2]) - return sca3300_write_reg(data, SCA3300_REG_MODE, 2); - return -EINVAL; + index = data->chip->accel_scale_modes_map[reg_val]; + for (i = 0; i < data->chip->num_avail_modes; i++) { + int index_new = data->chip->accel_scale_modes_map[i]; + int index_freq = data->chip->freq_modes_map[i]; + + if (val == data->chip->freq_table[index_freq]) { + if (data->chip->accel_scale_table[index] == + data->chip->accel_scale_table[index_new]) { + mode = i; + break; + } + } + } + return sca3300_set_op_mode(data, mode); default: return -EINVAL; } @@ -267,8 +348,9 @@ static int sca3300_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct sca3300_data *data = iio_priv(indio_dev); - int ret; int reg_val; + int index; + int ret; switch (mask) { case IIO_CHAN_INFO_RAW: @@ -277,17 +359,25 @@ static int sca3300_read_raw(struct iio_dev *indio_dev, return ret; return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_val); + ret = sca3300_get_op_mode(data, ®_val); if (ret) return ret; - *val = 0; - *val2 = sca3300_accel_scale[reg_val][1]; - return IIO_VAL_INT_PLUS_MICRO; + switch (chan->type) { + case IIO_ACCEL: + index = data->chip->accel_scale_modes_map[reg_val]; + *val = data->chip->accel_scale_table[index][0]; + *val2 = data->chip->accel_scale_table[index][1]; + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_val); + + ret = sca3300_get_op_mode(data, ®_val); if (ret) return ret; - *val = sca3300_lp_freq[reg_val]; + index = data->chip->freq_modes_map[reg_val]; + *val = data->chip->freq_table[index]; return IIO_VAL_INT; default: return -EINVAL; @@ -331,6 +421,7 @@ static int sca3300_init(struct sca3300_data *sca_data, { int value = 0; int ret; + int i; ret = sca3300_write_reg(sca_data, SCA3300_REG_MODE, SCA3300_MODE_SW_RESET); @@ -347,12 +438,22 @@ static int sca3300_init(struct sca3300_data *sca_data, if (ret) return ret; - if (value != SCA3300_WHOAMI_ID) { - dev_err(&sca_data->spi->dev, - "device id not expected value, %d != %u\n", - value, SCA3300_WHOAMI_ID); + for (i = 0; i < ARRAY_SIZE(sca3300_chip_tbl); i++) { + if (sca3300_chip_tbl[i].chip_id == value) + break; + } + if (i == ARRAY_SIZE(sca3300_chip_tbl)) { + dev_err(&sca_data->spi->dev, "Invalid chip %x\n", value); return -ENODEV; } + + indio_dev->available_scan_masks = sca3300_chip_tbl[i].scan_masks; + indio_dev->num_channels = sca3300_chip_tbl[i].num_channels; + indio_dev->channels = sca3300_chip_tbl[i].channels; + sca_data->chip = &sca3300_chip_tbl[i]; + indio_dev->name = sca3300_chip_tbl[i].name; + indio_dev->modes = INDIO_DIRECT_MODE; + return 0; } @@ -384,15 +485,21 @@ static int sca3300_read_avail(struct iio_dev *indio_dev, const int **vals, int *type, int *length, long mask) { + struct sca3300_data *data = iio_priv(indio_dev); switch (mask) { case IIO_CHAN_INFO_SCALE: - *vals = (const int *)sca3300_accel_scale; - *length = ARRAY_SIZE(sca3300_accel_scale) * 2 - 2; - *type = IIO_VAL_INT_PLUS_MICRO; - return IIO_AVAIL_LIST; + switch (chan->type) { + case IIO_ACCEL: + *vals = (const int *)data->chip->accel_scale_table; + *length = data->chip->num_accel_scales; + *type = IIO_VAL_INT_PLUS_MICRO; + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - *vals = &sca3300_lp_freq[2]; - *length = 2; + *vals = (const int *)data->chip->freq_table; + *length = data->chip->num_freqs; *type = IIO_VAL_INT; return IIO_AVAIL_LIST; default: @@ -424,11 +531,6 @@ static int sca3300_probe(struct spi_device *spi) crc8_populate_msb(sca3300_crc_table, SCA3300_CRC8_POLYNOMIAL); indio_dev->info = &sca3300_info; - indio_dev->name = SCA3300_ALIAS; - indio_dev->modes = INDIO_DIRECT_MODE; - indio_dev->channels = sca3300_channels; - indio_dev->num_channels = ARRAY_SIZE(sca3300_channels); - indio_dev->available_scan_masks = sca3300_scan_masks; ret = sca3300_init(sca_data, indio_dev); if (ret) { From patchwork Wed May 4 13:36:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12837951 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6062AC433EF for ; Wed, 4 May 2022 13:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350719AbiEDNkY (ORCPT ); Wed, 4 May 2022 09:40:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350664AbiEDNkV (ORCPT ); Wed, 4 May 2022 09:40:21 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2134.outbound.protection.outlook.com [40.107.22.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DD0522B28; Wed, 4 May 2022 06:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eoemqdYXkn8Cr2q2eTg56OTQEGsuXqcxSYujDmJhs27zSWM8N3P/1QGyJdVAL4ImQoh58rssQHhDWZ7IpUHhv2V4jBok+qr8HSDVV+GVJhxsx4TaqKfrwjknpIpLDWYSf37h/3MK9ivwbtppLZpD60R5E2EfaikhSc+CY09zRTaN3JpE4OfUMqqAXh69mz3JeCPU+mL7brGt1jx7C4tPk72EVS/DNlOIpDav8ZbuJoqQYwUtrdZ7BhD9jZwzWfMWn1RUE21N3aZm7GlzjRbLoObsixguR9IAmj7cE53O8zwrf4kvQIOK5QUndM6GhJ4rrHnUBukxFNtBEXBsrxL/6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rUw7FLnItlo2Z/rcvGSTRTNbb9vIGIeuEh5QsFtFNVM=; b=CzcM7wyQNde32q6Tn+GLbmhJyDvfbhlfPAzQl6mDFg58WICWkSHXl4y99QuquJDcJ/u7zHDewEFSTV09hF2f9zhuznp1VFSzUMVrDgsprpnqYmwJI2knmJGLqOTDdDl5BhoWC5Mvetza/93dBODaNxQzKLxbbaCsoZfm4VPOTTfZ89vtc7WGOA23ioAX85Nn5tAuspvPwyAjQzKfkofO4UwazmNEHkv4hbubOE8iSHn4xrMxKmDteczag4jUeI4ySqwwiy5cN3wzZNVD8GpuPHx7w0gULnAs83E1K02ijRtDmqRfxsZch7SwjMED6As3QY13jvtUZq5INvjyHBzazA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=kernel.org smtp.mailfrom=leica-geosystems.com.cn; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com.cn; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com.cn; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rUw7FLnItlo2Z/rcvGSTRTNbb9vIGIeuEh5QsFtFNVM=; b=JKX2Nrtykw3tlmh+6WaoeGqjmgUspWpJhsgxMd6YHJL4DUmI582bz48e2NV7bvuVYCXo3uiJZUdKJYrRlFqwm+uVvM8mz8fliQ/E7bbXcDjSWNAqYHEWFgYz94wmR7B3x6biHiO3xR1yPDTKZqqJzC7Fv04qwup8XiLsZiIhOLc= Received: from AM6PR01CA0050.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::27) by DB7PR06MB4725.eurprd06.prod.outlook.com (2603:10a6:10:56::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Wed, 4 May 2022 13:36:41 +0000 Received: from VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:e0:cafe::ae) by AM6PR01CA0050.outlook.office365.com (2603:10a6:20b:e0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Wed, 4 May 2022 13:36:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT101.mail.protection.outlook.com (10.152.13.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 13:36:37 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org, Rob Herring Subject: [PATCH V3 4/5] iio: accel: sca3300: Add support for SCL3300 Date: Wed, 4 May 2022 13:36:11 +0000 Message-Id: <20220504133612.604304-5-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5ae4aed-99d6-43bb-d4de-08da2dd31d8d X-MS-TrafficTypeDiagnostic: DB7PR06MB4725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gDGlRPxpLFPPCHR1y+f+bR0PyTXjTpAEfV1x2M2WKHDWJepRFgggdIZ6oVt/Vb+7seBitD1HQmC1zvOCBD9Y2iUzlCN5ZiBoV57BLMawKZUHC4DEF1aj19uuU6xSVILMCOdZMbShQKWoWainkdg7M6MjnvPhzPkXXWzhn5OilyunCk3P0sJ1U0VLt3xCIW/gx1BfHIdESAaQkUdWEZ7T73JM4zudc+MGmNQdWUmnpJaUk3Q3slbvxHsY543zx5nGjGkALXj3ydL44qet9vAaj0qZ/FYU4yYkR70HCYNWmcjOookpt+yeUs+DsAcu2Koe3IIqK+zLV7y6lpLyUAi7/VqJzjpdsk4Z0i9DVSELQe5etd9T4C8ui1oJGGKAtJiBv2T0JE9VryByBV8JtpTh+SJdKxdUiM48MgC5OUd0e/4di2yd2ElYl94wiwAAIs/BgigubZqfzaTFmms8UTCwVddlgAXEquf5fv9X6b9xv5KMC51ysHW9E+vMHudglbwckYbBQqdNeEKScJ3DcuO4AYOXyUf8Aj5nJ/ZqATVOlh3UFkzPt4qXKUcqG7jrEVqp5QFtv5cVPimpl06jC5x5BRCWM6V9NLgrorDg78TXgyK6DrOKCl1ZWZQqeJlvlREAZvueoZQaFrMTtv/0f6CrcuikUd/wQQmJjl8dfQtQ51ImFBeaqLGbCvcjbpERT1kwaOfu55VSHtXT9g8SSNaBbzhlmOfyqHQoIyzy9FyHB5VNOen3QM1W/2sU8unukl5TbVd4tKNukiJtYWM+XX1N9Q== X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:aherlnxbspsrv01.lgs-net.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(956004)(2616005)(118246002)(82310400005)(316002)(47076005)(8936002)(15974865002)(26005)(1076003)(6666004)(6506007)(6512007)(4326008)(81166007)(356005)(36736006)(36860700001)(508600001)(186003)(336012)(8676002)(70586007)(70206006)(40460700003)(2906002)(36756003)(6486002)(5660300002)(86362001);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 13:36:37.4468 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5ae4aed-99d6-43bb-d4de-08da2dd31d8d X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[aherlnxbspsrv01.lgs-net.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR06MB4725 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add support for Murata SCL3300, a 3-axis MEMS accelerometer. Same as SCA3300, it has the accelerometer and temperature output. Datasheet: www.murata.com/en-us/products/sensor/inclinometer/overview/lineup/scl3300 Reviewed-by: Rob Herring Reviewed-by: Andy Shevchenko Reviewed-by: Jonathan Cameron Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index 1e0e6a2f7a63..040f8e1a1327 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -93,12 +93,17 @@ static const struct iio_chan_spec sca3300_channels[] = { }; static const int sca3300_freq_tbl[] = {70, 10}; +static const int scl3300_freq_tbl[] = {40, 70, 10}; static const int sca3300_freq_modes_map[] = {0, 0, 0, 1}; +static const int scl3300_freq_modes_map[] = {0, 1, 2}; static const int sca3300_accel_scale_tbl[][2] = {{0, 370}, {0, 741}, {0, 185}}; +static const int scl3300_accel_scale_tbl[][2] = {{0, 167}, {0, 333}, {0, 83}}; static const int sca3300_accel_scale_modes_map[] = {0, 1, 2, 2}; +static const int scl3300_accel_scale_modes_map[] = {0, 1, 2}; static const int sca3300_avail_modes_map[] = {0, 1, 2, 3}; +static const int scl3300_avail_modes_map[] = {0, 1, 3}; static const unsigned long sca3300_scan_masks[] = { BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | BIT(SCA3300_TEMP), @@ -156,6 +161,20 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .chip_id = 0x51, .num_freqs = 2, }, + { .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale_tbl)*2, + .accel_scale_modes_map = scl3300_accel_scale_modes_map, + .accel_scale_table = scl3300_accel_scale_tbl, + .num_channels = ARRAY_SIZE(sca3300_channels), + .avail_modes_table = scl3300_avail_modes_map, + .freq_modes_map = scl3300_freq_modes_map, + .scan_masks = sca3300_scan_masks, + .freq_table = scl3300_freq_tbl, + .channels = sca3300_channels, + .num_avail_modes = 3, + .name = "scl3300", + .chip_id = 0xC1, + .num_freqs = 3, + }, }; DECLARE_CRC8_TABLE(sca3300_crc_table); @@ -558,6 +577,7 @@ static int sca3300_probe(struct spi_device *spi) static const struct of_device_id sca3300_dt_ids[] = { { .compatible = "murata,sca3300"}, + { .compatible = "murata,scl3300"}, {} }; MODULE_DEVICE_TABLE(of, sca3300_dt_ids); From patchwork Wed May 4 13:36:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12837952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70E00C433F5 for ; Wed, 4 May 2022 13:37:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234844AbiEDNki (ORCPT ); Wed, 4 May 2022 09:40:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350708AbiEDNk1 (ORCPT ); Wed, 4 May 2022 09:40:27 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2123.outbound.protection.outlook.com [40.107.22.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C10EB3614F; Wed, 4 May 2022 06:36:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AvNiPCAXt23f778ImrUffWqEwKxcwwKve70+BhtjJy9dV1H5ZuYI45ZEg/w6Kym/5WeGvGD3cUomHcMSonWbwNI6s/XcFeWjjB+XeYTBWl4gW4Vo2q5kTdxPI/ho8LtZD4AGyqL7QLy2CGVE6Byz8YjUah4o3N+VdmUYv0EiaHKViRsOMcMwn3aEAPO/mq5ljV1H5xTv+/aejRCS+FH3J+0CcCqDFKjAE7lXkwzGNPN1WItAo8h8J69wcYi6nwA/iWUd9i3HR8XcLS9SXr9++6J30Al7QtqBQrjgWHfOwsE940QcK5s2bstgZ6T5IrsNOYogKbvhYN0Z+k4VAyAKbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pv387veeJ6c1xKTg3sZrPRvXDxHr1F0viAZWDAMLkE8=; b=GlKOKgkIfoHwGT5bL40oAbqI43mCC92iv6iTWdEQuuXyNGEfZ7xKNNSUBG+PlNapHBNu+e4xKQgPqarrunq1f9VHWd0COwmzY53W6sOQyLAY0x4Ov2C36PDEBjrUOOaoQOtLJDsKdgSN0CINW4rEjH5gj3mfaYe7mF1zfwbiju7j3uvzKbHaFB18PuvPO0e4Q4wKrGsrw/boNmZJZIGpJjwz/Lqxk+fYGV+4rYqGIRdAd+o1eFSpdjeZaveYg3G5c8JrAICW8ECM9oCPie/Cbjx/1guLvLx7Ou1aRE5N3DIwULyBM1usbx9+MMeR0zs/mF6TO448MesXk8wQHoWuTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=kernel.org smtp.mailfrom=leica-geosystems.com.cn; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=leica-geosystems.com.cn; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com.cn; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pv387veeJ6c1xKTg3sZrPRvXDxHr1F0viAZWDAMLkE8=; b=Tyf0I3xs+/MpZzKyJpgXqJFZDTmXqSlVD27h5mQLpAV9GhTwR63puvwVzcZMQpM7ZdHIvHIWOUV+tDCcoYciQoo2EMqTA9VrqahqaARIWqXo5Kgtuza7TGc6Pgdy6skO6dgLCfovk3GScQecQfQx4EAMo8DzV3Y5iPmjoHXPOb4= Received: from AM6PR01CA0071.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::48) by VI1PR06MB6829.eurprd06.prod.outlook.com (2603:10a6:800:18d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Wed, 4 May 2022 13:36:46 +0000 Received: from VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:e0:cafe::bb) by AM6PR01CA0071.outlook.office365.com (2603:10a6:20b:e0::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Wed, 4 May 2022 13:36:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT101.mail.protection.outlook.com (10.152.13.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 13:36:45 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org, Rob Herring Subject: [PATCH V3 5/5] iio: accel: sca3300: Add inclination channels Date: Wed, 4 May 2022 13:36:12 +0000 Message-Id: <20220504133612.604304-6-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220504133612.604304-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4db919c3-3e81-4f32-b202-08da2dd3220f X-MS-TrafficTypeDiagnostic: VI1PR06MB6829:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M77/197IQVmsNfmvQ3tVR1h8/mY6zyGDeubKE5ucjhkc7KOt5fvgbdlA+9R/HEDNLMM/G8VKU+pzwePtVgD1PPazA0BnvQDdvFpxQmTVlMCB2Nw7AhaB1M/JXygonGYfBaxJg2/ygjZ0zqysWO3Cguf9/bzSmvyeJs8HnlDSqjhNfqMrvCEFgxR5VgXcTDjMSTUBLvrrjptQBXk4o3NbUzHW3QCHYveHWUtNaRy/+xLFQPP1wO8NCgKK3p7DZ2pJGtq9FzRmoxzvCJ2LGhqyRe5U+lZk6rjVpjYHC38zO+d/KeK/4NBMVi/I2NfSAf9XpqvVmVKjvac2vESwLvB8asGZ2jXxnsUXToRyRC37Ege1r+a4LUji6jgUjDbFQKyz9nqY0M6DoROXKMdoGcnfpj360BEq7FBTUkTfR6kDTOuYLi6CkjFigQFpNeXLhnyQYEvKTGJvZDcRPnsi7PmntpcNZxi5UPuqkR++Ad8pz15RmXOIfjyZnYAzMpMVNTgRa1HVk+KxF8duy2aUH5YWKc1f3duAxZS/GDHchpYrHSWxdtSTKPJyWchbN3pp4lCNJq+pIlWXPKlCQ7S4rqp8+nQOn9frBj3elvfjdHuBGbHQ+5tAbRqHCLDPrNje+RBdrhp88clPsVe1BwmY0J31dLLw1Q3lccbuCMAPnsZRrXaoT+hKltUlojssKi2Uisr2 X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:aherlnxbspsrv01.lgs-net.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(82310400005)(81166007)(36860700001)(356005)(316002)(36736006)(70586007)(36756003)(8676002)(4326008)(70206006)(118246002)(83380400001)(40460700003)(6666004)(5660300002)(86362001)(2906002)(26005)(6512007)(2616005)(336012)(47076005)(956004)(6486002)(186003)(8936002)(508600001)(6506007)(1076003);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 13:36:45.6806 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4db919c3-3e81-4f32-b202-08da2dd3220f X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a;Ip=[193.8.40.94];Helo=[aherlnxbspsrv01.lgs-net.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT101.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB6829 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Different from SCA3300, SCL3300 can output inclination angles. Angles are formed from acceleration with following equations: ANG_X = atan2(accx / √(accy^2 + accz^2)), ANG_Y = atan2(accy / √(accx^2 + accz^2)), ANG_Z = atan2(accz / √(accx^2 + accy^2)), The commit adds the output of the raw value, scale and scale_available of angles. New interfaces: in_incli_scale in_incli_scale_available in_incli_x_raw in_incli_y_raw in_incli_z_raw Data converted by application of scale to degrees. Reviewed-by: Rob Herring Reviewed-by: Andy Shevchenko Reviewed-by: Jonathan Cameron Signed-off-by: LI Qingwu Reported-by: kernel test robot --- drivers/iio/accel/sca3300.c | 79 ++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index 040f8e1a1327..cf588f014407 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -42,12 +42,18 @@ #define SCA3300_VALUE_RS_ERROR 0x3 #define SCA3300_MASK_RS_STATUS GENMASK(1, 0) +#define SCA3300_REG_ANG_CTRL 0x0C +#define SCA3300_ANG_ENABLE 0x1F + enum sca3300_scan_indexes { SCA3300_ACC_X = 0, SCA3300_ACC_Y, SCA3300_ACC_Z, SCA3300_TEMP, SCA3300_TIMESTAMP, + SCA3300_INCLI_X, + SCA3300_INCLI_Y, + SCA3300_INCLI_Z, }; #define SCA3300_ACCEL_CHANNEL(index, reg, axis) { \ @@ -71,6 +77,24 @@ enum sca3300_scan_indexes { }, \ } +#define SCA3300_INCLI_CHANNEL(index, reg, axis) { \ + .type = IIO_INCLI, \ + .address = reg, \ + .modified = 1, \ + .channel2 = IIO_MOD_##axis, \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type_available = \ + BIT(IIO_CHAN_INFO_SCALE), \ + .scan_index = index, \ + .scan_type = { \ + .sign = 's', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_CPU, \ + }, \ +} + #define SCA3300_TEMP_CHANNEL(index, reg) { \ .type = IIO_TEMP, \ .address = reg, \ @@ -102,28 +126,54 @@ static const int scl3300_accel_scale_tbl[][2] = {{0, 167}, {0, 333}, {0, 83}}; static const int sca3300_accel_scale_modes_map[] = {0, 1, 2, 2}; static const int scl3300_accel_scale_modes_map[] = {0, 1, 2}; +static const int scl3300_incli_scale_tbl[][2] = {{0, 5495}}; +static const int scl3300_incli_scale_modes_map[] = {0, 0, 0}; + static const int sca3300_avail_modes_map[] = {0, 1, 2, 3}; static const int scl3300_avail_modes_map[] = {0, 1, 3}; + +static const struct iio_chan_spec scl3300_channels[] = { + SCA3300_ACCEL_CHANNEL(SCA3300_ACC_X, 0x1, X), + SCA3300_ACCEL_CHANNEL(SCA3300_ACC_Y, 0x2, Y), + SCA3300_ACCEL_CHANNEL(SCA3300_ACC_Z, 0x3, Z), + SCA3300_TEMP_CHANNEL(SCA3300_TEMP, 0x05), + IIO_CHAN_SOFT_TIMESTAMP(SCA3300_TIMESTAMP), + SCA3300_INCLI_CHANNEL(SCA3300_INCLI_X, 0x09, X), + SCA3300_INCLI_CHANNEL(SCA3300_INCLI_Y, 0x0A, Y), + SCA3300_INCLI_CHANNEL(SCA3300_INCLI_Z, 0x0B, Z), +}; + static const unsigned long sca3300_scan_masks[] = { BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | BIT(SCA3300_TEMP), 0 }; +static const unsigned long scl3300_scan_masks[] = { + BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | + BIT(SCA3300_TEMP) | + BIT(SCA3300_INCLI_X) | BIT(SCA3300_INCLI_Y) | BIT(SCA3300_INCLI_Z), + 0 +}; + struct sca3300_chip_info { const struct iio_chan_spec *channels; const int (*accel_scale_table)[2]; + const int (*incli_scale_table)[2]; const int *accel_scale_modes_map; + const int *incli_scale_modes_map; const unsigned long *scan_masks; const int *avail_modes_table; const int *freq_modes_map; const int *freq_table; const u8 num_accel_scales; + const u8 num_incli_scales; const u8 num_avail_modes; const u8 num_channels; const u8 num_freqs; const u8 chip_id; const char *name; + const bool angle; }; /** @@ -156,24 +206,32 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .freq_table = sca3300_freq_tbl, .scan_masks = sca3300_scan_masks, .channels = sca3300_channels, + .incli_scale_modes_map = NULL, + .incli_scale_table = NULL, + .num_incli_scales = 0, .num_avail_modes = 4, .name = "sca3300", .chip_id = 0x51, .num_freqs = 2, + .angle = false, }, { .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale_tbl)*2, + .num_incli_scales = ARRAY_SIZE(scl3300_incli_scale_tbl)*2, .accel_scale_modes_map = scl3300_accel_scale_modes_map, + .incli_scale_modes_map = scl3300_incli_scale_modes_map, .accel_scale_table = scl3300_accel_scale_tbl, - .num_channels = ARRAY_SIZE(sca3300_channels), + .incli_scale_table = scl3300_incli_scale_tbl, + .num_channels = ARRAY_SIZE(scl3300_channels), .avail_modes_table = scl3300_avail_modes_map, .freq_modes_map = scl3300_freq_modes_map, .scan_masks = sca3300_scan_masks, .freq_table = scl3300_freq_tbl, - .channels = sca3300_channels, + .channels = scl3300_channels, .num_avail_modes = 3, .name = "scl3300", .chip_id = 0xC1, .num_freqs = 3, + .angle = true, }, }; @@ -382,6 +440,11 @@ static int sca3300_read_raw(struct iio_dev *indio_dev, if (ret) return ret; switch (chan->type) { + case IIO_INCLI: + index = data->chip->incli_scale_modes_map[reg_val]; + *val = data->chip->incli_scale_table[index][0]; + *val2 = data->chip->incli_scale_table[index][1]; + return IIO_VAL_INT_PLUS_MICRO; case IIO_ACCEL: index = data->chip->accel_scale_modes_map[reg_val]; *val = data->chip->accel_scale_table[index][0]; @@ -473,6 +536,13 @@ static int sca3300_init(struct sca3300_data *sca_data, indio_dev->name = sca3300_chip_tbl[i].name; indio_dev->modes = INDIO_DIRECT_MODE; + if (sca_data->chip->angle) { + ret = sca3300_write_reg(sca_data, SCA3300_REG_ANG_CTRL, + SCA3300_ANG_ENABLE); + if (ret) + return ret; + } + return 0; } @@ -508,6 +578,11 @@ static int sca3300_read_avail(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_SCALE: switch (chan->type) { + case IIO_INCLI: + *vals = (const int *)data->chip->incli_scale_table; + *length = data->chip->num_incli_scales; + *type = IIO_VAL_INT_PLUS_MICRO; + return IIO_AVAIL_LIST; case IIO_ACCEL: *vals = (const int *)data->chip->accel_scale_table; *length = data->chip->num_accel_scales;