From patchwork Fri May 28 11:34:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12286799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B17FCC4708D for ; Fri, 28 May 2021 11:37:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7D9776124B for ; Fri, 28 May 2021 11:37:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D9776124B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0J1Ltd0Z+IOFiMwZjuh2lWL6LPaYmTIhTbMufUITMpA=; b=MYrA7KMFpWWZq/ ZOTFZbalQxbLkimRD6eHP55Jxnv1iEawy3ZfU4E3io1AC5wJCgQv6DY23JX4wsYjgoW10CtQEameg S+C3vJNvbVPKIDjsMhjl6Ngz+8aDW4llqneJ7BYK3o4jmQUzZofH1tkjKiIqZw+IDYQ8DwY+TZR+2 Hjm17ujAASsbtmMPB2MMxh6aO+g/8HhU9Utjt9SfvSKoMs4aZiKW6/42O+X56I6+9vYIJ6qbJSPJP XfjGeCE6UI6tKZG6B9qYHyI4IzlwDrGHZC151oLEU3Q9OGEuAvOPaKNOHc9CoBUE/sWcxJGCf03OU 4RntS8yHimTdwHVGIwMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmalc-00EuMY-KU; Fri, 28 May 2021 11:35:07 +0000 Received: from mail-eopbgr30047.outbound.protection.outlook.com ([40.107.3.47] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmaF1-00EdYc-E7 for linux-arm-kernel@lists.infradead.org; Fri, 28 May 2021 11:01:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SXOg35OreDN2YMxVn5mPKa2un6OY0ZFw4jav7hI6pl/YVpsJp6r6t+s5AcgoH5r1EScvcW5TExS6ei6RqZNpNw/zUgyNCiVzB5g4jMYPYBbyMmOrqB1LVf4lKLM1pmtvTEM9z8o+aa8yFZKGtxxLd+cHCb6Ee2IVPjSqwRAXrfjf80dYy9467LfbaewVlo834uPXML8qq9SOuAmTgnLJmUCt71RZ9N5xZT6fji0So6S7xMFhThJ9x0DCWIlTtU7m6fomibwPzpW0NT5547mCm/BxJmDSq4A37WoI48HmpJ72Aa0cseZQOKAhR1t2PJVlS/N4z6C5th7I+OFtZGPK4Q== 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-SenderADCheck; bh=5Z2SQXkgBc5fTMJwrLqnoN/cVuxBR8AzI1NHhM1Zcqs=; b=WUII9cMdjGZwxDL8z0+PAm+l0GWVAHf1Qa4DOYMgANq8m988/+cCdHCfbAuwrhZARCugGE7qNlBz3m3/iXXxMwS0t6FEJaTJceRGvzkBJ8yEkxB1/3CieWGbjztdVtoutpyIaidrBRzd7/KyawwCyB5bH7b9pd/zczL+Bv3lCxIB8W15V5AE79xX0Js3xtilbR1RKxlB54LpFvE7GCXOHgV5rFkzvylycWnQyEDxhe0dCj22ZFeUqYrnoVGanrfVy7TY0aoTkmBC0Rk026Ck8QGaIsegMdChDNFu47sjgb+/wFU9SbZ6qOmN/Onshn2mB1Jc/emU7VJSFHLeK9PA6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5Z2SQXkgBc5fTMJwrLqnoN/cVuxBR8AzI1NHhM1Zcqs=; b=hLTnqpdW5XybEfKx499nF53SHY8uGN1G9uZdHs8LJQ9uGANdXT/s7hYSHOFfOzZ42qZWJW6C9KZudaendM0GUI+NzpvmkNQ/rYXjYLdVXTECnnfYyinTTTqpRv8ftj1b7uAMK0DJXt6JB0dsgMxNfil2Atcx47WLNxKPBJ4YpjQ= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DBBPR04MB7515.eurprd04.prod.outlook.com (2603:10a6:10:202::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.24; Fri, 28 May 2021 11:01:15 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::45b9:c993:87ec:9a64]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::45b9:c993:87ec:9a64%8]) with mapi id 15.20.4173.024; Fri, 28 May 2021 11:01:15 +0000 From: "Peng Fan (OSS)" To: sboyd@kernel.org, mturquette@baylibre.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Peng Fan Subject: [PATCH 2/3] clk: fractional-divider: support regmap Date: Fri, 28 May 2021 19:34:02 +0800 Message-Id: <20210528113403.5374-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210528113403.5374-1-peng.fan@oss.nxp.com> References: <20210528113403.5374-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR06CA0158.apcprd06.prod.outlook.com (2603:1096:1:1e::12) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR06CA0158.apcprd06.prod.outlook.com (2603:1096:1:1e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Fri, 28 May 2021 11:01:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10468c9c-3cfd-43bd-63b6-08d921c7e9c6 X-MS-TrafficTypeDiagnostic: DBBPR04MB7515: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:256; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MBOI86ncsA31EqqNPNbmZc7UFUoWCIJvsqjidETW0RoqvtTzUqZACeo1qqHaoCsKjG4qtdF0Dk4zvYEsMKJGH/wVngFD1Q1D9Ornd3Vn7Gvtr2UwBgKaSf5uSj81A+c0ZdDZY+JbP8KlWJahbIp+XP3RBPjg0tC1CML6NXdhIDb1IwSsbU+3FTNeDIablAKPQOb6dL69VHD9MhCcxlQlL2ib19vKtAp8c8qnRTjXAJ3Y6cPEsN2JaUvD0s4xZ+1ZQszmN/cCVh+yEcYLPZNp2yDG+HQMGZrfb5V3G/wRscbta3hDxIGW1PhdDRiJUbC1AGf/h5ZavVOTg53k2LPIwcB/1XjFnk1YfHctFRZhYItXiE6N2R3xOwvlM6kkqCpGgASTkVQlFNBhRJDz/acPPiDlKOfJFLdT0lgSIfvrs6J5tOmfJojEhQJP7rcFDQ9jyN7dHzvT2+LkOTavePP74cGB3la1XFxuP0N6F8Bs41XI5ZWMkwAwrktNx3eI8krJcYYHB8VbD1vBVvNk1sBuwHBx9uy8souIUKMBgCns9YXbGvSZwfMFQEt/rVt+/U1vNDIwtOSOvVKGm3w7vvBB3VnGiwHnhe7v/dmlvS1Dv2+/qmhbBsmRvorxP8HegyXJYlIOzvqT+9swTdocuO69xL8KVGkdIxV5v9y9DFK7ks0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39850400004)(346002)(136003)(376002)(396003)(366004)(52116002)(6506007)(38100700002)(38350700002)(26005)(86362001)(83380400001)(2906002)(1076003)(8936002)(66476007)(2616005)(956004)(16526019)(186003)(4326008)(6666004)(66556008)(66946007)(6486002)(8676002)(5660300002)(316002)(478600001)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: uG4CStC/ufoy5Kp2DivrqAWO4gxkR7W1L4PHJ5OKvo3vwVCLzg2wzbMjh2YZdaCpXm8X32x8bCwpUqGAgFD9JEd3njnxiLVxD5XhWsllQ2ZHZQPNNAy6moc3YZ3FHXS2Qqv5/m7BKQm3uEagv+jjVBxXdVHXdNB7gwGqebYsvEV5U7p6WRSrpEi3o2umF3pUqV/BRdwcnpSRHZAB7L7/Ha/IHoihUJeNQWjP51F0RhYyLngesU1QO0II6M+J34EArlkrJttXRnRcLp4GVX1/DZMQ1uZ82aHHq8bqXyuDK1bTkGOVgITgV4TrSdxZjqj+/u+TLc8eSgQZoUctOdcon5AbwPMUIwLlBcV2imIK0pGMhBZRpxzaIpRWlwzl8+qhF8zBXWuq0/rvyuPBifSKzrn2tFg0O6KjX2oIjwplFCFQAY0P3Z+WfzJ9PQdpgyA9RuvgS5O6+7M9wqEOlioG+8ObRPeQPhd5Ilr0RSrb2gCLgHM4iaH8oQlJb29JnTyVSVBfznFuXLAfQyyvJ95H2oWE5p16p+uuPb/oOVL8FeSZKX7fbMp3PXURRTOaUXxfAHiWUEb2666UppC1hGAb9wVA6xucG+nsruYtQePCrEVMF551jhYJ0uSVNE7YGu7IMe9RxbaCoya5RXQ7r3Xo+Tik5rDdZ4r8W3+msr6fWwAyrEO3PSGm/4D+0wquSBTycBsDPEvuAS8Wh5K+Ld4AfNBrvQwgVeWVgyGo33utGw7cltHIJNEsUSSVcceY3guwOcdBJf3um9eLWEWXY0ENDTokQAjbGg108FU6P9sVpvZhE32f1vhwdBRy2AmBjbN6frfZwCqGo9A6A9kmbPOPIt7mj2WZNktQgd1xvkxW5t+D46xyl9JxEX8oyGIkzu+Rm+nCrT3JHUhjFWC1dUHAHTt5GIOYSBS+om/YYiHmtUS6HrsCNNgvFAXWgNWF8G9PsT0+1V/hR2F9Mqxbw65xaRXjGaAzM4jHplGHdjqCSwfYwseIOCS+S2BysMNLahezC6wOci5xdT/n3lyXV/tbZz3byjCbldNBPX+4T8Rv1qpZ8bm7YBzvSdE5mfDpS9xUNXLzpUyMwvrdpR8CXy+qRS7ZFMWleVlxYrqCuHdiNZcUgiA5pgzg+ysUOqjvgmYaVPtRwxNjN4PjUTqQLUAkq37YwiQ/Pn5UHQ44gbYwKYe+tr2olc/U8j1dcfNUBqJmTYBG/I6jPvkxfo/pjL4qNPvAC6XxpLCzL4YBQiQ3E4L27zAO/mqdjMdbtkXSTfoP/iK9g9mRiQS9MBl/3+BtNCx9BeHCBSNDYz/NdZ5WUhr4xZZrpFtG67saH+1497r0EMZTfEw3bzJlS2Fw5WE6Vw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10468c9c-3cfd-43bd-63b6-08d921c7e9c6 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2021 11:01:15.5866 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: peCL8F1SbSHlR4Edx1YbpH0kX1DTtT3onfWCIV4J5NS2YXMPGnjpQvH2Nlw7BGuadKBZQmtqQQNtTi9MRdFqGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7515 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210528_040123_601491_F858EE63 X-CRM114-Status: GOOD ( 15.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peng Fan To i.MX8ULP, a PCC register provides clk(mux, gate, divider) and peripheral reset functionality, so we need make sure the access to the PCC register be protected to avoid concurrent access from clk and reset subsystem. So let's use regmap here. Signed-off-by: Peng Fan --- drivers/clk/clk-fractional-divider.c | 26 +++++++++++++++++++++++--- include/linux/clk-provider.h | 5 +++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c index b1e556f20911..f2df5d278214 100644 --- a/drivers/clk/clk-fractional-divider.c +++ b/drivers/clk/clk-fractional-divider.c @@ -11,23 +11,43 @@ #include #include #include +#include #include #include static inline u32 clk_fd_readl(struct clk_fractional_divider *fd) { - if (fd->flags & CLK_FRAC_DIVIDER_BIG_ENDIAN) + int ret; + u32 val; + + if (fd->flags & CLK_FRAC_DIVIDER_BIG_ENDIAN) { return ioread32be(fd->reg); + } else if (fd->flags & CLK_FRAC_DIVIDER_REGMAP) { + ret = regmap_read(fd->regmap, fd->reg_off, &val); + if (ret < 0) { + pr_warn("%s: failed %x, %d\n", __func__, fd->reg_off, ret); + return ret; + } else { + return val; + } + } return readl(fd->reg); } static inline void clk_fd_writel(struct clk_fractional_divider *fd, u32 val) { - if (fd->flags & CLK_FRAC_DIVIDER_BIG_ENDIAN) + int ret; + + if (fd->flags & CLK_FRAC_DIVIDER_BIG_ENDIAN) { iowrite32be(val, fd->reg); - else + } else if (fd->flags & CLK_FRAC_DIVIDER_REGMAP) { + ret = regmap_write(fd->regmap, fd->reg_off, val); + if (ret < 0) + pr_warn("%s: failed %x, %d\n", __func__, fd->reg_off, ret); + } else { writel(val, fd->reg); + } } static unsigned long clk_fd_recalc_rate(struct clk_hw *hw, diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 6bd9288b953d..3902f883cdaf 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -990,6 +990,8 @@ struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev, * @nshift: shift to the denominator bit field * @nwidth: width of the denominator bit field * @lock: register lock + * @regmap: register regmap + * @reg_off: register offset * * Clock with adjustable fractional divider affecting its output frequency. * @@ -1012,6 +1014,8 @@ struct clk_fractional_divider { u8 nwidth; u32 nmask; u8 flags; + struct regmap *regmap; + u32 reg_off; void (*approximation)(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate, unsigned long *m, unsigned long *n); @@ -1022,6 +1026,7 @@ struct clk_fractional_divider { #define CLK_FRAC_DIVIDER_ZERO_BASED BIT(0) #define CLK_FRAC_DIVIDER_BIG_ENDIAN BIT(1) +#define CLK_FRAC_DIVIDER_REGMAP BIT(2) extern const struct clk_ops clk_fractional_divider_ops; struct clk *clk_register_fractional_divider(struct device *dev,