From patchwork Mon May 23 06:23: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: 12858490 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 A9AB5C433EF for ; Mon, 23 May 2022 07:02:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229495AbiEWHCB (ORCPT ); Mon, 23 May 2022 03:02:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiEWHBy (ORCPT ); Mon, 23 May 2022 03:01:54 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0709.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::709]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BF0760ABA; Mon, 23 May 2022 00:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TsEnZEMqvBf6CPTP+rO3emVIUSfTkoEK7DtEMNQ+t8p1H6GzCQN0413J2sWXONk6tQXfUN748S8L4Eo1588lsn7/Cg6ISRBcbSqh2MY8W6HNoQW5yV+7OfhEmLU2GWFVEWC/Loncsqt11g06p4/2RsA85b7GSM2qGVqEq+nVKkFLE08eI13ppyP3Wo3WROXeL7wi4OuzWU2QP71px8KKYYUqS64IJLDiMcktFWSQuQDEDGcKFujCZnYkREZkYZaQbT3L8PzoamHYXSP9owJK1xtBXDCFHV2tfOMaSCbYkFnffvKWDQG+6O+2ZbXak/2NBhh/xCR4LrlKp2tRkWPxhA== 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=Q3auCJHa2GV0Ti/CcZt515+x1fjTYhWYwwjPdqgN2oB11epqJTkdq8bSbqG8KSweN+j2qwQDxX2Zl5sqZNtQJoBqHnc9COfFu6rdsvG5UmYdpUYemmyLL2wqJpuq4K9m7j2VAtTDgDttFv2dPYUn/bUToNCYK0Q+TBF1MDjLM7kzADuo47959LRsDq5sN2VtIAq9s3bmL2hw7jFpHG6gg+t2jdlx+x33zaCuoSO/vYXJ1eOzlEXxu5liSaZBUCZzJzd3YrVfo4t4kOjvEmxALw2l7RUk3KDRoZO3a6T+oENRgCQ6TfVU2NyW+mYHVgn7ByAZf3Yc4TxqZqEOq9e5Uw== 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=GtACg4SosHPnvwTZ2e+8n0QlcJci5cOzaeoye0CiayFAyVWiJqVJSXZT1DuoxsCoz8PyiZPmb/zxqKdWR/3GNW3erT5tlB0qz/O+28JpxqB6gkGQV1EJjk0dyQlyVQhdUcRCnI6B3G2KC0Bn1rE8r6kXFkox2nnigLKfWmuBIs4= Received: from OL1P279CA0056.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:15::7) by VI1PR0602MB3599.eurprd06.prod.outlook.com (2603:10a6:803:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.21; Mon, 23 May 2022 06:23:17 +0000 Received: from HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com (2603:10a6:e10:15:cafe::9a) by OL1P279CA0056.outlook.office365.com (2603:10a6:e10:15::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Mon, 23 May 2022 06:23:16 +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 HE1EUR02FT087.mail.protection.outlook.com (10.152.11.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 06:23:16 +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: thomas.haemmerle@leica-geosystems.com, linux-iio@vger.kernel.org, Rob Herring Subject: [PATCH V8 1/5] dt-bindings: iio: accel: sca3300: Document murata,scl3300 Date: Mon, 23 May 2022 06:23:08 +0000 Message-Id: <20220523062312.1401944-2-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523062312.1401944-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220523062312.1401944-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: 5d5b592c-cbc8-45d3-009c-08da3c84b942 X-MS-TrafficTypeDiagnostic: VI1PR0602MB3599: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: WDDiZpscahJbvcyz+i8Mi0fBbqWbqpXia/0VwLB/Nh89SFmGY7UM8IwcSNkxGxJNwjY8O5dyxhxRLhgRlX6sj/Bo0pPLMYNC03Onek2zPdi0hpAO4098oqK1MjSi39TTXodYpDTEDdXqSnHqUT+4+vtO+FC/MOTc0o8du62qr/KGvfqygx5GzpojOUsNGr3dyNvJgaOvWMpuQu5jhHbihxO5EIPL4KboapzDRIglX2hdbnjLjx2ElweH8SOCMJJhOENUUDqnXYLTbGRRVDEUuf4QVtCsriv5tr2xutCpwmmAx9rjNZfl/7QZO0U5GInAkV9Fpd2ZvhCBnaE97XTfdXI0CqC/94HvZ6TDvZtXoGyDsR+eQ8fMyrD1I9+0DuVckCy8sdOwvwAnXzmV029v3HH/5GAYMq6KVaR0YMQQK5oWszXladVg+x4hvWkpx4Cx1NiNeigZAS+OyEaKYLBf+T5pONiKj3A+68z6xlrokpVuThskUi0bKoThOwLDYwcsr0/c6xzoKND8Jevzj2t4nXA4nM1nYpo5hbbVNa/wZEdWhMLr9IQ1KP1/u45aNycv4N1MQ2NYdBMb4Cv1fn1fZv2u2gTHstdPjs/UsspTeb+Eotb3B4JyLPxvUkHWW6X4YCTEunuZYA8uYLdl1diDtrADhi7buaNdi8e2zav9+8sAtxs90R9hq6ze+W02J+lh 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)(6512007)(6666004)(6486002)(6506007)(26005)(356005)(81166007)(508600001)(36860700001)(186003)(2616005)(956004)(336012)(1076003)(47076005)(36736006)(82310400005)(5660300002)(4326008)(4744005)(8936002)(70586007)(70206006)(8676002)(36756003)(118246002)(2906002)(40460700003)(316002)(86362001);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 06:23:16.2720 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d5b592c-cbc8-45d3-009c-08da3c84b942 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: HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0602MB3599 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 Mon May 23 06:23: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: 12858492 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 AF50EC433F5 for ; Mon, 23 May 2022 07:02:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229627AbiEWHCD (ORCPT ); Mon, 23 May 2022 03:02:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbiEWHBy (ORCPT ); Mon, 23 May 2022 03:01:54 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on072f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::72f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08B1960ABD; Mon, 23 May 2022 00:00:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LeERqvch0szNVHh+A3v8pZW/i6Gy4oH0O84ENTduj7aYPceB6suo4tljtHLANlK00V9YwI09QlHOIL0z7ObiI3zesAXd8vR4WpwysSrVRyUvVn2qzZw+rEVVvSbZ+MSfPTYvtWwBBGswgu6EQbJKUi+3B7DmyKGfph6yULWRTgS8F+SKj7sUCqDln3GATFWK6X83J/XZs3aGOWBsj7s00nP1PD3oNtnC7tnVqGOoQ4oYUBys37wCz/U5sTQKt5QY9OLc0EdVMUG03FHySKt8l/wlaRxYfdu4CCRSy3j2wnJ1ksfp5eV+5W77SXA6jylNdqy7WctzSfIgXnEDsgSAlw== 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=V13nWHHt2mv3J6Dn2MtxzU1UbxfdPD0j40+hfJxY6OCqJnol2jhz/CgNv1ALnejK2y5SXwL9UuNZ0+sfbJhOCx3qLB0WfGIzHJDh86RBg6C7ueWo0Ih2y/JodIHkMEvcLhHLtPuYuhnsken0ZHdyoxZood4KtVocRzdBD+6LbuQiSDPLjhiBieU0nljdEQGJuNK+JknXUTeAHanpbcQF7gn+ws6OYGYJO0/mb30169iHbmESfP9hiacLoxZ8x5kRlH1eMS/a3mWwQPghP05UdEeXJCbrUlwsgaIf3XSDHBMZgOJOYT0/sFwVGQv2KsEHGbSwqqM1Udk3/kuFWErEjw== 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=geP7/kfZVhkFQwBcoE22qtKUKkb/kGjuCmWTaRGwEvXB8rwh2ZceH/ZF+abqKzNE1SgB4X21Jml++0ySS13NTr8/gXTZFcEydfkBxMA35suA1m3nEzBqnWUeUZT9v8Nv6JoemhyRSEgdEBHrLXW/N7sFkz7ZBhuzniB4TeJgZHs= Received: from OL1P279CA0055.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:15::6) by AM6PR06MB5475.eurprd06.prod.outlook.com (2603:10a6:20b:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 06:23:18 +0000 Received: from HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com (2603:10a6:e10:15:cafe::3b) by OL1P279CA0055.outlook.office365.com (2603:10a6:e10:15::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 06:23:17 +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 HE1EUR02FT087.mail.protection.outlook.com (10.152.11.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 06:23:17 +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: thomas.haemmerle@leica-geosystems.com, linux-iio@vger.kernel.org Subject: [PATCH V8 2/5] iio: accel: sca3300: add define for temp channel for reuse. Date: Mon, 23 May 2022 06:23:09 +0000 Message-Id: <20220523062312.1401944-3-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523062312.1401944-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220523062312.1401944-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: bbc99829-e857-4858-ea70-08da3c84b9eb X-MS-TrafficTypeDiagnostic: AM6PR06MB5475: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: 6heVSCn+/racin1QXqbpZAhKXznCLPB7sSw6nyl1Xa4DZ4KNcRYDRFi4wbXdeYrVYCe+uJAsbnDdAsJD0Txn6xBvXtGEGoRQJ/ShhSLJoTpKIwlChxEqKN5chFh2aJl5PelWYLibdRGgD1UkQuBNtPZG6afCdP7jYbHfC0fHwy6tCXwFVJcGDC48s01H3BB8eVEJZrlMa6n1DpPhSb80LlYjzHbsvYPF2FQbI5wengEKHNifo2wYxw19jd9JHAEWxUlEPxGUl/R/endeM+QnBZf0Q0MiFxkrooUXL9Hkb3tTG8X5o+oyz/pR+Bdn6/qVcFIuy5bbPxG1pA5PtUYSqaM9dH2zit+icJWAI1ofEZ1/2Ks5i+G+rMItIaAaCQOh5GawN6RbqdOLFjtKXiMLUzhju4oATOZ56JXf6oVaMRU6D9WbBJ+oG9zHNDKLCiStH7nWhnpUcn7c7Dq7w5jo4bmeoE1ZZ0/TZjEBqb8+/47AsDhZgkmyBM3TD6qsOLldvfdLnrEkeAW94BqkxvhTrkEAJJrZTBICUTyC+k5MqNKM87Dh7qIm4m2acZzUtZqRCv1RPGVz1ZAwV4sz/rDew9HZ5ejIm6T3ILK8ZXS5gDTA2a26lM1957aRZZgqRiwmLOP6qj02YHI+qYNs1QmprZlCn7+ZWf1oT1+y0P0ikjZpJb0NeSW/ee2c4EhT0zaO 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)(1076003)(2616005)(336012)(6666004)(36736006)(186003)(6506007)(36756003)(6512007)(2906002)(316002)(47076005)(82310400005)(508600001)(86362001)(83380400001)(26005)(118246002)(6486002)(36860700001)(5660300002)(356005)(40460700003)(81166007)(8936002)(8676002)(4326008)(70206006)(70586007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 06:23:17.4275 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bbc99829-e857-4858-ea70-08da3c84b9eb 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: HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR06MB5475 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 Mon May 23 06:23: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: 12858493 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 4511BC433F5 for ; Mon, 23 May 2022 07:05:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229653AbiEWHFx (ORCPT ); Mon, 23 May 2022 03:05:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbiEWHFw (ORCPT ); Mon, 23 May 2022 03:05:52 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20713.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::713]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C86985C862; Sun, 22 May 2022 23:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j5ZNSKnOOY/NnQa+2uA9JHyY7snzzjiBK3KoYnmLW0RutEuqaXJs6D9+EDUYULESxOAXP/nff/oYBkDU56LD7uC7Uz4SXuWzTi+d7iGExBZBmkLGo8UIXmDaDEWWjTAcpbZH8K79ebvH10l3jEsZuz7TNtb+nd1WAT549Th1nUlz0/3wcQQNfGSXzPJt2xGptuB92IvM3AYoOc0SZVLu3HXDjoflYkPtI8bHvkDK8jzVHOteQLpAVvgEz3z/mM8mcbtsfYeT8nXxnW2qOBQETfffzSZqY/Hw/WIFp11GzlX+9zI5Ojh/Cj/5IQo806esRZRPZKxAhuP9hEOfgd5Qgg== 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=Fxre35NuWmmIXYP/rslmXb++Y+XLqThXUTlZtVQ4egk=; b=ZGNuZInAxk4sYyLofh8FAWUEKl+uzClJphIKC4PjUghkBAp5F1BBuAU6TKjNFm/pal3iull+Y5n7kR2A3Ush/ioqcn3Rh1x5kh+GzDcCoxhmqBQ0Dks3bd5T2GuQavjgELv6pP0mSPyQzCq7rIqFKNJztJrIVtQ+DqLBDSg03xCjTGT6RRmmJOI9vDq1OydkC8kMLFmNT4M5rm62I3JZkdzcxJZJaUDRiYz/LkbK41wjHm2dkm5pkycwuvIzy46SfUMM9tc5mkqk0Vg0Pnflq5UfYNmMOop5BAnD2etOA5/ODibfyG3izBbBeTiZ79lFge7rmNVSPz1pLTiIOcb2sQ== 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=Fxre35NuWmmIXYP/rslmXb++Y+XLqThXUTlZtVQ4egk=; b=ZMUqS6FydI/Z1O2MDeeonYqikWyFg0fxbM94Esvc8YwRV9OGn8cmR7NQSYw5oqPWxva+vGPF4eorYuSsuun/tkq2JwNyQ+Col9R3GRIwrNbkH/QSBHMFyiS/xSMllNeX687kcbT8rjYdaqqr0pKfjRbkVObITFLKByQfGbvWGag= Received: from OL1P279CA0056.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:15::7) by AM6PR0602MB3509.eurprd06.prod.outlook.com (2603:10a6:209:5::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.19; Mon, 23 May 2022 06:23:20 +0000 Received: from HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com (2603:10a6:e10:15:cafe::54) by OL1P279CA0056.outlook.office365.com (2603:10a6:e10:15::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Mon, 23 May 2022 06:23:19 +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 HE1EUR02FT087.mail.protection.outlook.com (10.152.11.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 06:23:19 +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: thomas.haemmerle@leica-geosystems.com, linux-iio@vger.kernel.org Subject: [PATCH V8 3/5] iio: accel: sca3300: modified to support multi chips Date: Mon, 23 May 2022 06:23:10 +0000 Message-Id: <20220523062312.1401944-4-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523062312.1401944-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220523062312.1401944-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: 57fcee20-5ac2-47ff-d5be-08da3c84bb17 X-MS-TrafficTypeDiagnostic: AM6PR0602MB3509: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: 8e6EhuwRwmvVVVsA8CvMb5HjWgJ3cgZWInSxU+1pgPDAAvmaJH7gmkQ0Av2BjyUNnkT/1psQjWjgFF6jCSNKB10Z5pnMqrXMEtv507lSOuaW75xnapqIzomYENWu/5TqU/hP3maV3DiDq4CfcaTfNDO+YzVSt9zmaepkeytohobQfCvlgIGZPuAgBCgOLSWBg/wjb+gE0MiPjEfDg9KPS5PW2FXn8FPwrMR8JRsEGYE9BBcFzfInqqtughSQkCXmQtAvRxmuvn713c859k3fdMlyUX9+KYcJXa9yIlXqlNtsxxZO6OTvkd7BNU072z4KrLHkEMTR9BnkFuoxqYCK2OOhzhcnXO4FhfXhYrUAp4LczVsUB8IOAMEmunjAobXbwxAojx2N02NPNOeLjkITuYNQaOwoOfqVt4c5GB74hx6uNDgD20dY4hHpH0pePWuMt1/vQMESj9S7YAGPNhlqCyEVg3lzqE9E4vbLl1zK3epd5pZ7Qdx/jFNvzbV+nSQFYCMAiRDQDMxHaHTPXiCkjpPPwsdXzk7QWhKAV+csS4S3iyK/uNde+Tyzf+niJlKBJ9Cgs3qy3hZeub6v4pqmbGnw3/0P8qTCpXomehdawcHpmiH4Exnt3NlB2VCm46szwkNz6BsB2AnFQKo0gFDuQxu8KCohRz7qFFsv+Nou3cZzr4n7+7WsCeYU8f29qL3Q 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)(2906002)(81166007)(6486002)(5660300002)(36756003)(508600001)(70586007)(70206006)(82310400005)(356005)(4326008)(40460700003)(36736006)(26005)(36860700001)(8676002)(316002)(86362001)(186003)(336012)(956004)(2616005)(1076003)(47076005)(118246002)(83380400001)(8936002)(6506007)(6666004)(6512007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 06:23:19.3920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57fcee20-5ac2-47ff-d5be-08da3c84bb17 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: HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0602MB3509 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 | 198 ++++++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 41 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index ff16d2cc8c70..6463d12a9ab9 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,24 @@ 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 +434,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 +451,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 +493,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 +539,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 +546,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 Mon May 23 06:23: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: 12858494 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 16866C433F5 for ; Mon, 23 May 2022 07:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229897AbiEWHGq (ORCPT ); Mon, 23 May 2022 03:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbiEWHGl (ORCPT ); Mon, 23 May 2022 03:06:41 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20708.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::708]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE32722DA06; Mon, 23 May 2022 00:00:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mJKK/5fspzwHSWNGT7fcB0V4crpEInzJEtGM6pxTIKjpjfxRwMxC2EI+updu2SmZjz0RNf8Rs10hZ8T3pegLL8c6iDlU0Y+P4aTyw0U6/NVCqcx6PdMtdOyce79FQsuM9Aj69MT3Mzr2mUnoaKy5XArnMKJs9/CQ0Y1d5NPD0/w8bkB2VUn15u75u6dXs8se4UfXAtL3imS2p8RX+kn+08LEmgrDZps6fvgv6c1MtLOk8PwPO17ySJMlzdZVQlQMxL+0vlkbuTOTauXuQxluQn8UGSnLk8bluaa+M9CJL1UXlVYxTX4+npP88RYy4I9ZNt2bvoCP092zV4GlWZg/JA== 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=P8yoyF68Bxn4Gfq3xAadWluBVti5y8fchFtvTFTU50I=; b=e/S2L0OBMtemDs8ZUG+1PP1xjj6U/A139AFquQ1HR6rlYvmlENR6s+3SK7/ZCIkDWGEqE/QHchUd66FbdSVQVFiZau2jGRzWFCibFZ4B5+mO4h67mkyPatul1vOzE6sZFM1Rkxt//gN+EWCBH2O4BdKCt4NNVFrWlP7H5fLPRtnAoQ20hXvJhFK1uTYhWLznDVKR0+21YgjVPaxszPP3tPwZc0xaoxsg6qHLEXKYLEkC+YXUIvwNoWRh0Tpyr2+AD3OlYDsusr2HTa137YBDCG/YRG+ujTck3tDmFa7zZCyqoNcUN0fYG0zzLEcwZoGG+DlB7qGJc4YQmhR7e9PIzA== 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=P8yoyF68Bxn4Gfq3xAadWluBVti5y8fchFtvTFTU50I=; b=mMcy2oz+87k/t62GcSKYYOOz49EW73NJa2MEWagCNZvATVWqxu5Xx3vss7NXTHL52Ola2f76IPBPT/p0s24lyNFeQ2Cqt5CMLFR9TcApA8+NpntxdBheHwatKOc13LAhlZM+QtjCu5Stm04uHAUcIWjVFxT+DytlTQ4LcnF4YD4= Received: from OL1P279CA0056.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:15::7) by AM6PR0602MB3509.eurprd06.prod.outlook.com (2603:10a6:209:5::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.19; Mon, 23 May 2022 06:23:21 +0000 Received: from HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com (2603:10a6:e10:15:cafe::16) by OL1P279CA0056.outlook.office365.com (2603:10a6:e10:15::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Mon, 23 May 2022 06:23:20 +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 HE1EUR02FT087.mail.protection.outlook.com (10.152.11.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 06:23:20 +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: thomas.haemmerle@leica-geosystems.com, linux-iio@vger.kernel.org Subject: [PATCH V8 4/5] iio: accel: sca3300: Add support for SCL3300 Date: Mon, 23 May 2022 06:23:11 +0000 Message-Id: <20220523062312.1401944-5-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523062312.1401944-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220523062312.1401944-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: 85a062f6-38f2-4202-f263-08da3c84bbad X-MS-TrafficTypeDiagnostic: AM6PR0602MB3509: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: wGpsH59m22onbtuweZl1oiEaP1fZ3e2UZRzqwJr4bj8JxsYuypg1YbeGkrFeEVmxwLX6GhPRReYylBIxhah2xsHnheVyAAtnl9JLbOThkEM1VeoPDHO9Be0hclKBaje7RwvthVs+yTXSuxdVt8Qf/JHWuT+YEgoEOe2CLeQVK2v+ffWLJi9qAh8ND/NlbF2ikHWVX9rDn38l1X6nJ+y4nPfd5z3Rf6Nwl7Ik+uxLV1qq5+7p729EDwdWrqb3k52sj6UENqeb5tEc2TZ2Xkkcid+aPXUY1fgChYjTuSx9tlhrcoyjvInHOqns8B5LjDJ0/O2VOUa3LYcirZw5vNP/1oNEbAVtCFS+ckjMaan0o/NCLnr1Ars1LMPcbuedSqQHsK0WFEu10qKCGPan1RPzGOC9bmojCw/SMGBO2mq0WJjtkOYqh+wioHlvpaG3XAsSwroxvXY9XAeQlJr0aWOtYzs+8EqQ6YelxqdA7qDQ11sQMVM1fJHjXWnHNERFzEQQFN/UUHtoS0IcUy2xQ2PCr7tT3+gUqERqGBVwh4lKd0xjQf0CgoOOXhhCYw9CHcDQLSSHSflAHaErmroohW7XmTP34j3+0V+hQpdvBre5rCdFYssunP0wzCioM2C3F9k69LtG87msSe6Y5rTV/28jWW2EmW95wMfz7SXNH9Bvv8dzvJGTOXH2Z1YuLl7Tc8ikQsrd9NQtAe+6kyTeYqUyvGf2clwb5IZY9y4r8xudicLZ5HUfgnYX2iXxSUkMKUzfJu7MUbrQJjMU3fqsSqx6sA== 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)(2906002)(81166007)(6486002)(5660300002)(36756003)(508600001)(70586007)(70206006)(82310400005)(356005)(4326008)(15974865002)(40460700003)(36736006)(26005)(36860700001)(8676002)(316002)(86362001)(186003)(336012)(956004)(2616005)(1076003)(47076005)(118246002)(83380400001)(8936002)(6506007)(6666004)(6512007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 06:23:20.3758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85a062f6-38f2-4202-f263-08da3c84bbad 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: HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0602MB3509 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 | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index 6463d12a9ab9..74e780a7ffcd 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,21 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .num_avail_modes = 4, .chip_id = SCA3300_WHOAMI_ID, }, + { + .name = "scl3300", + .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, + .avail_modes_table = scl3300_avail_modes_map, + .num_avail_modes = 3, + .chip_id = SCL3300_WHOAMI_ID, + }, }; DECLARE_CRC8_TABLE(sca3300_crc_table); @@ -443,9 +467,11 @@ static int sca3300_init(struct sca3300_data *sca_data, /* * Wait 1ms after SW-reset command. - * Wait 15ms for settling of signal paths. + * Wait for the settling of signal paths, + * 15ms for SCA3300 and 25ms for SCL3300, + * take the max of the then. */ - usleep_range(16e3, 50e3); + usleep_range(26e3, 50e3); ret = sca3300_read_reg(sca_data, SCA3300_REG_WHOAMI, &value); if (ret) @@ -572,6 +598,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 Mon May 23 06:23:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12858495 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 C2A22C433EF for ; Mon, 23 May 2022 07:07:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229934AbiEWHHL (ORCPT ); Mon, 23 May 2022 03:07:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229950AbiEWHHJ (ORCPT ); Mon, 23 May 2022 03:07:09 -0400 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on0725.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe07::725]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F2DB6160B; Mon, 23 May 2022 00:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K8DjPAM272hafXT9ZdRMGrNE0Me7VgBO5B0S5Gicbk7zuOmX92ky8iMhRUc6Lfk07NuUB7thxmy45jJsBDVNKuulREwdGmWKG5VIw9Oyigbkut6nhWnyhkR83QFVLhBfKKXVINrQxKVZXYJnsi8Ir2V5OBdvwgqHWGWBM+YLqPYMrvyXt209J2qz0u516+XPo/mmEqLEcROSHeI69WURYa+8p8wvLSO1bz9P9DP31BsiY4d6DfgwYDCqfCmFH4zLCqMT+fMEfKLk2WgT2ZgxhM7TQ+eDrkatqRPe/TMK4A2ScujASmhlfR1nALsvavAr+AaHQPobyX5lnnoGFw0O8A== 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=wn2d8wAKJShjfj5uXedFfYAOJWlKWLtDuFr+7+rH4jo=; b=BlMNEpq/tUel1J3DVskPkKeBtuGiwWDAjKa0cu6FHxv0rlIuVvTnyFyAHeByp/qPGY8zxZ9MZ2wy7+zQxBaU1k6CIVRxa6v5rqANNVqKB+6y1+pbuEGpTIg6gKrMNtWchjm2I4/1JFHx2xgDLfvUHghFyimK7EJyxiK3FOuYBzSOS6xXMx/JmZXv8ClY9JkRwnnEDwtFQISkb/8y+Oy6EkRcgnMMl3nRslD9UOFl8S9WBSyN/n4182PEFmiBwqJXE4m5oyuNTPw3hT5Cbv3exx/tgdoJfPGURcdEPJSksUXd3FNR+0gVobRbDZrhpzUKO02ArpF/fdugIqFZ79k0XA== 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=wn2d8wAKJShjfj5uXedFfYAOJWlKWLtDuFr+7+rH4jo=; b=IYQsVh8QqTOeYLE7t7PwPeoFCDkdBxd3ivSKDVCFvnWgVpS4fLm8v43+z/OSgmVFSasJ+9Q+XQEbIh7Khfr6uCch5sGrvq4WIqnThnHYyCM136kOhkQr8BEL90+++lG0oDVifRkgKsx5Qk8bHsLrTtk+qJzyy5d9TujfNBC46D8= Received: from OL1P279CA0070.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:15::21) by DB6PR0602MB3253.eurprd06.prod.outlook.com (2603:10a6:6:f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.19; Mon, 23 May 2022 06:23:22 +0000 Received: from HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com (2603:10a6:e10:15:cafe::71) by OL1P279CA0070.outlook.office365.com (2603:10a6:e10:15::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Mon, 23 May 2022 06:23:21 +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 HE1EUR02FT087.mail.protection.outlook.com (10.152.11.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 06:23:21 +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: thomas.haemmerle@leica-geosystems.com, linux-iio@vger.kernel.org Subject: [PATCH V8 5/5] iio: accel: sca3300: Add inclination channels Date: Mon, 23 May 2022 06:23:12 +0000 Message-Id: <20220523062312.1401944-6-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523062312.1401944-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220523062312.1401944-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: 24495935-9358-4c29-e2e7-08da3c84bc45 X-MS-TrafficTypeDiagnostic: DB6PR0602MB3253: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: GcXOgLu+jmWw/jA7sth9x1XqCa2fzq0kjznfc76MgmSpZHYKqI8ZoFwMhIMpVfrEWTnMeQtZsuF6+RkvdrqZkevo2IbMAVeaasWNOHZXdStfBkbkh+vIWdAZH4HzVQhPuI/MGweOYxXmXAu6lj1dNUTh3sECO4JngH/MqxuwZy84CyFV4poIl2X6EkwoNqfDwl6CDFHsRNLKI+d3bU5ZtrJHRIDeynDFLGT+qQMG7ZXjEPEpjYh+mzvV7lozcg/A8s6rSE55uFhDk7Ps6vP5a46NNdyYNTwwgYlGa8hJ5bSyG3OxM51r0uFaAA/muRqoS3veZfKc1hdXpiGghIGhVfynI1Nh63WB4+m6LMOMN2kK38PgTex+wkvEn9BH9LxgEIHcpHT1GNoed7C06m7lqj9qtWZ8/MsgVJIW8QxjegwendLZ3lAhmRwrDaNTf6XuJcLnRnRZYLVDtXmXtaAOUyir5hAi5VVCNxtquGLv2JP4FrZL1MXXTUyjz6VJi43UT2fuYUjrngcoGBSawGuDCEf5SHBMe9HUlWrXyql48c2uO9vKg/Hl6LZs1ISg6GJHiOFGfJYGrR23/DXdjNPCUK9kFzFaMdFaCYIafADBJKOTIuhqtpjoTXeL2v6qYO8JtfRBjpwoZ+BbaRilbPdFQFatxrRam2n9LttHRV1HDZaOzF5kzUI60Ica0Yyiy26v 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)(70206006)(86362001)(70586007)(8676002)(118246002)(36736006)(36756003)(316002)(26005)(82310400005)(4326008)(6486002)(6506007)(6666004)(5660300002)(8936002)(6512007)(508600001)(2616005)(956004)(356005)(83380400001)(336012)(186003)(36860700001)(47076005)(1076003)(81166007)(40460700003);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 06:23:21.3725 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24495935-9358-4c29-e2e7-08da3c84bc45 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: HE1EUR02FT087.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0602MB3253 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 74e780a7ffcd..c7fcb0de5462 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,23 @@ 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 +129,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,12 +167,16 @@ 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; const int *avail_modes_table; u8 num_avail_modes; u8 chip_id; + bool angle; }; /** @@ -167,21 +215,26 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .avail_modes_table = sca3300_avail_modes_map, .num_avail_modes = 4, .chip_id = SCA3300_WHOAMI_ID, + .angle = false, }, { .name = "scl3300", - .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, .avail_modes_table = scl3300_avail_modes_map, .num_avail_modes = 3, .chip_id = SCL3300_WHOAMI_ID, + .angle = true, }, }; @@ -401,6 +454,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]; @@ -488,6 +546,13 @@ static int sca3300_init(struct sca3300_data *sca_data, sca_data->chip = &sca3300_chip_tbl[i]; + if (sca_data->chip->angle) { + ret = sca3300_write_reg(sca_data, SCL3300_REG_ANG_CTRL, + SCL3300_ANG_ENABLE); + if (ret) + return ret; + } + return 0; } @@ -523,6 +588,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;