From patchwork Sun May 22 07:04:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12858101 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 55415C4332F for ; Sun, 22 May 2022 07:04:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238169AbiEVHEa (ORCPT ); Sun, 22 May 2022 03:04:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231375AbiEVHE2 (ORCPT ); Sun, 22 May 2022 03:04:28 -0400 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00139.outbound.protection.outlook.com [40.107.0.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6F84286C7; Sun, 22 May 2022 00:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lGwuM7GmtQgFp4XQ/zHNva8WvC61BTbaITMtadUcrnnOZ17Re/Rn2winrLnHBp33rKEUrL/6l/EYDVCKzfBpv376rqBmkKC7105tEXnoKFLZd2RujE2F0PNNFvZl7jQ1P7qwIROJHtF8GjREhEIPuY3e77i5OS2RH28+aqMcRQhTNZEC6P+uliO0NPwmiuKeLnZ08EMAMBa5IbZjuMtftxks2C7SFZrsBRA2QLwAtFkootzyKnyyGKuAtW/Lzl+DJZrqNLH1wKad3bzCdTQCkQngJehYk69O3VkST/nfvy8YOtzrSmfw1M+hv9qjcT4qEfxKbedyvEAle/kmMPm8fg== 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=7ekwVoXx/+aYjX3KlJSJLf75Avjb5+QFhAMoKN3Z/Tw=; b=jATPmFF4ipOytSWvhrNuADYggGS2jXU1F63EeKRCmD8trgYybEm121M6wqzsksBxwsKCfroVVnbJBiqKXw8NBT6hDlUvsr/cHFMSGnuPnAadSGqpzMH1CUm+KnuEGIxeyZW+z6T6qnLMLsWWlD9iwqtMXQMslr4xsiLdZ6uyxvn3/Wajbp0MH7yGvq03uitl55GYagd1KGIUqLnHCnw/mBIAZIzTG8ciM4cR59cyNz8chA+pAy3tOxUAGyo1iow9+b5J6hyJOXykfUmAZXdbhdEzu6pgAKsi2brHkIhGCMidV8QRcYQNWzdiCYjpnfechqj9WT2P0fVw5VuBxs5xiQ== 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=7ekwVoXx/+aYjX3KlJSJLf75Avjb5+QFhAMoKN3Z/Tw=; b=wkLjGWu7TWW3mjwUJANnOkGluvGzDgB7eZpXIa+i0RGzvYlhv88Xfv1FA1litN7RZaLtdsOdo9ZOLFARBHJo9k3mhqZAM2Rsa/d5lvzBiEwArvVlkg87FC1T+DVgn1x4rdZ0tQjyrqmoI4uO6ZKRr+7efr59/+zoXbcEVetOexg= Received: from AM0PR10CA0125.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::42) by AM6PR06MB5779.eurprd06.prod.outlook.com (2603:10a6:20b:57::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.19; Sun, 22 May 2022 07:04:24 +0000 Received: from VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com (2603:10a6:208:e6:cafe::95) by AM0PR10CA0125.outlook.office365.com (2603:10a6:208:e6::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Sun, 22 May 2022 07:04:23 +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; pr=C Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT008.mail.protection.outlook.com (10.152.12.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:23 +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 V7 1/5] dt-bindings: iio: accel: sca3300: Document murata,scl3300 Date: Sun, 22 May 2022 07:04:15 +0000 Message-Id: <20220522070419.409556-2-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220522070419.409556-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220522070419.409556-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: 25e00752-aef3-4620-73ec-08da3bc14d47 X-MS-TrafficTypeDiagnostic: AM6PR06MB5779: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: sr2Jw48TPcDh2VrVOPKZlZwYb+nzDj1zesxsD/KwdQ9D6BDpCISjqwj0ozuBwpzHmhQsu+7d7bNIN+OaDHBzIVYhRkTFOnP5MGH21SgXlXc5/Yre1P1Qmm561adUudzvb6htVcd8s8zdVcZ66LWCI3I6ZY98FHShJvrLkcGTQC+b4h/mf0iE5SCnZ03Lqy6ZncYTKa+6oZgmWylqDD067hWofobmrdPyuZ1UhS9UUiwpIwGBTzo2XZ5EW9CFqEe3fpQ7MTB1xEm3O3kbVpaoqj/XO6OBmdTRXAGyTviZw2ofBmPSazw8orclfH7ZTr48I+8Q5/z0ZQ3ZPlarT6JasO69s8pJtXBzRcAPWnLIyPCB3JQjIg4lOy/q+HVmobVIDy4e5qoMFATwLZ/IlLpZV9N4HeWlXQmgspbNl2OPmpdrLSYNAKFoylGOdr7M04TIqksgNtdjcI4EHLsgzmSkyVFjZj9noNeczwifBUg7Z2vGqS/TBKDiWMuar8hIrKb/2np0lHjd/XiSQyiJ80GDyH8ZS+bjkUNhOFvnBIPjDWGK8d9VTeQ/Qk+ds2jNtq+PtIFgD13+hj2FM3s/qjph7EBq18irnQd99ZIwsq2G9AJRJKlVXOUrU2wRDso1HxVvv0cUf9jdqMHZ4LdqE9cJGymDBli7JfvgKKrZONMA3MaD+hKQE0+3n181YEikMPnA 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)(2906002)(47076005)(956004)(336012)(186003)(1076003)(2616005)(36860700001)(86362001)(82310400005)(6506007)(26005)(6666004)(36756003)(5660300002)(8676002)(4326008)(70586007)(70206006)(4744005)(36736006)(6486002)(81166007)(316002)(6512007)(118246002)(356005)(508600001)(8936002)(40460700003);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2022 07:04:23.5258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25e00752-aef3-4620-73ec-08da3bc14d47 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: VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR06MB5779 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add DT bindings for Murata scl3300 inclinometer. Reviewed-by: Rob Herring 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 Sun May 22 07:04:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12858104 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 AD907C433F5 for ; Sun, 22 May 2022 07:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242345AbiEVHEe (ORCPT ); Sun, 22 May 2022 03:04:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240295AbiEVHEc (ORCPT ); Sun, 22 May 2022 03:04:32 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60138.outbound.protection.outlook.com [40.107.6.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 612822E0BE; Sun, 22 May 2022 00:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dK1One38S9V+zGdUQXBKEj7QjUFkGPkRdbVRkGIlx5IIEgWqeD3jPoDiV0ePT7/vEiyWv5H/KLzV6qWRCiBZrCWbbf6jg7RdNtIlzzBRTvFnBWVZlfPXJWNH35JlZJjYXE6C+JIfxPxPZm0ofXw4fKhXFcwfpsdN3Z66md6uqKHO3Dn0FlcI86uWUqGiAxiXS6ZtneQtMCRm9YPmBwuBTJy6yzPVI7J8YVvvmmGak6QvWwPXFDaXdilzx3sqIjTiOhUDIFLQsSNnfHZGrk/O2pExVmu7OdDXkm89FruJEZhYe87pTEIZHT+mWzX8AsBSRpdswIi4bsZQcVQ+U07meA== 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=GLDuV2KrgenZkIPe4JZZX6YDLV+Fb0+07JQWbhDnbSY=; b=iX74rba4ff0sw4Af/Nx5d0+ZgHFH9K00kdZGKU6CCULUJ/PNnHE3MWVc1jLaCUnUdkyf+5iqAGy83iP4h6G7pk+/0NO2HaL/d7zikIMqCaCIWe6hRryeb+9uYxhRSECycywZeKNh0tkI3miyOhfEMLV/Ve3Q2A2NiuEwovjVyAYtYwxZ4az0RsW3AMqCbcopV+JQJUh9XfJbcfzso6h2ZbjYQfh+MX0w21Raa7s7LX1lHH09OYx56s1ZUKniFXMFMF/JQ0iVmjSK3o5kv04StuuvYFHRt9bNCWK9Mk0AMAr7kcdqCYjWI27CSFdDD0ub+wqq8+PWOLIfckqv7e4/tQ== 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=GLDuV2KrgenZkIPe4JZZX6YDLV+Fb0+07JQWbhDnbSY=; b=qLH77DncOiAdI8hhQOlhkwOA+gzfAB5QiA+ryoj9ce6Rt3XrlVnfsKFvyUscwBa0dg8vth2Nr8etVrMbctffTG7QS7VFDvY0u8Cnnpipob2HsK2csCo+u/YndN3LRrpZzmucAcLf1pTXNMfS1ivIme3Pasx39CvGnoSRJsuZYUA= Received: from AM0PR10CA0108.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::25) by AS8PR06MB7735.eurprd06.prod.outlook.com (2603:10a6:20b:334::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Sun, 22 May 2022 07:04:24 +0000 Received: from VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com (2603:10a6:208:e6:cafe::a9) by AM0PR10CA0108.outlook.office365.com (2603:10a6:208:e6::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Sun, 22 May 2022 07:04:24 +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; pr=C Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT008.mail.protection.outlook.com (10.152.12.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:24 +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 Subject: [PATCH V7 2/5] iio: accel: sca3300: add define for temp channel for reuse. Date: Sun, 22 May 2022 07:04:16 +0000 Message-Id: <20220522070419.409556-3-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220522070419.409556-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220522070419.409556-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: 8d857b1f-e5bf-46c3-6e66-08da3bc14da4 X-MS-TrafficTypeDiagnostic: AS8PR06MB7735: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: M2lrVNpftFomrvc8FPbaSh+YQ8tJd62EjdgBDnnDTUgqErocA4H0YqB+bGIFtTTz+uzk+KtfGVDywlx0jzbkHFLaaH510bmQuax10M8hR/ZRqYfjLKZk7KdIyNhSHdlyk1xc36RHMRdEfBJnHPX56ypJnEUpoinMaZag6IcxgK0nJoJEet8MRbEAnEsdT0u9j9LjtKI1F0F5McMxlJHd2j4b6QOGxRgnDYWN8tqXBoI0q7Cq4PmTN3fB8vV1xD6XL2PMxVYdftAxxWUY1PLxTzSFkxZh89yYNkes/g4KfsTRy5Lrhvllz1hW+syHf0Qjz6P4C2fh7XcibxOQA/X8rjw7VIs3KY3K/k4at/6l/PtHpLp1qBAn1a+a19BfZCRnj4RMs1AvIII5DotvoEzUCWqXi/DOtdDhIwPEBPsVZzxX6sS3AR0MVds7Mk3X/mU6kNHm7tAcK+kNh9kL6uwY7FuPVsB6u8PUz6FaVj7ionVT6KBMDrbHGZpThOhy5imXHEFDm5EA4i/pqBhhELc2TD/FpwJev/P+kHdmPIlc602sLoKD03zTjzXbdmcHooUY77HV+EpkrZzG1vpW75Cqn6mWDXbVJcm9zB3o9a9FNdMrxjlJMyrlxn2FNf8OIF1zJEzC63eIZd5NR7SuzgZxY7Unn+3In4ACZFIAf7hiMv9olkYJqktupH8ZLqAPNLPs 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)(40470700004)(36840700001)(40460700003)(2906002)(6486002)(36860700001)(86362001)(508600001)(8936002)(82310400005)(5660300002)(118246002)(356005)(36756003)(81166007)(83380400001)(4326008)(47076005)(70206006)(70586007)(6512007)(6506007)(2616005)(956004)(26005)(1076003)(8676002)(186003)(316002)(36736006)(336012)(6666004);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2022 07:04:24.1507 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d857b1f-e5bf-46c3-6e66-08da3bc14da4 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: VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR06MB7735 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add define of SCA3300_TEMP_CHANNEL for reuse. 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 Sun May 22 07:04:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12858105 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 4FB8FC433F5 for ; Sun, 22 May 2022 07:04:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344600AbiEVHEh (ORCPT ); Sun, 22 May 2022 03:04:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240373AbiEVHEd (ORCPT ); Sun, 22 May 2022 03:04:33 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2115.outbound.protection.outlook.com [40.107.22.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9567A2E696; Sun, 22 May 2022 00:04:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UXgap1Igd2zT8nsD7O2CrkE4iNXUoPQ55nLKPzR/Vxfz4ddjLVh47dg0BwA1jtj1AQvX5UjuYgJH6U1SHuwcAoRkAeDKhOjClPzT93aBw5//L/S6fsvwg2jG+NE1ZtO2Y0FyyqNGI6PF3Fzd9Yw/HO9vZPDj9ATxN+zTQ6qkPbbRoj7Q/sTtiSc00qzkNU/ICqYNJJtXNRybUcaVBjnD2YqFeZVszirtWWxnBJYCSS8NmHGDf5lnnvdIkBMa56is+kf8XeowvNc40sbnV97CT+sy0DgKHnK+vXceZQ3NeEVyqGveA7Dm+Yjg3hHLG2vi3BbodPWPBCEAKI9k/CLy8A== 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=LXYt1oZ7BY+XxoA9T1qDsn8ukdJ2HyGc2rnldt1bQW8=; b=npt1NCfMpuWH2c0GPo/KRHpeY1Yg1arwzLpJ6467nEjyvoLUTjfDOGVPA8mDDRVSRJZLhPmH8HLNqr1ZlS+DE19drbUOXyMMyHScf6koFxkgKvrNNEQ6QGib3aEiGcmN3m3IRvJgypQePdR21MympUkkEtzZ81tYWki8a6jO7V+kwcFDWDpvynzrrXumE5r9UkoRVaU1/b14JPGEgCWXnW2XlyO6B9KeWLJtSzKYfZPowN+twS+m5eZ8qoCziUkA+EJMVp0aB0K1R+2Bye7YTfoiVEWflkzrS5tCnzA1tfpP7BgeSAcHI+BiKHZMopwOlyG6/dvI5il4t7vJRnybFw== 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=LXYt1oZ7BY+XxoA9T1qDsn8ukdJ2HyGc2rnldt1bQW8=; b=wEHWcVvEgxo+GXiC7IcL1CcJTQdFqI3tHOKmRP+aUroIvUTyqypzIJ7bo2G1HErs6H7BHELQY20CTDzd8BeZ4VcSaAbuH5e6LblJW3Uj6mM1E5+Bi6FR4c2wTxoiDKV6FSupdH6mK4/27TC5x5vuhm3qDj4bzvmBfHVaSwOiKUo= Received: from AM0PR10CA0126.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::43) by DU2PR06MB8400.eurprd06.prod.outlook.com (2603:10a6:10:2f3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.18; Sun, 22 May 2022 07:04:25 +0000 Received: from VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com (2603:10a6:208:e6:cafe::a1) by AM0PR10CA0126.outlook.office365.com (2603:10a6:208:e6::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:25 +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; pr=C Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT008.mail.protection.outlook.com (10.152.12.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:24 +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 Subject: [PATCH V7 3/5] iio: accel: sca3300: modified to support multi chips Date: Sun, 22 May 2022 07:04:17 +0000 Message-Id: <20220522070419.409556-4-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220522070419.409556-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220522070419.409556-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: 95aef660-5951-4a7c-2d6d-08da3bc14e06 X-MS-TrafficTypeDiagnostic: DU2PR06MB8400: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: cyW9ApZgTxZO23xiB4FJ6Bs36KK8IvMzQnAZFcMzAguqoL3As9Xw1J0LdiWDzj+lrQ24/gTfO0LfnfvEi38+yVDoD8UKNHxHU4pCcNuAEmw4MJtp0cfHRZeejCnccUQI/cnv+mbwtdXFK0VB4s9ulV7bWFpl82e4oZfkWd+tgtnzdzl9g3LRSdM1oR/FMvVib4/Ho/Z8FwOFh59FOPHq9VXTF87Ict7UtDUqLRiTOoSPA5f7hBiV61jj7B2FNpSUHFFX4kAnhGkG6KxbDVtuJgvzaKXRjH5WtSTeGEYA7RQQadHJbeHMod6dFTOGhq8K+fz1WBa82kl8YXQsM7JOOAVznY5qOsgJDvpZT2uJ5x6jPbNswreyj/hLeEcXQFUJ/afD5T3XEqPUicZr10spkQnIyJ2mcnuU0uZlp18d2OytDSwgQupxj9JSE8hAWOWFHN/i876/8jF8JhB81YP5mFZhYIEptkMWQ1COz5dAJmYnB+JaQTT9Sw/kdTlZGy/F996oDiliEkHKAr+EZqJtujeV0vPRuaxVuTAbSI6L2wSKMmuRflGl6lq0BMriQtWQULaeie4L6CoJAAVNQ5HFQTOIGO25arhI3vkrFmQ1s9hbR7MfvK+SmHmjiFl1qVRzy/It+k9ZOu+qJJjM++j0xYoOHN2EUXH0R6GTyXbgMlg6rzpEr/tc1tLnXRZFGHFr 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)(356005)(26005)(36736006)(6512007)(5660300002)(70206006)(70586007)(8676002)(316002)(40460700003)(86362001)(6486002)(508600001)(6666004)(186003)(82310400005)(118246002)(8936002)(336012)(47076005)(2906002)(1076003)(36860700001)(83380400001)(36756003)(6506007)(81166007)(4326008)(2616005)(956004);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2022 07:04:24.7913 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95aef660-5951-4a7c-2d6d-08da3bc14e06 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: VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR06MB8400 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Prepare the way for multiple chips and additional channels: - Modify the driver to read the device ID and load the corresponding sensor information from the table to support multiple chips - Add prepares for the addition of extra channels - Prepare for handling the operation modes for multiple chips Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 199 ++++++++++++++++++++++++++++-------- 1 file changed, 158 insertions(+), 41 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index ff16d2cc8c70..e57aba79c32b 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -93,19 +93,40 @@ 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_lp_freq[] = {70, 10}; +static const int sca3300_lp_freq_map[] = {0, 0, 0, 1}; +static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}}; +static const int sca3300_accel_scale_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 char *name; + const unsigned long *scan_masks; + const struct iio_chan_spec *channels; + u8 num_channels; + u8 num_accel_scales; + const int (*accel_scale)[2]; + const int *accel_scale_map; + u8 num_freqs; + const int *freq_table; + const int *freq_map; + const int *avail_modes_table; + u8 num_avail_modes; + u8 chip_id; +}; + /** * struct sca3300_data - device data * @spi: SPI device structure * @lock: Data buffer lock + * @chip: Sensor chip specific information * @scan: Triggered buffer. Four channel 16-bit data + 64-bit timestamp * @txbuf: Transmit buffer * @rxbuf: Receive buffer @@ -113,6 +134,7 @@ static const unsigned long sca3300_scan_masks[] = { struct sca3300_data { struct spi_device *spi; struct mutex lock; + const struct sca3300_chip_info *chip; struct { s16 channels[4]; s64 ts __aligned(sizeof(s64)); @@ -121,6 +143,24 @@ struct sca3300_data { u8 rxbuf[4]; }; +static const struct sca3300_chip_info sca3300_chip_tbl[] = { + { + .name = "sca3300", + .scan_masks = sca3300_scan_masks, + .channels = sca3300_channels, + .num_channels = ARRAY_SIZE(sca3300_channels), + .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale)*2, + .accel_scale = sca3300_accel_scale, + .accel_scale_map = sca3300_accel_scale_map, + .num_freqs = ARRAY_SIZE(sca3300_lp_freq), + .freq_table = sca3300_lp_freq, + .freq_map = sca3300_lp_freq_map, + .avail_modes_table = sca3300_avail_modes_map, + .num_avail_modes = 4, + .chip_id = SCA3300_WHOAMI_ID, + }, +}; + DECLARE_CRC8_TABLE(sca3300_crc_table); static int sca3300_transfer(struct sca3300_data *sca_data, int *val) @@ -227,36 +267,92 @@ 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) +{ + if ((index < 0) || (index >= sca_data->chip->num_avail_modes)) + return -EINVAL; + + return sca3300_write_reg(sca_data, SCA3300_REG_MODE, + sca_data->chip->avail_modes_table[index]); +} + +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; + + reg_val &= GENMASK(1, 0); + for (i = 0; i < sca_data->chip->num_avail_modes; i++) { + if (sca_data->chip->avail_modes_table[i] == reg_val) + break; + } + if (i == sca_data->chip->num_avail_modes) + return -EINVAL; + + *index = i; + return 0; +} + +static int sca3300_set_frequency(struct sca3300_data *data, int val) +{ + const struct sca3300_chip_info *chip = data->chip; + unsigned int index; + int *opmode_scale; + int *new_scale; + unsigned int i; + + if (sca3300_get_op_mode(data, &index)) + return -EINVAL; + + /* + * Find a mode in which the requested sampling frequency is available + * and the scaling currently set is retained. + */ + opmode_scale = (int *)chip->accel_scale[chip->accel_scale_map[index]]; + for (i = 0; i < chip->num_avail_modes; i++) { + new_scale = (int *)chip->accel_scale[chip->accel_scale_map[i]]; + if ((val == chip->freq_table[chip->freq_map[i]]) && + (opmode_scale[1] == new_scale[1]) && + (opmode_scale[0] == new_scale[0])) + break; + } + if (i == chip->num_avail_modes) + return -EINVAL; + + return sca3300_set_op_mode(data, i); +} + 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 reg_val; - int ret; + int index; 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); + /* + * Letting scale take priority over sampling frequency. + * That makes sense given we can only ever end up increasing + * the sampling frequency which is unlikely to be a problem. + */ + for (i = 0; i < data->chip->num_avail_modes; i++) { + index = data->chip->accel_scale_map[i]; + if ((val == data->chip->accel_scale[index][0]) && + (val2 == data->chip->accel_scale[index][1])) + return sca3300_set_op_mode(data, i); } return -EINVAL; - case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_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; + return sca3300_set_frequency(data, val); default: return -EINVAL; } @@ -267,8 +363,8 @@ 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 index; int ret; - int reg_val; switch (mask) { case IIO_CHAN_INFO_RAW: @@ -277,17 +373,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, &index); 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_map[index]; + *val = data->chip->accel_scale[index][0]; + *val2 = data->chip->accel_scale[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, &index); if (ret) return ret; - *val = sca3300_lp_freq[reg_val]; + index = data->chip->freq_map[index]; + *val = data->chip->freq_table[index]; return IIO_VAL_INT; default: return -EINVAL; @@ -331,6 +435,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 +452,17 @@ 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, "unknown chip id %x\n", value); return -ENODEV; } + + sca_data->chip = &sca3300_chip_tbl[i]; + return 0; } @@ -384,15 +494,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; + *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 +540,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) { @@ -436,6 +547,12 @@ static int sca3300_probe(struct spi_device *spi) return ret; } + indio_dev->name = sca_data->chip->name; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = sca_data->chip->channels; + indio_dev->num_channels = sca_data->chip->num_channels; + indio_dev->available_scan_masks = sca_data->chip->scan_masks; + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, iio_pollfunc_store_time, sca3300_trigger_handler, NULL); From patchwork Sun May 22 07:04:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12858102 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 78502C43217 for ; Sun, 22 May 2022 07:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240061AbiEVHEc (ORCPT ); Sun, 22 May 2022 03:04:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238173AbiEVHEa (ORCPT ); Sun, 22 May 2022 03:04:30 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2113.outbound.protection.outlook.com [40.107.20.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 088212E696; Sun, 22 May 2022 00:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lm7x8K5mkJwBGX10KtKEcodu+ABH+NoZp448ZJ+LaTzwMH4wrV3RZdZ39L0EramRjCvi8qtfT/JJL5L+9rJEFQcyIjMq5L0MV/gSB8zUMhX7muT7DP2YoStDvnUVgube4SrvRV4osJUlYq5YC309HrTBuJcSeZkhKAZyA0FS3v/Ytk5TVaW/ILZDY5bSPCzXWGXTFh567YRZ89+xfz4B9r9XRfodakJmgQqRBr3tR3HUQZ3jV8lFu4qvOWO32caSj2z24ljJDFVV4pARudTJQzHOkiyKnT6w0kbmk/TXGqR2BWIa8BdmWXoHnPoWbaN0gqPOJxxEPrdY89JNm5x6jw== 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=eqc4tEjwcUJvoam8Yn9VSv17EgBDCmd9rRIqAknCkkE=; b=CppOfAkXMfJZ0dljaQFzCbudglk5/76eFOPvaa/Hudb1NRW4FQE54HMOMunBGGOw3PqG0KFiFKIdtVhtVJE6bZWkxdAorvV+ZFHWrxXsD4PlpgSTbUy/qQmWQngOxhK0B/MwEXGenAAuUDHDMsmWW4GC78K28xJGxmpQgpUCNLGisUQnBLPcJAsrTiupErjSCVEWH9ik/vf2Tp+M2foTtO4pguelTcVJBWkVC4vZqc0v1Dfmw7RRepQ0DABEnToI9pPpgfvu9Y7cPzi9nHUfcw/XgjQzf/58I01FAZpJAP7I9mkMimFjcY2P62dp84ZpGTDlmBQaAo0ADOE+cDJFwg== 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=eqc4tEjwcUJvoam8Yn9VSv17EgBDCmd9rRIqAknCkkE=; b=na7n0FXOgRLZrdlWcmSRC8MBE38s9AMmgQ74Jnec1wPLXQhE4BCM07Qu67WJ2CncXsC8hFTju4jrv2gdDTnb0xyv+RTmgYwe3zHWyDZL/5rubOQY3lVeHHdNGlC/GptXoJGs6GXDCIS+CPEOZCVX529PCubRAXXlhE+3ku+KDj0= Received: from AM0PR10CA0127.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::44) by DB7PR06MB4506.eurprd06.prod.outlook.com (2603:10a6:10:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Sun, 22 May 2022 07:04:26 +0000 Received: from VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com (2603:10a6:208:e6:cafe::c1) by AM0PR10CA0127.outlook.office365.com (2603:10a6:208:e6::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:25 +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; pr=C Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT008.mail.protection.outlook.com (10.152.12.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:25 +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 Subject: [PATCH V7 4/5] iio: accel: sca3300: Add support for SCL3300 Date: Sun, 22 May 2022 07:04:18 +0000 Message-Id: <20220522070419.409556-5-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220522070419.409556-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220522070419.409556-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: 70e8c583-a91b-4818-c3b1-08da3bc14e7f X-MS-TrafficTypeDiagnostic: DB7PR06MB4506: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: ulBjkvK4OP8xVrBD/bAXvSXmpCdP888OyJQL0ov5NQyUqm7ZvIPPjmDGS8kGVSMcV7z4q7sH6HRImdXBKLL8r+gjiXEmYkS2iHv5wPiRn35KgqCW/xRaH3sX0P6BNL2xsv/MxfePnGG1Z1Z2FmgR50XhgT1+E8mUGT0L2+rO8vL0rE7/7xxQ1wEschngG2fpjq4ufFeOyq05d6gkyomgIvy+xnGbtl2BxEInYXVX8d9yNpfcKuVh+pl+9b28dwYlLTIGZwpYBTbHPhzF0PNvZYXJQ5sSldNtlXnrGIzM67FUjw9+0+fvB/vpgfCKCaUkjlaZ502+AoSkApLBIRQn5if7h1TNKnNrZMn98x+7ZZfWXULc4dgGm9DfHsZ4nTr20e8tCjL20gbwE/AOj67QMjK9Mo0gqk6baerTWuK9htEW0USbzSpA1GCekLtr4UE712tjp6AzqhAvyEKp4HNhvhVyySBlBAiwP/JT2RDMLkuhRYhKaeJjiP06cS9z/fNc1btRWLA2ylZf+WlZoOuV5O/uBA9ZjFrMesLY7SzMdW7d5cgXK5PIrhN3sZS/XDUOmqpYHhOtdla+htxdAzTdqjDkV75VKSeklq4rAv6GXGsZiowIKFEqdZ6Q3VeLwj1xBcTmO+/OMuLQTkocaHb5qvvoXvVyqyLjY5MTtQzewd0O+y0tFV3/TOqRgC3BCFQVO8Jcrd1YZ1qb3o8GItlh+ILttRnlrWj05jP5Qw1bSraUdXY+yy9nnx1fxtMYzKu9ML+tbG2HPc/N8R/fJbrgOQ== 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)(118246002)(8676002)(316002)(36736006)(8936002)(356005)(15974865002)(70586007)(6666004)(2906002)(86362001)(4326008)(5660300002)(70206006)(81166007)(36756003)(83380400001)(36860700001)(6486002)(508600001)(1076003)(336012)(6512007)(6506007)(186003)(82310400005)(26005)(47076005)(40460700003)(956004)(2616005);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2022 07:04:25.5882 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70e8c583-a91b-4818-c3b1-08da3bc14e7f 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: VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR06MB4506 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 Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index e57aba79c32b..10bedb14d4f0 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -38,6 +38,7 @@ /* Device ID */ #define SCA3300_REG_WHOAMI 0x10 #define SCA3300_WHOAMI_ID 0x51 +#define SCL3300_WHOAMI_ID 0xC1 /* Device return status and mask */ #define SCA3300_VALUE_RS_ERROR 0x3 @@ -96,10 +97,18 @@ static const struct iio_chan_spec sca3300_channels[] = { static const int sca3300_lp_freq[] = {70, 10}; static const int sca3300_lp_freq_map[] = {0, 0, 0, 1}; +static const int scl3300_lp_freq[] = {40, 70, 10}; +static const int scl3300_lp_freq_map[] = {0, 1, 2}; + static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}}; static const int sca3300_accel_scale_map[] = {0, 1, 2, 2}; +static const int scl3300_accel_scale[][2] = {{0, 167}, {0, 333}, {0, 83}}; +static const int scl3300_accel_scale_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), @@ -159,6 +168,20 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .num_avail_modes = 4, .chip_id = SCA3300_WHOAMI_ID, }, + { .scan_masks = sca3300_scan_masks, + .channels = sca3300_channels, + .num_channels = ARRAY_SIZE(sca3300_channels), + .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale)*2, + .accel_scale = scl3300_accel_scale, + .accel_scale_map = scl3300_accel_scale_map, + .num_freqs = ARRAY_SIZE(scl3300_lp_freq), + .freq_table = scl3300_lp_freq, + .freq_map = scl3300_lp_freq_map, + .name = "scl3300", + .avail_modes_table = scl3300_avail_modes_map, + .num_avail_modes = 3, + .chip_id = SCL3300_WHOAMI_ID, + }, }; DECLARE_CRC8_TABLE(sca3300_crc_table); @@ -444,9 +467,9 @@ static int sca3300_init(struct sca3300_data *sca_data, /* * Wait 1ms after SW-reset command. - * Wait 15ms for settling of signal paths. + * Wait 25ms for settling of signal paths. */ - usleep_range(16e3, 50e3); + usleep_range(26e3, 50e3); ret = sca3300_read_reg(sca_data, SCA3300_REG_WHOAMI, &value); if (ret) @@ -573,6 +596,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 Sun May 22 07:04:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12858103 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 635BDC433F5 for ; Sun, 22 May 2022 07:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240426AbiEVHEd (ORCPT ); Sun, 22 May 2022 03:04:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239645AbiEVHEb (ORCPT ); Sun, 22 May 2022 03:04:31 -0400 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00099.outbound.protection.outlook.com [40.107.0.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD5AC286C7; Sun, 22 May 2022 00:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mf4h5Rzne9pJYHbPojBk5BIG7A0s+B9TAsVrVc8hQfY8ViXiNGrV1EG5PTsu/AA50duhTa/k3TarZqi+tcZ9WG4eAfW/75TWHqrFsEqByPeSNBCseqeABkXG3k2u74R7m9dX22RUfAQvWoZEfQJeuNDJJdVwGJ4pRrr0ja8vYEm7J2zSh8aXdk5iLQwZlrlffkJu2Qp5RN1pTIsYeqKbVrQwLetP/iGgNZaHsqFFcMeu4E+HE3WJ33ecWbl9w3zrotbYXCBoPPXm74pg5PmLcVhsco/tBd0CwKw+I+a4PJTHAP9FLp93k2WnUYQSNmvr6wxXeC07VBXFmiLEXzR1/w== 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=4g9Zb5NQnBxSo77yxwtd/DyYZ7bPq41L2SEO4vag9wg=; b=aCVrXUrarSOgKebbkoj4vwHKH8cAcOycShO1LhQKTNN8zz6lghT0xa5kcRAYfjWVGU+fSXlap509Lwwfo5H3b2i5lKOYp4O8lEvudi1iczFUr2luqOj2adgZKqpdMlON+1yLuajzO6C/C10A6bhb/tfUZBLZW9hti6RR60nVQWxEhsc4bq3IoGdnkDGndfyMhsbGestxp9UlkOlKC/4S2/ZfjKRf53fHt+a0YSo7w64ejv5XtF/j6GDGlnZtWlqKESUR63zP0hU0vYoKqky6KZ8/PG/P5NLBq05PiErCDncYjW9YEXbPc/5y+SHIr/dGqzRzcCX9dZmHgweRS/cL3A== 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=4g9Zb5NQnBxSo77yxwtd/DyYZ7bPq41L2SEO4vag9wg=; b=kIRLKdRkB0eiuVj0uAXn54JGmlGH1j3OvOS4+wxxMKxwPw2s/VtwEfqpQVGgrwI3BXhkh0cRScYanDZGD5TTfeoGMk8fN7lQpZBxZ/QSXvX7vcWVwAmuALdfzbzBb/JjupLeWIjEEg3eW8EBcsu0ErcxwWLsWS4KNzBP4hqEIj4= Received: from AM0PR10CA0112.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::29) by VI1PR0602MB3582.eurprd06.prod.outlook.com (2603:10a6:803:10::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Sun, 22 May 2022 07:04:27 +0000 Received: from VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com (2603:10a6:208:e6:cafe::8d) by AM0PR10CA0112.outlook.office365.com (2603:10a6:208:e6::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Sun, 22 May 2022 07:04:26 +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; pr=C Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT008.mail.protection.outlook.com (10.152.12.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Sun, 22 May 2022 07:04:26 +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 Subject: [PATCH V7 5/5] iio: accel: sca3300: Add inclination channels Date: Sun, 22 May 2022 07:04:19 +0000 Message-Id: <20220522070419.409556-6-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220522070419.409556-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220522070419.409556-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: 40795085-6dae-4d25-1e9e-08da3bc14efe X-MS-TrafficTypeDiagnostic: VI1PR0602MB3582: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: 46VdBQWb88YzdBG38WP6I2CXF7WzZEtySli7pq8FZHcyK8m56DRezt6zLScrDhMfIrCuo5cxE1xUdiD78mBbqTE7vWC05+iLFT2uszP+yVSEzrj1LRUu5ih5BlBUwKVATkb326AgmzN5zAgrlPN9ZzSSiV+8cDcg5wdKbtrLUN5O1o5b2koIpe32tdiEeLep15nYu4thUNP7ydH2cZxOKS4ZFVrGYo8I3BMDd0Ed9JEsnh1eS9XnT9geaR/Lp9TFTGKKVuvTWPAzuTZtYiXZ0Zy2sml1Intao9Is02kisEp1uTDvNaDckQhWa618t6NvfUi96SFRX9raYA7ve3327OpbtGZDJYecCsxEeFoNrW4R3fxF8CojWzrvZJ/X6AHUvRfrBuXTTS0mcOoeKpHxyS44XwAeZV6HDSnB2kMWxg9qpMi276CuT4aILYsUn0zn8x2e2COMitmWNEqZnnrGfKfoghlKyRqypj8Sqi74GKYuajD+oQC9pcRPDQz93xxjHR22ViOSmHmpELA1fC6ET57HU0JU+A5ld8pvRGLFKpix5h7EJW0rTFWNbDMbTOG0tXTYXbp3gC/ice0QbCud47B0k5g+bocNUG5xPoQnEDfnlXmfYnds7il4ZKylWRJgnfNc1AglwyBlW75p4DfPolrggBfGIrT050AFTa7MJabocOzWb/gmzu80X2gwm8OA 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)(40470700004)(36840700001)(6506007)(336012)(186003)(6512007)(118246002)(26005)(6486002)(956004)(2906002)(86362001)(82310400005)(2616005)(36860700001)(36756003)(6666004)(83380400001)(1076003)(81166007)(8936002)(356005)(5660300002)(316002)(70586007)(40460700003)(508600001)(8676002)(47076005)(4326008)(70206006)(36736006);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2022 07:04:26.4319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40795085-6dae-4d25-1e9e-08da3bc14efe 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: VE1EUR02FT008.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0602MB3582 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 , sqrt(pow(accy , 2) + pow(accz , 2))) ANG_Y = atan2(accy , sqrt(pow(accx , 2) + pow(accz , 2))) ANG_Z = atan2(accz , sqrt(pow(accx , 2) + pow(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. Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 76 +++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index 10bedb14d4f0..9094f16458de 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -44,12 +44,18 @@ #define SCA3300_VALUE_RS_ERROR 0x3 #define SCA3300_MASK_RS_STATUS GENMASK(1, 0) +#define SCL3300_REG_ANG_CTRL 0x0C +#define SCL3300_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) { \ @@ -73,6 +79,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, \ @@ -106,15 +130,36 @@ static const int sca3300_accel_scale_map[] = {0, 1, 2, 2}; static const int scl3300_accel_scale[][2] = {{0, 167}, {0, 333}, {0, 83}}; static const int scl3300_accel_scale_map[] = {0, 1, 2}; +static const int scl3300_incli_scale[][2] = {{0, 5495}}; +static const int scl3300_incli_scale_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(4), + 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 char *name; const unsigned long *scan_masks; @@ -123,6 +168,9 @@ struct sca3300_chip_info { u8 num_accel_scales; const int (*accel_scale)[2]; const int *accel_scale_map; + const int (*incli_scale)[2]; + const int *incli_scale_map; + u8 num_incli_scales; u8 num_freqs; const int *freq_table; const int *freq_map; @@ -131,6 +179,7 @@ struct sca3300_chip_info { u8 chip_id; }; + /** * struct sca3300_data - device data * @spi: SPI device structure @@ -168,12 +217,16 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .num_avail_modes = 4, .chip_id = SCA3300_WHOAMI_ID, }, - { .scan_masks = sca3300_scan_masks, - .channels = sca3300_channels, - .num_channels = ARRAY_SIZE(sca3300_channels), + { + .scan_masks = scl3300_scan_masks, + .channels = scl3300_channels, + .num_channels = ARRAY_SIZE(scl3300_channels), .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale)*2, .accel_scale = scl3300_accel_scale, .accel_scale_map = scl3300_accel_scale_map, + .incli_scale = scl3300_incli_scale, + .incli_scale_map = scl3300_incli_scale_map, + .num_incli_scales = ARRAY_SIZE(scl3300_incli_scale)*2, .num_freqs = ARRAY_SIZE(scl3300_lp_freq), .freq_table = scl3300_lp_freq, .freq_map = scl3300_lp_freq_map, @@ -400,6 +453,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_map[index]; + *val = data->chip->incli_scale[index][0]; + *val2 = data->chip->incli_scale[index][1]; + return IIO_VAL_INT_PLUS_MICRO; case IIO_ACCEL: index = data->chip->accel_scale_map[index]; *val = data->chip->accel_scale[index][0]; @@ -486,6 +544,13 @@ static int sca3300_init(struct sca3300_data *sca_data, sca_data->chip = &sca3300_chip_tbl[i]; + if (value == SCL3300_WHOAMI_ID) { + ret = sca3300_write_reg(sca_data, SCL3300_REG_ANG_CTRL, + SCL3300_ANG_ENABLE); + if (ret) + return ret; + } + return 0; } @@ -521,6 +586,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; + *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; *length = data->chip->num_accel_scales;