From patchwork Mon May 9 06:49:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12843072 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 B8CC9C433EF for ; Mon, 9 May 2022 07:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233604AbiEIHJC (ORCPT ); Mon, 9 May 2022 03:09:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234939AbiEIGxx (ORCPT ); Mon, 9 May 2022 02:53:53 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2113.outbound.protection.outlook.com [40.107.22.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1180819CEE0; Sun, 8 May 2022 23:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ES8i/rcc7O1R8WvDFtmZkhXM4GAn1kFhj/W+Ls9PIqDf/GKZVbPk03IwndXb3FpKI1UkjveLdxUxhMayELnZ/WKoqCBjVZOZkh/ZTlKDBO1dP1M9RqM9qJbaNjvAED3a/OuqcJUJk2AKQvq+clm/TzHEt+F6uBAA3AvA86dcO2zmB+/RwyFc81dipis4bBzyrYnhF4KcPngxAzMHqF/yodqvoletBuA1VxrX1R9p6c+DgYH174WU2UcBE83SsaKqQRWL9u8YilYYgsqLZ1RfgULb6Nhx7miKgr1Ms80rWCjEVmmqHgJfOsUvUdwaDz8bbSJ8zEgOXF2aWHIQFI/1vw== 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=r8pF8QoyeW8SoNhfIv4dgfaNxj6MxM2G5WRPmaYL3rM=; b=WQo6u0j0F/vJjfdTXG5C8fTMmomE3Dl4gc+WLcIDRfnwfR+a5V8KtYbgzapt98XUuL4EeCr5K/k9XjXjISSgPpAckv7vWisQp9sDRXsE+G8W73lwms9Cwr0tr3kspAMYXYv1YrScU529udtABgTJaR0YsmZKrougv3lCRvGp+nmEV/pWf7s1TiziS9FsNlx9hKn93OHz1ggu1L8fPiSza61y9HuWCNEG0nBa8aG92ZveY/Uofal17zbH6ltGkRdapnVfcRJl1CbhMqQM4VpdoB4uUg0Sg5EAS4aafgh6qw1h8PzXiKPjxmqG7HPt8MoLHIeNOhsC+c3gjJvC4oSRUA== 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=r8pF8QoyeW8SoNhfIv4dgfaNxj6MxM2G5WRPmaYL3rM=; b=NaHrtsJBte1cnQqqWmuhX7F/JfxanjsLRD3g6rkvRRMg2gfKzyMeEU1u5/VFJmFvVjjISm8NhVDtxoNWoUDTuODFBYu+ExrQCYN+5jrx3Kk/kBPZ8/skOLyKxb7eR2JrJZ39KHGRpR1+n80v6IkIeZvawMcXNdG285Z2je0jc2M= Received: from BE0P281CA0006.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::16) by AM6PR06MB5173.eurprd06.prod.outlook.com (2603:10a6:20b:3d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Mon, 9 May 2022 06:49:33 +0000 Received: from HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com (2603:10a6:b10:a:cafe::6) by BE0P281CA0006.outlook.office365.com (2603:10a6:b10:a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 9 May 2022 06:49:33 +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 HE1EUR02FT040.mail.protection.outlook.com (10.152.11.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Mon, 9 May 2022 06:49:32 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org Subject: [PATCH V4 1/5] dt-bindings: iio: accel: sca3300: Document murata,scl3300 Date: Mon, 9 May 2022 06:49:24 +0000 Message-Id: <20220509064928.2352796-2-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509064928.2352796-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220509064928.2352796-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: b5ce2242-ef05-448c-d934-08da31881326 X-MS-TrafficTypeDiagnostic: AM6PR06MB5173: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: p8Hi4mO4GYbAMMPN4l44hGYWgfUFAZldsKoqfmD8nGkg0i39qsPZujVawPV4o5EvoamWf/Cw3Wpd4JmQcHpGCEa0CgdKnuUrZQSHasMzFGvyoWaqJtR0Pz4Uohq93lOOTGD/e6ocSs8BVw2NYedtHgod3mvQI/qLrCfBfcdXdaVOFYjiDBrh8EQms0ODHY1TTrK9M6GOBfEDGap6c4ZFrbriJ2avrzLD9C8biMZk5je9lnAujOOAn5lmik0boIeYqQuyTBIoXW8kVsQYqRdYNH2v29J/ZoPvyv3LE97EqZFKIZpDmLmvqg9NS7Wy3dQk0FjtYwZnMK5AjAw6dgQ7SvuZOrBIH2XZzrA5HkKnz/tGN+a5Kw+wAYiPG6YviNzhCRQth3Y7yX8czcnVaEgQvIzVs/YCUEfZWVJ970BsLOfBtQv4oeF+OYopJsXWTkz+SQbWqMgRqdgaZVK2Ldjt0BL+N6IUzvQIJF6UNonRQXcr9CkW7fE3B5gK4bwBEQq/S3bo+uWD8CkIvsbjzeXKhs9IIInt6WERMja7yOjv3FXsQ1Iw3QxTPBIxxQDfOCpeSKsXxUHac6VywUk2LVGR21z2OqzDyTsI0IjRPp51ud8WROwoiuOxHOZk+Y/uGBBlLCFkXTtnoKsreHCuTfzbxVft4HYTHT7P85TMgxBcx5gisL4qV2Hpe8evoA08cVBr 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)(36860700001)(6486002)(70586007)(70206006)(118246002)(40460700003)(6666004)(356005)(81166007)(36736006)(508600001)(2906002)(4326008)(82310400005)(86362001)(8676002)(4744005)(6506007)(26005)(186003)(5660300002)(2616005)(316002)(956004)(8936002)(1076003)(47076005)(36756003)(336012)(6512007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 06:49:32.8129 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5ce2242-ef05-448c-d934-08da31881326 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: HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR06MB5173 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add DT bindings for Murata scl3300 inclinometer. 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 9 06:49:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12843079 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 9804DC433F5 for ; Mon, 9 May 2022 07:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234631AbiEIHJE (ORCPT ); Mon, 9 May 2022 03:09:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234952AbiEIGxx (ORCPT ); Mon, 9 May 2022 02:53:53 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2121.outbound.protection.outlook.com [40.107.21.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D86419CEE1; Sun, 8 May 2022 23:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mqbhZ1ibaVORcglk0NNC99YnI12/XQrY5LiBJl6EE3MXIsQkPe9FsYdYX37ytS5gihTAqZjdDPWahcvNzGJx5mj7WrTLDyjtySQI62CnibWDTlu92W+pxMrklVaWQg5NWpmTrp+Dm04rYFCjsOV34ic112DyKSN7SkCkPxIzj9y7WxqNtkU7ZVgkoKXvsqHDh+ECS2TDGUzXc07PqjxljU+Cs2NWP+bXXttX3sFzucHmzwdhoQr05DYVnQlDQd0gpB/KPshLYK9f5cP49MobXVhp6obxPtS+SKaBiiiVtTzcvLbUw6hqT1VH4apSc/RqLI/dG6LCKLLpJVkbBErOdg== 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=fOnxO5zCod/dAEfvi2iY4Q+4Da6WQWSsOiqhkhMl5hSJKJnV9hDjW25Cb3qeBOPkU8bNS38F8jx4qZXmybZ+hAKxY105V4Zr+ss5dMCZr0/LLdPime89XfopyhAbdD4laA0gXa+jHq4q0/UnU7zRXItSknf5KzoSaF/3oG9VL//qkxh9Lt5vGRVRNjmrL07GTqcK05xDGzwc3zD+kiwOegyXmpZPCbWzGwxtwFzbjHwOxA2p0BwYoW53IrfAneAaGdvTC/drbHzqdFcDgEsJCMGWzh23K95BwvKSAJjMRaLKTvQ0MTJBMbYPnvKu+ZatKZAeFDZxBFq5pCUV0lMCJg== 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=PwjlEA4qNoSEBmBF2B83MOYUx/3/MYafrd5HDHdKm4/mYaJzWmrjVlbS1LhhqqDVVDcbZaeJ1KSENvJI5/+3atPzdObNeU4MDOLUvWXuFBYXnf3NB7qBF4gGtR3IyaZkOrZh1JnuZlopsAOZCmxCeoWeX3e59RD/9U1NZXQqhBM= Received: from BE0P281CA0005.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::15) by DBAPR06MB7078.eurprd06.prod.outlook.com (2603:10a6:10:1ae::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Mon, 9 May 2022 06:49:34 +0000 Received: from HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com (2603:10a6:b10:a:cafe::8b) by BE0P281CA0005.outlook.office365.com (2603:10a6:b10:a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 9 May 2022 06:49:34 +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 HE1EUR02FT040.mail.protection.outlook.com (10.152.11.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Mon, 9 May 2022 06:49:33 +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 V4 2/5] iio: accel: sca3300: add define for temp channel for reuse. Date: Mon, 9 May 2022 06:49:25 +0000 Message-Id: <20220509064928.2352796-3-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509064928.2352796-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220509064928.2352796-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: 02f8ef4b-9125-4415-bbcf-08da318813cd X-MS-TrafficTypeDiagnostic: DBAPR06MB7078: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: fKl4Lm42ZFBzJFAXEaPWv2k2FtrNotKTYEeFUNm8KrHxd64nAmK6L34YKRO23PamU/jt9rFuxaSVwB+/iR+mrkcjglg9mfaAeRbyTF1vpg5TNdxSkSRkEtPwapkceh9cmNelDqCcQGJvXfUNkuzlc3ZOpKeXbh3D1udnzuDpsjwwHJplfpeNpFvXuDt5qUE4OY2UgsCUTuUvdMphkfHqpgpwAHhcTMdHpPsB9ypyLT78TQs7F4IGHifWDmUFAdudz4Ny2K4W+VAuz3sDGQ7e7tEZS1aqsHC+nx/wupHt+ZFb9QOfmKVZJI/BYjqmkkRcJq2j4EwbnSJSaBPDb5E5CILkeAK3B8vJAGkB6heZlO0Knc2aIYbXJ4PFNREs2NlF93dxznVOaWPrTfS5PMRfcxu0H+nWg+TpiwY7DgNb5adgs7U2rzqUCf65YoDwyATDLO5pSMulerQEqUhzPFb75MS9fNOn9ZWH2ArkVB0UqcdO84xIPQQygU/ueJXdPfLnc0ufzjZtOBNI0ZfwFbNJ0efTMkwBjpK0HIHwElPmCOe2RNdJdZHdov52l8Fr/E0GwKdyIVfh1f0tNI77sTYpHw/giaCBk2S38OiKzGCrg6NJBmuuiEHBwwaVEGwQqDcsTU4tUIv4oo1a6FXvpPhACyPQnQ6GxyhHWsKQlZ/44yjUKdTYFGDREJYKMVTLErEJ 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)(47076005)(40460700003)(508600001)(6512007)(336012)(956004)(26005)(36860700001)(6486002)(186003)(6666004)(86362001)(316002)(1076003)(6506007)(2906002)(5660300002)(36756003)(356005)(81166007)(118246002)(83380400001)(2616005)(82310400005)(70586007)(4326008)(70206006)(8676002)(36736006)(8936002);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 06:49:33.9222 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02f8ef4b-9125-4415-bbcf-08da318813cd 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: HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR06MB7078 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 9 06:49:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12843074 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 E58C2C433F5 for ; Mon, 9 May 2022 07:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232029AbiEIHJA (ORCPT ); Mon, 9 May 2022 03:09:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234950AbiEIGxx (ORCPT ); Mon, 9 May 2022 02:53:53 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60110.outbound.protection.outlook.com [40.107.6.110]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A7DD19CED5; Sun, 8 May 2022 23:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rg93D8lIODWbE2CgFHn+hgLi8Cnfu28c+hFjPNRmO+8zGdaEBJnuvbUePWEB5zAadyI2jIXsmkAyQmexo1Tj5Vh9+dOAR16ftLSeMOpDFTU5G+K0Rd9sBe7kJeZsXu9DP3qx+b4agz/f87Ufl1U8KtLiSPRi12fyXnXWPWLYp8hB7RPAcKLBKJPj42x2HrzwPa/NLZtybBbhgWZhgl+lQGAriCp6RaP6fkoAE/0fQ8rE9VipFwDB+Pzz0zmvHKay26dz2Zb8qgyuH6GchnVmTK8JuMrZgLF/IMImYE7Z1RDxXQ6nLyB3SmnWRkJapxXp3T6DmrP3Gv5ecFkRER4S9Q== 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=W6/IiB39Nv6gW1kAuAh0mPow8ixVVaBUx4lHppMBEyU=; b=e/hKoK+tRtAtXIVsqXXo1hjIbJP2VDPe50QTzSRWJNVzWErF/Cr+onvbxYBOzXxZdVNO0+kVFJi2R/Okw7nzwLZlE79uzsjUFAmbsdp/0WEiBSlpcVfGQuegP+XFzBz4Ap6LNquEaKsDLfwC0y2/ZpT+vI4w1nZglGNMTmr/SOGG0mQ1uWJjbPtjnI4qKKCb7kJt8svS48N3w6AwJMB6d7isHXv1+lT+uaLNVLJCo1Se18XqpDcbbtACNNy2zGa1AMp0ef8a3mb3yIb4Lf2xE9oP/sWmKwX8qUcxeplEiGBkQAfnuLBhlGYZGxDREBtTq4mjf9u3q7N5E5QXIQQ+yQ== 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=W6/IiB39Nv6gW1kAuAh0mPow8ixVVaBUx4lHppMBEyU=; b=PEVLIh/4fj9bwlFrHKdEoQI5wp54+szaNT+pGFAy8L+ok4kBcivUo9EYBOYcq5bm7YwwlK4lFmlCGAoD0sXfy6WjyzGLLMruBlz4hVDhD7GMUr1zLvZstJT+soyRxet0GGAUkne/dUwPG6n+mu7Vnv+fzPNgHv3bUR19e/eAtgo= Received: from BE0P281CA0006.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::16) by HE1PR06MB3964.eurprd06.prod.outlook.com (2603:10a6:7:96::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.20; Mon, 9 May 2022 06:49:35 +0000 Received: from HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com (2603:10a6:b10:a:cafe::17) by BE0P281CA0006.outlook.office365.com (2603:10a6:b10:a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 9 May 2022 06:49:35 +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 HE1EUR02FT040.mail.protection.outlook.com (10.152.11.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Mon, 9 May 2022 06:49:35 +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 V4 3/5] iio: accel: sca3300: modified to support multi chips Date: Mon, 9 May 2022 06:49:26 +0000 Message-Id: <20220509064928.2352796-4-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509064928.2352796-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220509064928.2352796-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: 8c5d5435-b6a5-48bd-1358-08da3188148a X-MS-TrafficTypeDiagnostic: HE1PR06MB3964: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: CEulrPkjCjd3Een2nma/Tf/rrcGjz7kjHn/W2ZYEKkxRYzokk1wIsAUBZLB70Z16eW0bzglSij9ED8XKSGwwF5EqpCyFe4kKtMdFHq88VreG8XTOCfrL80WuwPt1HzPPAETzLoh/wLCuYtxB7InxjW7zZei7Qg0ZVEfB3XJ/Q2kOObkaCJZMpjIb/rlhH2cZ6CERqiwSx6YNkUJ5+wVL475l2VojNCK2UXGnAWusoxdChZGKhuQ8rix6xr6Kv0AqnNgrpg1373AuRTr8J3CAi9gUrFtNv1abkjtMOg9oSTo60XVcE415ZJhw4qP3mFQdZ220XIlVqAfFOjSEBYV0fCO/0jLYfOm+x8VfzEh7hVh8EwtE4G6IsZX6iv/YcoNqaPAHy4NQFuHbsrcIJZ/exn7Ybnbif/j7HRfobqihpqrPXDbwyZsPfFzy14RMRbyMRP6rKK/FVtGwcOmvh5EP3tQSwYhm+ZLB5GfeSlksfoX8wx9RXJHr7rTwypJmuRrxt3R7a2NpyT6bJyaknmObKes66pfuvPU+IT+hhH8wFz0RzGCqIJHM8wn018myBviiNJFLjjpznvNI0+RPJX+SFmpAU20DWddsdnsplrGJWYsoX8FoCMSzbhSgVwA/26rxL8OEXhgXBoiWnS4/YUOtSnNFPf2KQZFQYnCTQUIMlUPT295/99LVhnBhup2SkgcR 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)(83380400001)(47076005)(186003)(508600001)(86362001)(336012)(1076003)(6512007)(316002)(118246002)(26005)(36736006)(6666004)(6506007)(356005)(70206006)(5660300002)(8676002)(81166007)(2906002)(70586007)(4326008)(956004)(2616005)(40460700003)(82310400005)(36860700001)(36756003)(6486002)(8936002);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 06:49:35.1565 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c5d5435-b6a5-48bd-1358-08da3188148a 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: HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR06MB3964 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The driver supports sca3300 only. There are some other similar chips, for instance, SCL3300. Prepare the way for multiple chips and additional channels. Modify the driver to read the device id. Add the tables for the corresponding id to support multiple chips. Add prepares for the addition of extra channels. Add prepares for handling the operation modes for multiple chips. Signed-off-by: LI Qingwu --- drivers/iio/accel/sca3300.c | 182 ++++++++++++++++++++++++++++-------- 1 file changed, 141 insertions(+), 41 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index ff16d2cc8c70..39e6f9f162f2 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 struct iio_chan_spec *channels; + u8 num_channels; + const unsigned long *scan_masks; + const int (*accel_scale)[2]; + const int *accel_scale_map; + u8 num_accel_scales; + const int *freq_table; + const int *freq_map; + u8 num_freqs; + const int *avail_modes_table; + u8 num_avail_modes; + const char *name; + u8 chip_id; +}; + /** * struct sca3300_data - device data * @spi: SPI device structure @@ -117,10 +137,28 @@ struct sca3300_data { s16 channels[4]; s64 ts __aligned(sizeof(s64)); } scan; + const struct sca3300_chip_info *chip; u8 txbuf[4] ____cacheline_aligned; u8 rxbuf[4]; }; +static const struct sca3300_chip_info sca3300_chip_tbl[] = { + { .channels = sca3300_channels, + .num_channels = ARRAY_SIZE(sca3300_channels), + .scan_masks = sca3300_scan_masks, + .accel_scale = sca3300_accel_scale, + .accel_scale_map = sca3300_accel_scale_map, + .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale)*2, + .freq_table = sca3300_lp_freq, + .freq_map = sca3300_lp_freq_map, + .num_freqs = ARRAY_SIZE(sca3300_lp_freq), + .avail_modes_table = sca3300_avail_modes_map, + .num_avail_modes = 4, + .name = "sca3300", + .chip_id = SCA3300_WHOAMI_ID, + }, +}; + DECLARE_CRC8_TABLE(sca3300_crc_table); static int sca3300_transfer(struct sca3300_data *sca_data, int *val) @@ -227,36 +265,77 @@ 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; + + for (i = 0; i < sca_data->chip->num_avail_modes; i++) { + if (sca_data->chip->avail_modes_table[i] == reg_val) { + *index = i; + return 0; + } + } + + return -EINVAL; +} + +static int sca3300_set_frequency(struct sca3300_data *data, int val) +{ + const struct sca3300_chip_info *chip = data->chip; + int index; + 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]]) { + if (chip->accel_scale[chip->accel_scale_map[index]] == + chip->accel_scale[chip->accel_scale_map[i]]) + return sca3300_set_op_mode(data, i); + } + } + + return -EINVAL; +} + 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 +346,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 +356,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 +418,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 +435,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 +477,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 +523,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 +530,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 9 06:49:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12843073 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 1F87DC43219 for ; Mon, 9 May 2022 07:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234264AbiEIHJD (ORCPT ); Mon, 9 May 2022 03:09:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234937AbiEIGxx (ORCPT ); Mon, 9 May 2022 02:53:53 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2135.outbound.protection.outlook.com [40.107.20.135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E34119CED7; Sun, 8 May 2022 23:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jx3EsVaDxiPSNqnq1X6dYXrE78Lx7BvSoY+zNRIeNsTE8NtuehKyr8ZUe2ao/Hes93wNU+jkC6qJBczpGgKW1gpMaKhfuNvz0ly+iAlB8DXyzvJANvMnC2s8nwB6+HYjPiCkI+1ZoXQp24Dp3Q43OVfc2lwTXCmR5MEG96NVnxk7LSK3wsounfqMxaqCp0r7gYOjKWL42j1geojYRTFeoXKEF0tLiTXTxz41TXItwsm0qF4EiJcbWFrP8ep6tf+/TKAzmjSFFEsTVePY1UQO78jTpo8Jw4m7rP0fD5FX7PNUEvox5ya3U/r/qT4JwTnh3/Iz5bxI0ttFBfGfaejsbw== 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=EeSz0fhmgis+L/1a9AQDdLJzOKbEiClYIR70D3qiwPk=; b=e7DFETQsgYkXFMflDwmjAQdTnfVGhG06PUKKkIK2NuVwNzEgXl9mRGvjbe5GYdU3zKxXVtaAoj1U0khmuAKF6QVs41nJvcyJrznoPZ4SQ4IogOp8u64iPqncb8hiGTaeUtVMxOtPo5Qvs6g+NYwggR9I8AOudz3tJ8QTMft7+CJJ7wxM6KvTBwUHZbv+doBIORm3JfOX0BBNTE3d4Bexe8geEeXAddG5g66XqEzHV6+BIQDFQk3F4g1tiO3KUustD90cC9GuvEWrwuuzO+jO8upggl+hhWxN5K9w/WrPsqymYeF9R9fJfQH7sFk5z/cuSWL0LcP53iBLbXIg0NW0VA== 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=EeSz0fhmgis+L/1a9AQDdLJzOKbEiClYIR70D3qiwPk=; b=zr5ZVtGqlzH4V5qlg7aEfMV+FugYURewU/gJHTpm9NG0BO0z7IuZLbq7lQTdFTQKdllbLYEblZk3WyWXxEc1LBtz4OXswLofBuc9VqcO731UrXIF7VZJCRKtTPCIdGtHBDuc91dV9u0yfIchMddOa3qMNgjiXyJIC75miw3hxAw= Received: from BE0P281CA0006.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::16) by DB6PR0602MB3271.eurprd06.prod.outlook.com (2603:10a6:6:10::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Mon, 9 May 2022 06:49:37 +0000 Received: from HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com (2603:10a6:b10:a:cafe::a6) by BE0P281CA0006.outlook.office365.com (2603:10a6:b10:a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 9 May 2022 06:49:36 +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 HE1EUR02FT040.mail.protection.outlook.com (10.152.11.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Mon, 9 May 2022 06:49:36 +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 V4 4/5] iio: accel: sca3300: Add support for SCL3300 Date: Mon, 9 May 2022 06:49:27 +0000 Message-Id: <20220509064928.2352796-5-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509064928.2352796-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220509064928.2352796-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: 6b2ec6bd-7029-49bb-93a0-08da3188152e X-MS-TrafficTypeDiagnostic: DB6PR0602MB3271: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: o0p7cFJRV3s1gM5TBDmmRtJxHDIcGHpx3z3JB0d99HzKpRwHfprwH+NST0grhnMC49KYyRY9wj4/g9Y5ACKmPIWBNfHYgglkbqdO8lvRTLZuND7s1faJJ9kRxXyvg3zRISBghd+6ABe++k4JvtzRegujf4S/t3uWpX2er+EZK7IMGx33mHeqee05v0OrJOaWvfneSSCNhmpf+Dfmd+WOAHpmqQijEKXKhUJbvhsvvKOlCcYhKrSM/PN3CHTU+JVdSkU+8OOlAi/dC69L4c5p+QQPsWQ4y+5ujaZEaK1B9b2T5uu1MG4HUPlFWcDMs3EU/CZUXACwl99ggjaQqg3y9n7jYiooztOWG9oC9DSb5AqErSlDgxYhGn/HTcHlJ7ZgR7Epr951kawmAVYsuRQrKI8RC0vfZ2SgSB7IDXIM79OEg5tWIZqR89Ijp8EHXinqjuKAI9OIfrDCDI0FMSQafc613o0jYccldWSVYI6zsc0Z2IWjstP4Ysip7lSvuactvKmSHWTtEL57rcWjjK2YZu+XzkNMwFXHXAoQuB+okGRbcfrukzmF2qeletECoDn1aAzpwnfBcnyV/KG1aJrKISbaakWMjvAnVZ5sS6sQ/ZDsnkYanbFgNCq/3UXFuk0mXDVxZ3ykRMDyMKwueMrCnamF025dq+FZjqGU2SqyELByqPJcmCCiFFxw/Dx+j1cu4NvYEjdxoZZXG94wnRZhqGquMv3j6k4gXywIzBwjVmaZ9oZLqPFJD3gxEjAt2osLvTbctAwwk3RdZdhJpAE4Zg== 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)(40460700003)(6506007)(956004)(15974865002)(6666004)(2906002)(2616005)(36860700001)(356005)(82310400005)(6512007)(8936002)(86362001)(36756003)(508600001)(26005)(4326008)(8676002)(6486002)(1076003)(81166007)(118246002)(5660300002)(186003)(36736006)(316002)(336012)(70206006)(47076005)(70586007);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 06:49:36.2190 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b2ec6bd-7029-49bb-93a0-08da3188152e 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: HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0602MB3271 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 39e6f9f162f2..618991c8da92 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), @@ -157,6 +166,20 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .name = "sca3300", .chip_id = SCA3300_WHOAMI_ID, }, + { .channels = sca3300_channels, + .num_channels = ARRAY_SIZE(sca3300_channels), + .scan_masks = sca3300_scan_masks, + .accel_scale = scl3300_accel_scale, + .accel_scale_map = scl3300_accel_scale_map, + .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale)*2, + .freq_table = scl3300_lp_freq, + .freq_map = scl3300_lp_freq_map, + .num_freqs = ARRAY_SIZE(scl3300_lp_freq), + .avail_modes_table = scl3300_avail_modes_map, + .num_avail_modes = 3, + .name = "scl3300", + .chip_id = SCL3300_WHOAMI_ID, + }, }; DECLARE_CRC8_TABLE(sca3300_crc_table); @@ -556,6 +579,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 9 06:49:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LI Qingwu X-Patchwork-Id: 12843071 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 EEB19C433F5 for ; Mon, 9 May 2022 07:05:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbiEIHIS (ORCPT ); Mon, 9 May 2022 03:08:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235008AbiEIGxx (ORCPT ); Mon, 9 May 2022 02:53:53 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70130.outbound.protection.outlook.com [40.107.7.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA05419CEDE; Sun, 8 May 2022 23:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ue7i4MZoJcVVt5n2Y9a9/Y0iSXGHnufDRqYmNfQwI6enLnp4b98ObBMkoYSjj+Xz7tJp9lkT0D7ISxypWJ9cMiA8ZgakiEjEPaCVtVhIdQDdrlHKrLjl2yyurPWLHr7GQUbnboX1gljeNX9O56+BgUcgKm+Fo1k9bCHVW+l6HdPsC0ikt+1LOI4kA+LuxyhFHSk/EyYcqVOIkOS18csDN4oKVu8dn3dhYaXayQVmB5n6f1kZ32g9hHbuGWC7q+psbz1ywWtB9qLgc2EzQXyc6UErptW15O51XXF7R99SNrIpyXNTVLzsDXnR9UTKNCMQg4h2PBH0vEG8p2qtPAcuWA== 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=Aw9D5i2ECUvqkwDV0yds+1OFUKxoXYC2JbqzZQOSf10=; b=n98HJ8RxYIgfKWQjjlY7pbsGlPTWAVlMOMDLXhp9Ky1KdiEjko4Ia//t6m/nojeMwB/D5Gw94EuR4Z5sWVIHN3hyKHkVV3VcqOD0AEcnR39nrUg5NJP4wSOCyD3fO8BPE/BZluoqJ5Q31bOf4pWuEDCvZnM45wOS6/GudQQcq00LAEskbqDkaHvv503OXrOCrOpOgdVFuDiSCMMOsx3DFTHr1sAGwjio/9mbEXKoc6yxREsxNxmbWtszVFgUZw4S3n9w2lBrk2Df55sJf11UweA782wS5m3nbiTxBE2mwnnAXMzhvsJvkwGf4ccJa3YRawBqgvqPjRpOHq+lIcEWag== 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=Aw9D5i2ECUvqkwDV0yds+1OFUKxoXYC2JbqzZQOSf10=; b=oopEahUoQI72N5qg1JtL0MGZbQU8fpblXE150wOZWogzWFWi6z9wKtrjobIHANnS8A4FtqW/9FW+lckzd9x9E3cUd6Josyl6hj5kdKpiRCcvjGokCLVCgTrkMtj6qhEeYQpBm6gzSa3xy/os9e3Bcnh5AoX6/u9L7r3G+1IBBqI= Received: from BE0P281CA0006.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::16) by VI1PR0602MB3248.eurprd06.prod.outlook.com (2603:10a6:802:7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Mon, 9 May 2022 06:49:38 +0000 Received: from HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com (2603:10a6:b10:a:cafe::3) by BE0P281CA0006.outlook.office365.com (2603:10a6:b10:a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 9 May 2022 06:49:38 +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 HE1EUR02FT040.mail.protection.outlook.com (10.152.11.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.15 via Frontend Transport; Mon, 9 May 2022 06:49:37 +0000 From: LI Qingwu To: jic23@kernel.org, lars@metafoo.de, robh+dt@kernel.org, tomas.melin@vaisala.com, andy.shevchenko@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Qing-wu.Li@leica-geosystems.com.cn Cc: linux-iio@vger.kernel.org Subject: [PATCH V4 5/5] iio: accel: sca3300: Add inclination channels Date: Mon, 9 May 2022 06:49:28 +0000 Message-Id: <20220509064928.2352796-6-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509064928.2352796-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20220509064928.2352796-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: 06ece379-75dd-408b-fdbe-08da318815fd X-MS-TrafficTypeDiagnostic: VI1PR0602MB3248: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: gURy6J9q831kS6e+EqArmLfC+dKuZlF4DO7YpHSKXDVdtTtb/jGC9GdDgItnwqaru5SAgh8Mso5ccdoqZPDA2GdLnUDtUdVEgmi/BgCoCA91K/z6jynwgSzD7DYLtLYCA3ISi7XtnQS58U/w69xzXS3TnP7yab8lZcub7iK6pvvQwwWH8hLyj2b2KKmc4Xr4pFkOrWdAnMrbqyZ/liZlVxkw9VAV/gseGCFu/sw0tgKI8tJevJcabW2Uw3spnQ9AGPscuq0QyCoendjd1pbHh3EPlqjPTEF7rdLrbST3p8eOWiL4q6WpqExszCLYDEiK9MaFxD2RI6vPMl0YXSH7+lzUDpB/Qe/2rViI4yqy8bLxChL5kxAXB2wSdBg/4TwWKWIsb//kHfKhhwA3LilKwIXHK3dJ2tHpagFUkZTsxZH2Geatps4SZYkyubUVyW68DibxTl+Tpt1DpOnyVSeHn0spIdJLgoYXWQwK4TkNHB+6OX9MUlXKcvc4x5Uxhki0BStlZ2Qf1DAHlawBPg/bsXLd91zxvn9yHqoOlC79H/VSFymyegcsql8WKw/4PzuV5f/5OXiUrByVbu0KVSEJUuiDuXu5887hnPGjAl+7YQ8qfTbm9Ce983OSuAfUTu3dDgwhxtA0hWZoA1449UYP6RtlR7XMhEI5F8XycoOdQO6ujXtiXh4yG096SwFWq2s5 X-Forefront-Antispam-Report: CIP:193.8.40.94;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:aherlnxbspsrv01.lgs-net.com;PTR:ahersrvdom50.leica-geosystems.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(6506007)(82310400005)(508600001)(86362001)(118246002)(356005)(36736006)(316002)(6486002)(2906002)(6666004)(81166007)(186003)(70206006)(336012)(70586007)(36756003)(47076005)(2616005)(40460700003)(6512007)(5660300002)(26005)(83380400001)(1076003)(956004)(8676002)(4326008)(36860700001)(8936002);DIR:OUT;SFP:1102; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 06:49:37.4845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06ece379-75dd-408b-fdbe-08da318815fd 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: HE1EUR02FT040.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0602MB3248 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 | 81 +++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index 618991c8da92..af5292ebc99f 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 struct iio_chan_spec *channels; u8 num_channels; @@ -122,6 +167,9 @@ struct sca3300_chip_info { const int (*accel_scale)[2]; const int *accel_scale_map; u8 num_accel_scales; + const int (*incli_scale)[2]; + const int *incli_scale_map; + u8 num_incli_scales; const int *freq_table; const int *freq_map; u8 num_freqs; @@ -129,6 +177,7 @@ struct sca3300_chip_info { u8 num_avail_modes; const char *name; u8 chip_id; + bool angle; }; /** @@ -158,6 +207,9 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .accel_scale = sca3300_accel_scale, .accel_scale_map = sca3300_accel_scale_map, .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale)*2, + .incli_scale = NULL, + .incli_scale_map = NULL, + .num_incli_scales = 0, .freq_table = sca3300_lp_freq, .freq_map = sca3300_lp_freq_map, .num_freqs = ARRAY_SIZE(sca3300_lp_freq), @@ -165,13 +217,18 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .num_avail_modes = 4, .name = "sca3300", .chip_id = SCA3300_WHOAMI_ID, + .angle = false, }, - { .channels = sca3300_channels, - .num_channels = ARRAY_SIZE(sca3300_channels), - .scan_masks = sca3300_scan_masks, + { + .channels = scl3300_channels, + .num_channels = ARRAY_SIZE(scl3300_channels), + .scan_masks = scl3300_scan_masks, .accel_scale = scl3300_accel_scale, .accel_scale_map = scl3300_accel_scale_map, .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale)*2, + .incli_scale = scl3300_incli_scale, + .incli_scale_map = scl3300_incli_scale_map, + .num_incli_scales = ARRAY_SIZE(scl3300_incli_scale)*2, .freq_table = scl3300_lp_freq, .freq_map = scl3300_lp_freq_map, .num_freqs = ARRAY_SIZE(scl3300_lp_freq), @@ -179,6 +236,7 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = { .num_avail_modes = 3, .name = "scl3300", .chip_id = SCL3300_WHOAMI_ID, + .angle = true, }, }; @@ -383,6 +441,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]; @@ -469,6 +532,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; } @@ -504,6 +574,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;