From patchwork Fri May 13 12:41:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12848772 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 05644C433EF for ; Fri, 13 May 2022 12:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380302AbiEMMlt (ORCPT ); Fri, 13 May 2022 08:41:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233016AbiEMMlq (ORCPT ); Fri, 13 May 2022 08:41:46 -0400 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10133.outbound.protection.outlook.com [40.107.1.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A3E736322; Fri, 13 May 2022 05:41:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OloThzCxM7KN7nHHoI4C6bYsbZ/rwUPEc773F5cu5bZ+c4xFx0HYItnYpYTGSADgcOZYlNhr5KGsrUgCE05eDuVCG1UqDIruXmw0DxP85yxBP5q4Dr+8sIURtEDA/E7Vex813h+TnUnt/kIFv+3mK9iXWI7/grtrkfsjj/11aj+N5bDmVAlA6gXpFPqWyQdoMEBUHPh9OZyr6hpqVBp7dJJ8gFUeGRvVDRSluK6gQ1fNnKLodZy6HtHb9LGXI67O7j+Kot0f2IzzGulNmNHu/ADlVqR73IDXQKHAnTAam1lihpNbBfvnQEpo5SBTNhL0ujC8rDNcBCaEE+Xe1QDimQ== 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=JMsBbUJm8EM7Wl/GmGCGCxNOHllfCwH2J8mqmiyYt6af5Nq9CtOnewhfrNO/e37vMLf9L0hYsU9OUTzbAMf/inXQU9n5r/SYvog/DGj82z1zTmS5xkaiBCkf6R4p43RV5ecUxYZjAIqISMNjlY44HCoZzXDtrnOeRCBA9AivqY5j19UPjCiQ69gTQIEk9KwSdL2ZZ1QVWT99qEVNEYBmP+QUuOn9JgfFGlfu5N2/Eb+ZfC9fLhvF6gGIbvYBgqpV/wQjRoU5GVYPs7sPYGTEIyzmvh2Trwx344fIFELQihQq1Gx/FVaUw0LbGqjRtE8g8WovGQSsBZX4X/0jK6IjMA== 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=SFEov4PFx5zx+M9Znn6SETybV8+0k+b4kAjD2CIzXR88BfInUkjzN7x+yq8LIlPeJYpKIdX/YLNVJDlO84t7IKi6rn+Uf3iQ69o4NVFaMJWkUef7RTkvLTQI8RpJAH6kB7Awp4ZtE0IpAs0rRZJtI6Qv4yIxd6dwMyzB3BJ+8WE= Received: from AM6P194CA0105.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::46) by AS8PR06MB8120.eurprd06.prod.outlook.com (2603:10a6:20b:3c4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Fri, 13 May 2022 12:41:39 +0000 Received: from VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8f:cafe::42) by AM6P194CA0105.outlook.office365.com (2603:10a6:209:8f::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT036.mail.protection.outlook.com (10.152.13.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:38 +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 V6 1/5] dt-bindings: iio: accel: sca3300: Document murata,scl3300 Date: Fri, 13 May 2022 12:41:31 +0000 Message-Id: <20220513124135.1295822-2-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513124135.1295822-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220513124135.1295822-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: db6415f9-1225-41a1-d92b-08da34ddecc9 X-MS-TrafficTypeDiagnostic: AS8PR06MB8120: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: rFZXJ/wqz/gz/zYsgfuOujcuNInsKUUHFoCGunWl6z0+KbPFVNxDZZr+w0Cle/FYP19nCAJzRuDdPcR+6iF9Kcvrqw6emZZuIswWy1C/YmMBQPXgwgZT2vQ/+tVX+WXaNsmoLr8+c4iEXooIcr8h26SvAAHAzNkz+cinfnBFxjOLcQWqXJNd1I0YDNnFGtjWTNPYSMAjhgsm353giYBsNLXgG3NjUI9hLFTZgv9QiQ89Ax6EyvDxm4pki0ciusGLBdJ/Z+6ll/4yLp0ZeSL19vAM0zzZ+vzL08VAEZzCWRX4Qc66HezV54hoIz2tkcpvER25x51YPA8I/JewfiboDXne3Y+/uMqBw6F7JYqaYYZhQ860sKzIC3OWoMmQjpsTHFz9cQRNwSof5OXqDVOTYpgGeevwcJGFM21jEjMkN5Uas6z+HnNhGoMe4UHXmu+EyYero8rQCjaK/novNo8flbHkR3zQQAVekTltWaMzk76ISExd4tSSBHh/Vj63Ywc7xAp5c56IeQSCWZ+rbN1vc8+1AK6euOc64r0zjVvRhg430L7Y1MMw8Utj8Or6Tu4vqq8JtlDw5GMxTJmAy8fvmBrAVLn5ZWJ+edFbBLXDoPVKdeEMRjm7aAJhExBmqmISfmO+jn4KkyEvDBsaX9yDCYFEa0G8nzD/HtkKDAh7P+ExD8aRLpzZ4rJibZ7Bk3HS 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)(70206006)(1076003)(118246002)(316002)(70586007)(356005)(4744005)(2906002)(36756003)(47076005)(2616005)(956004)(6512007)(26005)(36736006)(6666004)(186003)(336012)(82310400005)(36860700001)(81166007)(40460700003)(86362001)(8676002)(6486002)(8936002)(4326008)(5660300002)(508600001)(6506007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 12:41:38.9070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db6415f9-1225-41a1-d92b-08da34ddecc9 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: VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR06MB8120 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 Fri May 13 12:41:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12848773 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 29FD9C433FE for ; Fri, 13 May 2022 12:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380316AbiEMMlu (ORCPT ); Fri, 13 May 2022 08:41:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232952AbiEMMlq (ORCPT ); Fri, 13 May 2022 08:41:46 -0400 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00121.outbound.protection.outlook.com [40.107.0.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92A6E369D2; Fri, 13 May 2022 05:41:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OB5XYuByddw9iKVZnkoDnEg4Lmptugh2Jmt7i4gapr0//igFMKWZmN+HWYcOr+18E5Qukl6tmyX43Tgg/tgVjkrzpzLRgqsNFMRg/l/1hvJvHI0MrJgp2uyWEajoSpLcHdLAjWHDLYCuWVyhUOsjwB6LKrTFARAJJ14durX7wBS5jP8+giyRFJkFytl5b3uUuYyA1QhoB+sVrSHb+IsLizCn4nGTCe6aCqNS/i0k3DGKSxZyi/NOLu4gIYTp4g4hnx07jQcOxWxC/bwRONANerblPJPo4dMEDxPHR71sL59UXVgWvMUoaQCCYSHbOJqBgglDPebo4m1u7coj4jkHbw== 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=TsPETARwc2AiI5/T8fV11Qa3dy23jeFl8Z19lIN6850PvILXavwLtzPZu8D/UPkAknNhusTMTo9bGg9BvR7JwuIixizxtQ0onqnpCJya+xBLJ3NiMHWD+wFvBaqiLBmVUdEreLmPk4a0JuQOxdKsB9rNgwEZ26EjO3XXk8dn+BnN3eOzzraA0ihQe5tGBEnnauwWyOYL6uV+9FKCP3mATCvIP7PCt0grsBRibSmE8MhOEh7rLI4Yx5bR16EtpO/UZJEQfNVpcMI4Ck6cn7F/54/jlqg8U66dYhm4UMfE47OOrQaiFhOdjGZh0WWd/zoQvadDHW35+v/SReSZ0cM5iA== 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=rBln3vtfn5JWPVFhZ5WtIXuDAK+ai6YMLH0GAygEtItpj1oSTeprvzXDToCMfGjlG5sOOPvaWQekQXB69lvSpDuK69/zIe7bFv77Ag7XZZ8pz4gqIbDOfvjSM6FxNcrVCu1nff5G7hmNZ9QdAqB6IKj+i6xhLS8WWTSEetspfS8= Received: from AM6P194CA0078.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::19) by DB7PR06MB4773.eurprd06.prod.outlook.com (2603:10a6:10:59::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Fri, 13 May 2022 12:41:40 +0000 Received: from VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8f:cafe::a3) by AM6P194CA0078.outlook.office365.com (2603:10a6:209:8f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT036.mail.protection.outlook.com (10.152.13.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:39 +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 V6 2/5] iio: accel: sca3300: add define for temp channel for reuse. Date: Fri, 13 May 2022 12:41:32 +0000 Message-Id: <20220513124135.1295822-3-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513124135.1295822-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220513124135.1295822-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: 202ca082-0661-428f-d383-08da34dded26 X-MS-TrafficTypeDiagnostic: DB7PR06MB4773: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: 4FntvAQv455pU/FfziuDgN0RrDRnBBTysxZVoV6AHRWfHij3yn/A0hGDzd0bn1bt0+VN+iGRJ9FBssu7bA+42qnVfDvFigz3Il12oxeN0r0sy1O6MTFoPvcoezTSqwCJLq1CjCktUsXZpX01qSjgDKs/p/Zv6gRmekDzSncOXZMMq7Lp9sGYkFPOpqv+wjfKJb2kICvacAvMlGEJ5bK9SeGS/uKNFVyRXlIV+II7NgWxFJTTs4HRikGPR8v/XNUMWyZq7tqRfa8Oi+fXZC9ST+b4/uCKaNVUaU4xyPZRvnND9NDGwPVjeneGdZ+jKX8x8aXTFxv+2LJ4QH9QprqeP0p5kShwpgNA+b0NBFF0guLmGksah0w6JtoMP0STTuszHxeprcEB4iAzv+P7FwCozzdeX0MKFmzjUkCYmJqfOZExCqHMeb1YAz1iksD2+y4XSNUZ4LCxqCr1wo0kYpHN/7K1AB27boi7GrtDS3/E2R/hTD62rFP+/GLcUmNqiID0SBLPiNUWi1gddVmYIOiMA7u+WASEL1/C6zolpxVW2Z2WycQXpMoL5HU0L0jEn7nhqGRRsW5G6XcXXkiEh2I/KTQ50yakLP+m9j7R+Za3ynF5sq4K8k0YE7ypLPGQH/fXiUbjW8ECDrBvb3/Qz2vmjneu6RodyBwweKY/wQsVXMyPuCC1ydlMpvok6rIKXD89 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)(5660300002)(70586007)(1076003)(36756003)(8936002)(118246002)(2906002)(70206006)(47076005)(508600001)(336012)(86362001)(36736006)(316002)(956004)(2616005)(40460700003)(6486002)(83380400001)(6512007)(356005)(82310400005)(81166007)(6666004)(36860700001)(186003)(8676002)(4326008)(6506007)(26005);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 12:41:39.5320 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 202ca082-0661-428f-d383-08da34dded26 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: VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR06MB4773 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 Fri May 13 12:41:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12848775 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 EBDE0C4321E for ; Fri, 13 May 2022 12:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380359AbiEMMlx (ORCPT ); Fri, 13 May 2022 08:41:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345527AbiEMMlq (ORCPT ); Fri, 13 May 2022 08:41:46 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60123.outbound.protection.outlook.com [40.107.6.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ED4A369CD; Fri, 13 May 2022 05:41:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XNFoc4TXXyg1iL+fqoTocuDf98pIjewCQpuWOKWfGxLVxXR+AllkGnmZGXGZjerwuCSeJfX/4zMk1DzK+IMIOOB29+5srM61YHuNOGsvlXghwzWMX/RggyFgj50OXtB7/jR6ylSp69MT5PzAf1eOlXg0Kq0MOtbp26fyTDDwAlO8+sdoK9Y+nFB0+uQOmcOEHzcIWxconsADElfNVw4KRnHn+DjwsVDaADdTYfQPOtvxJbx1JSLU/fu3uYJL+JPoTiJUBA+tJ/YB2eeMcBO3zR6Wx4kNr/C8adjow1Yynpnm3YlZB5fk9y9Z3NzBwXmxcwL5JMA4N7wTcSj/x5At9Q== 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=BOmRg7SHGEHYCTdld5axv2RJXUn4Iul+jriAucWAWY8=; b=ZnNDoXy56EIaTyegxF5rGaVHo8JXnmG0K3SVcOrVxp9u4Co1JXdiVOLlsYnRXm84JnxjUVBnyhtncgT3ev7Eh1qZdTUbMj+LL3XlfXjSyLqxqXywUfFsGwnhPYapPJJkoPya2JcSPcez98kj+FpcCNDpPPDTLCkelt+niktVoVYpJ1yQbu/Bn62VT6eezmdRJXxe2SH+fd5H7zG8rUkKorH2H+RXYC7aQNeEuPmFH8++PihqGGs8Ip15qQ1COw1oacl4VPIl9XtCEUhMhwf3bnabxiwgh6Nf3e6pJP61PKYp42LMUx0NSAD5WhmvGJobv9E1fcMwYGFuRoXgjAuCrg== 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=BOmRg7SHGEHYCTdld5axv2RJXUn4Iul+jriAucWAWY8=; b=UrE5mQf5STiIbFXmkRLh/weI9cVKGFV4oUFvFLDqrLPvqkHiezF4XWbQHgXK5JGkfVH4pLs3HG7DhXIPTLHAPwI3A6j0dmjfztUa4wIUlqhCGnSdA3ye3La399Jf0LvCIv5HAOV0OcSfjMxyp1TJpghbC5xnIbOi5EuNXcs8TiY= Received: from AM6P194CA0091.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::32) by HE1PR0601MB2265.eurprd06.prod.outlook.com (2603:10a6:3:93::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Fri, 13 May 2022 12:41:41 +0000 Received: from VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8f:cafe::48) by AM6P194CA0091.outlook.office365.com (2603:10a6:209:8f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT036.mail.protection.outlook.com (10.152.13.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:40 +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 V6 3/5] iio: accel: sca3300: modified to support multi chips Date: Fri, 13 May 2022 12:41:33 +0000 Message-Id: <20220513124135.1295822-4-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513124135.1295822-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220513124135.1295822-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: c1ff52e1-3bf0-4193-90a1-08da34ddeda7 X-MS-TrafficTypeDiagnostic: HE1PR0601MB2265: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: 9pc9SPuiqKMdLAQY6VWGxAHXBwVSA7HecPo7QBydrsc0v1yunlyp8Lv/tnQN0syJbIUbWIPNWLZ1LYSHi161RUVFomSvWa44fLKI1Sigwo+GZWu8rVtpkqOuvjGh2iatHHE8nmB4jasd01hw+3H+GUIeCrIDcsSvckiRvAJdRFZacmNDsbJoCJgVZuZkGlE4IwvhB1uTyTJGr8fl82wXsZvan1kMPG/eRAWIxLKciV3ITJTs8UhqUywGDANLkEA+noXzzBHPuzgf7/Q93tN5ueQl1HlLxxu00Hx/SCnN3IdMEfd3TjkC7+XkAOEdTXfO7iT/IMwzQd9sm9bVnNrbPimzytQwZHR0dx3kdRFASo0kC6uGRpdcKwyKbYPJBXNyL5DOqS8Hv7n468qxIDtDY5dyGrVov8547XQzyTpvzej4n9/ZFXKKYMMz1OE+Aw7bhNYLzg+i4JmfhAVkUx0EbChIJS+laDHNrHlbHoiTzzaCw6Znswjj4iWa+zRVB/iMezMA6AAavDuXIibqJlncJNGFcVfGU5hw9R6tl8oWf9LeJG2nzy6ZuBi1hoaBeIp0k0gt+V388fYtZ22CHlI7iBFQf/U4u6wADQHdKYTIfOAFEsaeeIS6u1Qsmj4lF6ry2xAG4rEv5/4xw0k8L1EU++Zu7vizjHsr9DifXbrOw01vmRlvji2DOvYTFOdauaTJ 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)(40460700003)(83380400001)(36736006)(6666004)(316002)(36860700001)(5660300002)(2906002)(81166007)(70586007)(336012)(36756003)(956004)(2616005)(118246002)(4326008)(8676002)(47076005)(186003)(1076003)(6512007)(26005)(82310400005)(70206006)(8936002)(6506007)(6486002)(508600001)(86362001);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 12:41:40.3757 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1ff52e1-3bf0-4193-90a1-08da34ddeda7 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: VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0601MB2265 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 | 186 ++++++++++++++++++++++++++++-------- 1 file changed, 145 insertions(+), 41 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index ff16d2cc8c70..bc6e0213e4aa 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -93,15 +93,35 @@ static const struct iio_chan_spec sca3300_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(4), }; -static const int sca3300_lp_freq[] = {70, 70, 70, 10}; -static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}, {0, 185}}; +static const int sca3300_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 @@ -117,10 +137,29 @@ struct sca3300_data { s16 channels[4]; s64 ts __aligned(sizeof(s64)); } scan; + const struct sca3300_chip_info *chip; u8 txbuf[4] ____cacheline_aligned; u8 rxbuf[4]; }; +static const struct sca3300_chip_info sca3300_chip_tbl[] = { + { + .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 +266,80 @@ static int sca3300_write_reg(struct sca3300_data *sca_data, u8 reg, int val) return sca3300_error_handler(sca_data); } +static int sca3300_set_op_mode(struct sca3300_data *sca_data, int index) +{ + 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; + unsigned int i; + + if (sca3300_get_op_mode(data, &index)) + return -EINVAL; + + for (i = 0; i < chip->num_avail_modes; i++) { + if ((val == chip->freq_table[chip->freq_map[i]]) && + (chip->accel_scale[chip->accel_scale_map[index]] == + chip->accel_scale[chip->accel_scale_map[i]])) + 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); + 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 +350,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 +360,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 +422,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 +439,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 +481,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 +527,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 +534,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 Fri May 13 12:41:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12848774 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 1B21BC433FE for ; Fri, 13 May 2022 12:42:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380376AbiEMMl7 (ORCPT ); Fri, 13 May 2022 08:41:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357809AbiEMMlq (ORCPT ); Fri, 13 May 2022 08:41:46 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70129.outbound.protection.outlook.com [40.107.7.129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B5D036B5A; Fri, 13 May 2022 05:41:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cRD3t80b8GB9AYeXYRzEHAOmYH896JasVDUncafZDX1O13iNLB6ZXSCOg/aJzXuWTfgnbRg6oSIGq9OooV6EEfDD3+5wnr97TgL+piVJYoWJsOHgT9QjmpE71ELWHvsO8DDchUJ5mlWAZBk4cpGz4TFDaszWvG3agnFDYKK+BohMA4Xef8MKb1hVKSTognwe2j1wB5bh5ySLW1vGZ1DHxoyqwaq/BCE7CWuOLQj4s6jWME2Mt9vBhEnAjSXRvUECmaT7Ji8XAbkngtAMBDyxFzKfE6JvIJJMjbZ3Ouiowt0ryGxjQQTD0KQuRd339zEMVYhVeX1f3Zxm9St13dPh2g== 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=LfxiAiriNxuUzPIrcGO0adv4+qAf+3+3PEw7v3cRLJs=; b=bolyhSmqKeZ8XiZ1V50fyvczuGpBcda+/zYne+Qsa4GIlbOEHPonVX4F4GCmAmx2tqNYwO6znxnhwAicuWPIDkoVygUOmFaA/VhWmhQf9KUHZWbV1zs7O11O9CRx7Ey2Mt2FMH05D84mUCgGtLpRvIDbj5J/4iCWtR+i1h3v6k/UT2rZZvckLSLJOb6WMyJSwKdPbD77L0gVOwDTXlTRBcSHN+4hR2571dPtTukZChJ6itiluw0j13iDf8SWY4RKToLBMGCAGEZT82iBjCspVOFeXV6U/tEhmmrkDNvSM/494m5eX2+GdB3xFeAgXtU6+PkFLX8hnjlgmXhFtgKTfA== 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=LfxiAiriNxuUzPIrcGO0adv4+qAf+3+3PEw7v3cRLJs=; b=S6JLSbLYnusCUcsWTHsxb7gnnrr+QMP/GIJHarQBPVhTo4hyrHllq2rblQ8rnqodcGypT1Hmf8JipXcn3Wf3IJ97fws033xn9Eht+2nsAo9Gq7t/+i2+P4yTq3WYK4K3xD1E/ZDiji0IpsM/aDqvjlHfO1YzruH2Cts3iDoigKs= Received: from AM6P194CA0093.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::34) by DU2PR06MB8333.eurprd06.prod.outlook.com (2603:10a6:10:2e4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.19; Fri, 13 May 2022 12:41:41 +0000 Received: from VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8f:cafe::c3) by AM6P194CA0093.outlook.office365.com (2603:10a6:209:8f::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT036.mail.protection.outlook.com (10.152.13.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:41 +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 V6 4/5] iio: accel: sca3300: Add support for SCL3300 Date: Fri, 13 May 2022 12:41:34 +0000 Message-Id: <20220513124135.1295822-5-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513124135.1295822-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220513124135.1295822-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: f9eec1de-3b5c-42d9-603d-08da34ddee3b X-MS-TrafficTypeDiagnostic: DU2PR06MB8333: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: 6NbZ0i21SjAnJXy2cxFgDapz+XH3xyIixgVBKIKNlBS0+ccwOHRkwsxbCNTSCcYWCYsVJgIBV/MfiQSkYiN10YgbqRgdhUzr58c6Qb9bj5+i/c7dJn9n4x09+iWeZiJxlq+k1enzdBhIYIyRqjSglz5ZQ8hA6Nj0wIs2oYfLrHEEJ/9ldHBL91Jo9SGr9P36ve8pbhbE/i4ZsJ5P4RlnFQiCp/1DqP2SvAlpM5d8TVQTti9W8SsftewKI+8wC/BE/piHPVtQ5ObMOy8V7iWJvIh8WZv+yUQq6TQkfCIsQvnvGw+hN9m4I8IaM2WywQdjBCUMqVwzdxsccuB2QmlLb6UsPxm3jLJJcIRnyTQr4qNjUApS7XxNbvd4dAVXiv6M48TPVUWHlgDRQyDJmDyelNJe7JqLVbK+vEAA8p1d0H2CJwbPoqcH8+JVbO4ToatLw34XtKFIYOfzk/dVpYJsih/eJYHlyb54aIFfjq2r+rIMjn/RQj1/SuaVapcr6hmeuxiYHxLp8YugjolWVNK+b2onV1xaKyJSgjqc/qzTS8sS67dDDERM+UeUPBhJ6xDpYfL67a9YoMGeg5sr2orQrmGZmrqxC5QuP2+4EskdbKBpQTa+6iLwF7RsZRlIvbd0bLe/dSjNOCjS3DFG27IdrhfP+Fefd0hvCzrl49DmyhRORTEKnom+qUlW2nhUiqIOyiCfALnaophK9niXQyZdC7nzRY0NsM8QueGD54M4K1NC9duhxfakbr0TIa9QbnQxieG8pUKUKstG5iAk+Npkpw== 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)(46966006)(40470700004)(47076005)(6512007)(956004)(6666004)(70206006)(508600001)(26005)(81166007)(118246002)(8676002)(2906002)(6486002)(40460700003)(86362001)(4326008)(316002)(356005)(82310400005)(15974865002)(36860700001)(36736006)(5660300002)(8936002)(70586007)(6506007)(36756003)(2616005)(186003)(336012)(1076003);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 12:41:41.3444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9eec1de-3b5c-42d9-603d-08da34ddee3b 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: VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR06MB8333 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index bc6e0213e4aa..3dcb4296fad2 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), @@ -158,6 +167,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); @@ -560,6 +583,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 Fri May 13 12:41:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12848776 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 29D94C4167D for ; Fri, 13 May 2022 12:42:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380379AbiEMMmC (ORCPT ); Fri, 13 May 2022 08:42:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378504AbiEMMlq (ORCPT ); Fri, 13 May 2022 08:41:46 -0400 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30111.outbound.protection.outlook.com [40.107.3.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33A2B36E1C; Fri, 13 May 2022 05:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hd1X9Gutb1yxEGM5MrPgoCn7QR17dtSmwbFVIbfs+ZvaKi1iYqFtM49N7/Ihu/UrdJjA3lK0lahcdEf+9NQFXjMq1n+PI/j1/0C6wtPL8NKztuGM/WqS0yuqae61RG3W7Mc7XM6ltlW/woahep9Gpn2/23iQjbu0p4SLMRYioxC6CtQLldLz1J1+oYQEC06KZRzyaPq0MwTpREWxODAHdW35LFlgklX80EiXL6hZMziG7TOBti+W9wIaQTPUW/5tYUrVscjooa/JyhGlq+2hwsUwu08uK2jEMSXs0yDlxDfO+PEpxMBXgF6YL6bFylecji5VAbgPnXslY7pttPi/Bw== 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=NG0uZlI8o+UNy9oS/hoK1dwvR0zWg5vlwduMmazLtJg=; b=FbwyvfombExD8r8rZ3Og9lsdyZ7L/7lEjEPkghVxdY0QitbEDUusM5cnUTcPAhZLXkd6oZlID/+eqqq4O2B3rj5CmGYmaoTSOYI997GiciQSDi4u6jh/fWQJdMjQHJbaG6x1PHIkm0skQSvQYq/+i1CV9lEBxUF9e0lMHAs1B8i1JgPQYNuilkY8iuIYEViPS9Rkw/seKJm02BbIueHNPXcrwMa/e/KARFVN45NswHUNJTkH4cW6C3ZT7L4IBDzbjTBrjMLQOudKBvV0mtjbD0o24N9G1aQFr8tYX0ue4plijy77pFZohqsstrDqFW9pdH0v0yfBL92/DRbuQ5PrFg== 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=NG0uZlI8o+UNy9oS/hoK1dwvR0zWg5vlwduMmazLtJg=; b=ZwF166GjbJ1WNmxuYJCpuWBeum0DscOotkFRVSlKw00fgiOVPtgzxhO1ZfG8alqSPWIjMRew4m7w/lQv+mm7kJoCyohonuNa0givL2kHSyaWTKCRQcLjPObq9AYCCq7Odk/NleR6g5kvkwV7gEMQNNqir2NEEkr7hyg/Kjnczvw= Received: from AM6P194CA0078.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::19) by HE1PR0601MB2698.eurprd06.prod.outlook.com (2603:10a6:3:4b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Fri, 13 May 2022 12:41:42 +0000 Received: from VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:8f:cafe::9b) by AM6P194CA0078.outlook.office365.com (2603:10a6:209:8f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=aherlnxbspsrv01.lgs-net.com; Received: from aherlnxbspsrv01.lgs-net.com (193.8.40.94) by VE1EUR02FT036.mail.protection.outlook.com (10.152.13.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 12:41:42 +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 V6 5/5] iio: accel: sca3300: Add inclination channels Date: Fri, 13 May 2022 12:41:35 +0000 Message-Id: <20220513124135.1295822-6-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513124135.1295822-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220513124135.1295822-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: 06101efc-3151-4c3f-e3cf-08da34ddeea1 X-MS-TrafficTypeDiagnostic: HE1PR0601MB2698: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: 2/o+VdOWnkyNu9Ytz30bsobObnUxn7Vb9/qH0bqMIIXh4/XdAml3fjLnailWpmpWhwtUuvkHP57y/uBzV0QDq5g/ula3EQ55/ECjdg67d1JpEq0Ri+nYB8T8pGuQxL4N6AI8aSJTSnpzMSuQNnr0GJlUt9+pzA0N7M5+KZMaWSwFQIqHMCvv9bH0OzYc+vk0e7V8Wl5qeS7HuTg5TlYKUZxrBzObim1f8KGzqASVoeN7zwQBxrMfnECS+j14NAJF5zqH4/MPzaHovlmAZADHtzuN2OPs9NrW/qHcTQ8xny7/rNjLWZc4h4cL9iiSFSL9yfkN63kIZS5i8Fhm40DVVvnV2jS3aY0lM0B1dib4K3Qhfwa56kKTDjG+OmBXlqJXhyK5F+lzHYa5QZUSXUA0GbERP0zSiDaVtopmgRnMIBRqYzxKQHiPjBZ2hxwgr9WLcM4XI3q2RF8YIdTiGFe1QaIizgPzj88Ypdl/XC+5Kc1G2WatULH+DWuVbxO3n43WyRswf265jaObyb4A2F3LcPjztBIM+rHVyHIZt4mfL9s8Djr3VUqhgC1IOtKlypZXtkUd25XngTeVoqzH8ByhxPwcSRBEGgPL+w4wRrK9Abf6v0yfNjGs49PkD3MZ7b+pE+tDwMb8svFa+tzE12RGvT+Ud8q7ojwm+tnZ0q42ORQdYwvfaXOe4I9uMnt6c/by 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)(6512007)(36860700001)(70206006)(70586007)(2906002)(36756003)(6486002)(508600001)(86362001)(316002)(4326008)(8676002)(36736006)(336012)(6506007)(83380400001)(356005)(81166007)(40460700003)(118246002)(5660300002)(26005)(8936002)(1076003)(186003)(82310400005)(47076005)(2616005)(956004)(6666004);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 12:41:42.0319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06101efc-3151-4c3f-e3cf-08da34ddeea1 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: VE1EUR02FT036.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0601MB2698 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 | 82 +++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index 3dcb4296fad2..7060eba360ae 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 SCA3300_REG_ANG_CTRL 0x0C +#define SCA3300_ANG_ENABLE 0x1F + enum sca3300_scan_indexes { SCA3300_ACC_X = 0, SCA3300_ACC_Y, SCA3300_ACC_Z, SCA3300_TEMP, SCA3300_TIMESTAMP, + SCA3300_INCLI_X, + SCA3300_INCLI_Y, + SCA3300_INCLI_Z, }; #define SCA3300_ACCEL_CHANNEL(index, reg, axis) { \ @@ -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(SCA3300_TIMESTAMP), + SCA3300_INCLI_CHANNEL(SCA3300_INCLI_X, 0x09, X), + SCA3300_INCLI_CHANNEL(SCA3300_INCLI_Y, 0x0A, Y), + SCA3300_INCLI_CHANNEL(SCA3300_INCLI_Z, 0x0B, Z), +}; + static const unsigned long sca3300_scan_masks[] = { BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | BIT(SCA3300_TEMP), 0 }; +static const unsigned long scl3300_scan_masks[] = { + BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | + BIT(SCA3300_TEMP) | + BIT(SCA3300_INCLI_X) | BIT(SCA3300_INCLI_Y) | BIT(SCA3300_INCLI_Z), + 0 +}; + struct sca3300_chip_info { const char *name; const unsigned long *scan_masks; @@ -123,14 +168,19 @@ 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; }; + /** * struct sca3300_data - device data * @spi: SPI device structure @@ -160,19 +210,27 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale)*2, .accel_scale = sca3300_accel_scale, .accel_scale_map = sca3300_accel_scale_map, + .incli_scale = NULL, + .incli_scale_map = NULL, + .num_incli_scales = 0, .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, + .angle = false, }, - { .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, @@ -180,6 +238,7 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .avail_modes_table = scl3300_avail_modes_map, .num_avail_modes = 3, .chip_id = SCL3300_WHOAMI_ID, + .angle = true, }, }; @@ -387,6 +446,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]; @@ -473,6 +537,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, SCA3300_REG_ANG_CTRL, + SCA3300_ANG_ENABLE); + if (ret) + return ret; + } + return 0; } @@ -508,6 +579,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;