From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 5B2B4C432C0 for ; Tue, 19 Nov 2019 14:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D848222A2 for ; Tue, 19 Nov 2019 14:08:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="VJNH1FY8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727809AbfKSOIo (ORCPT ); Tue, 19 Nov 2019 09:08:44 -0500 Received: from mail-eopbgr00045.outbound.protection.outlook.com ([40.107.0.45]:9830 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726590AbfKSOIn (ORCPT ); Tue, 19 Nov 2019 09:08:43 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cwRQVYMZDuPrimu8oN+poGbJVbma27ErfsZNTEAlu4kh9j5eot+BOrFp03l8dbtZ2pEiu2ISNrJSA7G/CNIsl6OI5JAcUelMyz+QR5Sqk/3CcYyx7Bu6nbBw2fDwIqKPCEenQHGdsEOpNUT/ZvHY5UfEKCwBjNBB6FDssWVvZ6dVCXGe5Sl2/5gf686om8F5bDn1LHO7FmunIqmjW26s9rzDck5R9RyzOKrOkCYgiYVOvO4eWkMv6DPvmFIL0zCa8RtqC+Qpo8hI6lXwm/9z8/dwewq3KjxnONCmYondKHpvIsn6W1xzJGVthAWYqS+YrPEWpAlRnFJIZ8ULM4RyvQ== 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=MZ4OfLCsjHFD/jznR+kbQq2822zCmXWWlrqHQbFvHu8=; b=guOf02VSxqGVNEs0YSFTyiiRFRQri/kzFsH3+1EdGXs0Db0rymuy6H5zXuvLJXxWlcFheEaXiJ4T0d9UvfYN5RuCCzAw4R8yGb1WBZtpCbhm1yLB1g3R/EJJ4VOMeZUF94I/bDlEzAk1LcZ2uEyEJY4DY+JCKzFWkdjt3LLzKqV9N3hDe2HQf3GYVxtQTSVRZnKvFjp5AblWTmgSEiRukJovR/5cfyg/knDlPMzzSiviF3c/xZzqtGk0oC1QcXJ93LdbPPFAhOoE/v2Mopfqv6rGXWLfRTSNB7kMEKmf865/keR79qPiSc0lC8HOerKv5sekvN77Mj+mczK2k9SeSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MZ4OfLCsjHFD/jznR+kbQq2822zCmXWWlrqHQbFvHu8=; b=VJNH1FY8SYLag8WkC9FnwlLbFC92MwvneH7oN4l6j30y1EWTT0KKWhywjAcDQpOzhKOxvAVu2C8YZot3q3EsFk5LRI84WKflNInXOF0/Q7px8QO8vnSIrAXAXWcNqoCFHR+7hvJgeb/i6YXYlPtA7g5jX/5uJTxvwbU+YbTU0cA= Received: from AM0PR04MB5779.eurprd04.prod.outlook.com (20.178.202.151) by AM0PR04MB5428.eurprd04.prod.outlook.com (20.178.113.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.23; Tue, 19 Nov 2019 14:08:39 +0000 Received: from AM0PR04MB5779.eurprd04.prod.outlook.com ([fe80::fd44:1b14:587c:9fde]) by AM0PR04MB5779.eurprd04.prod.outlook.com ([fe80::fd44:1b14:587c:9fde%7]) with mapi id 15.20.2451.029; Tue, 19 Nov 2019 14:08:39 +0000 From: Abel Vesa To: Aisheng Dong , Shawn Guo , Stephen Boyd , Sascha Hauer , Jacky Bai CC: Peng Fan , dl-linux-imx , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Linux Kernel Mailing List , Abel Vesa Subject: [PATCH 1/9] clk: imx: Replace all the clk based helpers with macros Thread-Topic: [PATCH 1/9] clk: imx: Replace all the clk based helpers with macros Thread-Index: AQHVnuLXujDGAXBLjEOo3SuHVLGWQQ== Date: Tue, 19 Nov 2019 14:08:38 +0000 Message-ID: <1574172496-12987-2-git-send-email-abel.vesa@nxp.com> References: <1574172496-12987-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1574172496-12987-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR04CA0026.eurprd04.prod.outlook.com (2603:10a6:208:122::39) To AM0PR04MB5779.eurprd04.prod.outlook.com (2603:10a6:208:131::23) x-originating-ip: [89.37.124.34] x-mailer: git-send-email 2.7.4 authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c398c1d4-7454-42d9-58f4-08d76cf9f9b4 x-ms-traffictypediagnostic: AM0PR04MB5428:|AM0PR04MB5428: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6108; x-forefront-prvs: 022649CC2C x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(366004)(396003)(39860400002)(376002)(136003)(346002)(189003)(199004)(110136005)(14444005)(256004)(86362001)(316002)(66446008)(66556008)(66476007)(64756008)(66946007)(36756003)(446003)(7736002)(305945005)(186003)(3846002)(6116002)(26005)(5660300002)(478600001)(52116002)(76176011)(99286004)(2616005)(66066001)(54906003)(2906002)(11346002)(6506007)(476003)(44832011)(386003)(6636002)(486006)(6486002)(102836004)(25786009)(8936002)(71200400001)(81156014)(81166006)(71190400001)(50226002)(6512007)(4326008)(6436002)(8676002)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR04MB5428;H:AM0PR04MB5779.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 99Kyyva7i+Pw3kWT+xnvYzkKbgPHMBmGcLLmzkPrIlJFcVp9d6/2+tDbrs0mUA6OWWRPt9hGcimtjzuWdRRyZsSEirk/w+TyhieGCPZvJtFWEXpNhhQi6dGJzAjrPd/61weO6eDRvY6lCYgllUkPB2dOEkxoFvZUwMQbxhoNk+A75hlUqVo1k+rLg/RictgykHzQBzP0UPo8hPiNDhOMdUntvFoTyIP7mrY9mNuO4fV796dSbyd7Gs8mcj2t0n3JbSkIqnHnUe/webRFSKvyMhbM6r4bo0UkzTvF8k2rPKnt2jCGLN8fpPKcsR9k3Xray7M6rT8HDop35tXM51yi0PfBrskcGcN/aB/BUUXGkPTmT+DO0sY31KHRTZ+m2L8P4F9LAJQoop/Vg3+k838qBeVbE9t/OYaj/Rheoa+YrfG6B8tTbno6394ARUPG8ww7 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c398c1d4-7454-42d9-58f4-08d76cf9f9b4 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Nov 2019 14:08:39.0006 (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: af2wQkYpxKCXYyIK+5W22FvmSm5rHZ1hAzK2iBONA4bI9GQLjkUJLNAgRHWJAOUylXmmZsLx1Z5SL+gFT3qVZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5428 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Replacing with macros all the clk based API helpers we reduce the code duplication. The end goal is to get rid of all these macros when there will be no more users of the clk based API, that is, when all the i.MX clock provider drivers will be switched completely to the clk_hw based API. This is another step in moving away from the non clk_hw based API usage throughout the i.MX clock drivers. The reason for doing that is to have a clear split between the clock provider and the clock consumer API. Signed-off-by: Abel Vesa --- drivers/clk/imx/clk.h | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index bc5bb6a..945ce4d 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -73,9 +73,18 @@ extern struct imx_pll14xx_clk imx_1443x_pll; #define imx_clk_fixed_factor(name, parent, mult, div) \ imx_clk_hw_fixed_factor(name, parent, mult, div)->clk =20 +#define imx_clk_divider(name, parent, reg, shift, width) \ + imx_clk_hw_divider(name, parent, reg, shift, width)->clk + #define imx_clk_divider2(name, parent, reg, shift, width) \ imx_clk_hw_divider2(name, parent, reg, shift, width)->clk =20 +#define imx_clk_divider_flags(name, parent, reg, shift, width, flags) \ + imx_clk_hw_divider_flags(name, parent, reg, shift, width, flags)->clk + +#define imx_clk_gate(name, parent, reg, shift) \ + imx_clk_hw_gate(name, parent, reg, shift)->clk + #define imx_clk_gate_dis(name, parent, reg, shift) \ imx_clk_hw_gate_dis(name, parent, reg, shift)->clk =20 @@ -97,6 +106,9 @@ extern struct imx_pll14xx_clk imx_1443x_pll; #define imx_clk_mux(name, reg, shift, width, parents, num_parents) \ imx_clk_hw_mux(name, reg, shift, width, parents, num_parents)->clk =20 +#define imx_clk_fixed(name, rate) \ + imx_clk_hw_fixed(name, rate)->clk + struct clk *imx_clk_pll14xx(const char *name, const char *parent_name, void __iomem *base, const struct imx_pll14xx_clk *pll_clk); =20 @@ -198,11 +210,6 @@ struct clk_hw *imx_clk_hw_fixup_mux(const char *name, = void __iomem *reg, u8 shift, u8 width, const char * const *parents, int num_parents, void (*fixup)(u32 *val)); =20 -static inline struct clk *imx_clk_fixed(const char *name, int rate) -{ - return clk_register_fixed_rate(NULL, name, NULL, 0, rate); -} - static inline struct clk_hw *imx_clk_hw_fixed(const char *name, int rate) { return clk_hw_register_fixed_rate(NULL, name, NULL, 0, rate); @@ -224,13 +231,6 @@ static inline struct clk_hw *imx_clk_hw_fixed_factor(c= onst char *name, CLK_SET_RATE_PARENT, mult, div); } =20 -static inline struct clk *imx_clk_divider(const char *name, const char *pa= rent, - void __iomem *reg, u8 shift, u8 width) -{ - return clk_register_divider(NULL, name, parent, CLK_SET_RATE_PARENT, - reg, shift, width, 0, &imx_ccm_lock); -} - static inline struct clk_hw *imx_clk_hw_divider(const char *name, const char *parent, void __iomem *reg, u8 shift, @@ -240,14 +240,6 @@ static inline struct clk_hw *imx_clk_hw_divider(const = char *name, reg, shift, width, 0, &imx_ccm_lock); } =20 -static inline struct clk *imx_clk_divider_flags(const char *name, - const char *parent, void __iomem *reg, u8 shift, u8 width, - unsigned long flags) -{ - return clk_register_divider(NULL, name, parent, flags, - reg, shift, width, 0, &imx_ccm_lock); -} - static inline struct clk_hw *imx_clk_hw_divider_flags(const char *name, const char *parent, void __iomem *reg, u8 shift, @@ -274,13 +266,6 @@ static inline struct clk *imx_clk_divider2_flags(const= char *name, reg, shift, width, 0, &imx_ccm_lock); } =20 -static inline struct clk *imx_clk_gate(const char *name, const char *paren= t, - void __iomem *reg, u8 shift) -{ - return clk_register_gate(NULL, name, parent, CLK_SET_RATE_PARENT, reg, - shift, 0, &imx_ccm_lock); -} - static inline struct clk_hw *imx_clk_hw_gate_flags(const char *name, const= char *parent, void __iomem *reg, u8 shift, unsigned long flags) { --=20 2.7.4