From patchwork Wed Jun 29 14:59:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9205617 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CB606075F for ; Wed, 29 Jun 2016 15:09:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D98A285C3 for ; Wed, 29 Jun 2016 15:09:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71EB928659; Wed, 29 Jun 2016 15:09:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1B730285C3 for ; Wed, 29 Jun 2016 15:09:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIH5c-0007rt-Fc; Wed, 29 Jun 2016 15:07:44 +0000 Received: from mail-bn1bon0061.outbound.protection.outlook.com ([157.56.111.61] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIH4g-0007IW-7h for linux-arm-kernel@lists.infradead.org; Wed, 29 Jun 2016 15:06:47 +0000 Received: from BN3PR0301CA0053.namprd03.prod.outlook.com (10.160.152.149) by BN3PR0301MB0851.namprd03.prod.outlook.com (10.160.154.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.523.12; Wed, 29 Jun 2016 15:06:23 +0000 Received: from BN1BFFO11FD039.protection.gbl (2a01:111:f400:7c10::1:145) by BN3PR0301CA0053.outlook.office365.com (2a01:111:e400:401e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16 via Frontend Transport; Wed, 29 Jun 2016 15:06:23 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD039.mail.protection.outlook.com (10.58.144.102) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Wed, 29 Jun 2016 15:06:22 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u5TF65JZ021502; Wed, 29 Jun 2016 08:06:19 -0700 From: Dong Aisheng To: Subject: [PATCH V2 5/8] clk: imx: re-order and concentrate the same type of clk api Date: Wed, 29 Jun 2016 22:59:08 +0800 Message-ID: <1467212351-16626-6-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467212351-16626-1-git-send-email-aisheng.dong@nxp.com> References: <1467212351-16626-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131116863830815423; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(110136002)(36756003)(76176999)(50986999)(97736004)(2906002)(586003)(8936002)(47776003)(189998001)(4326007)(86362001)(575784001)(50466002)(92566002)(48376002)(33646002)(6806005)(19580395003)(87936001)(50226002)(105606002)(2950100001)(68736007)(8676002)(8666005)(2351001)(356003)(305945005)(69596002)(7846002)(19580405001)(104016004)(11100500001)(106466001)(77096005)(5003940100001)(85426001)(81166006)(81156014)(229853001)(7059030)(427584002)(169823001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0301MB0851; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD039; 1:+q8u1IWQ6j9Z72lcOPdhfgvUiBpAUPzJ+yFCLpjWN+KztlB8lhnAHlJ9ROAB+HvDK4KirHG5oGot+TGTHDgS/wLYZctQVdMWtxesvr4dYw7zDgM1742tWZG0TTKHLX6nFFwcyyobmhpMduw4YJmMiFTSNxuEQh1xNE9nn2ObTq11RYdeUdB3/Nd+UQ/AEMo6XolXhdomOCjWL4MhDBd2Hp/6VY0puJhjsee4R8Eh05FBL683e1N3qFe8WIOE/yOiBTsNyEt9fZwSKyq4ahVK6gDP0ZB0s142ag6IR7r8KioXjz9LaKJ2i0A7W4o3gGj/oWOJyPGaXaltkCorQOYD9tZ9Se+PeWSuGUO5aurzPLV58KkfxgCF4sYdy02GUDxrQD+IRsFraotUEvbP90ZNN5LTlCG+HwYp0lUKKuIfLs01SFKOEQz1JCQZbZj0H+wAlAxKvWe+lwQCP47WnAeg72eWmI9IOw2walw2xSscrr3VvrMKwQO1pSbsg92TW3E8wsotaU2tfXtk0x+YuSvXDIBYbuMV2iPbK4K8Vco2tm1eZbOHF5PBFV5zHEdJZsxF43LiDXiJ5QsA2fEd3tAN84REO2X/8+ZNDESPekywlZPWZWBPIfTeC8fovFyP5PWuJPdly8w2Uw03O7uoSOwcYhQt9dmzqRngD1GEdA+4+X2PN41JDjdNBhCuSiJehWgxRSNqAFiM59BfC1qU9eIOzeJQUVeYS3Gv8waj1ZnGRX4= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0882269b-0889-4fda-915e-08d3a02eef27 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0851; 2:o1XxoXw4wWUbXPFc7LDDPGlLJFnve5qIUaIWY9ALadmTPxJWYYiXqcxraWAqsBsTEb1jjAXfRtztH93Gt/LgHYcq7z+hRZzpBmhBqVZIRZWpBFD0mRMKDcaswHK+cwizwpWeWHlS/httQQ0+ou0SEYBsDq2+pxqHMQkMKWmelzJyGACKyt/Mx5FtL0Qrtt1n; 3:DWlH0zEwm/WBhs9mT/NToiqyhFq22U+6t4hCUD51HzP/ci/vNdWye5aF6rQPsyCg5qa+mIiVfMco47jnQE3lb6/jchO5UlbyP1mE0QxURw2kAE2nyglnYdhO1UnciBxVJOigpDAp+fPHK9dZvnOnEa4ltXNP/6sosPnDpkU6PiBA+jdW8g0OfUz6q9JuPxp6GS52C9++Qg/tHSxFbNVlG39qtK6n7FBog/Xy8X+Gr5w= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB0851; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0851; 25:iW4XMV+4e40VMuHHZtfXS39M3x01haxwoAbPO9c+FxtoQIrKY+yOEQilQNJIIrKYovT/EE+Yt92ZSQX+om9/KrEDqQ3V/B91wn07eSvic9L7XYPyYCqL+bDFtans2uIBFgQ++9IsB9fL126FZ15bphPaMfmatwGkBA7jCu6VGchxpSV255hCSXEuYtxo++GIGXAWO/OeDZJzca5krUOCv5+azn6IDnI1t7Nm0QrPaGsdKG2Oisra+XhJAUERfc+4Ygx8EddymCud6cjqC+wzrqf1yBMNKH514RlhH3XBQUnbqNbjlmRSa17KdfU+C2Mc5yBN6dK1UEUiI9SkmSRH++duWMc4iSXrodCqW3+jhsDvgxL2WoImCQX3oSxqdgrM6wscom70roZYG3b3FPitqB4pRCaAscZbmN7gnBV4cTU5/VbVHnAZtjQ7iKw9Gw3IIb8/8i+MFVXiYr3O7bTktGlHcNX9ylZT6iKcf9Pr3sXxFyuOudCRkp977k1OY/6uHA5r45Ju2UAE+vEW98xbyVXe8CiPGy58wdZzBlia7BtOKs05SzDmyGGiWQKdL6kLRFpg32N71Xmk0lMlL5kngnMrCRZUE5cgJVCtToxtDowUzoR8nyWKCuDC3H6bT48EAY16t2N57wAJTexrYiJLgouldHiWGUQQZp+mXK2rVjoSkeXf0zlAdw8DUH4avoD5EC783Thal5ENB0AsruhOcAl59gacu6G8EzdzHa7/Gl2Xu0nOjbghPX6821i6NiDi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(13015025)(13017025)(5005006)(13024025)(13023025)(13018025)(3002001)(10201501046)(6055026); SRVR:BN3PR0301MB0851; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR0301MB0851; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0851; 4:go2PXOPjKjUD+cT1cpEM3smsswfb0SeNhBxwOAGKcfEOoFiSdOo2vqUSP38fAhpDFV/AHwRyUffIYs+Y6lX0shj43T4l8yo9MAsWk9MSopKGbEd92AJtn733ffKdeaxt+6YJ24Ss6hA0mwFp5ZYLkietnKaXZmxClUvY8X79wV99Sm8TYn0fEIIbaWYkwF/hIeyyJsdQnKZa1jeuckotPXVmw/8gJOu35JfyvVr95ohlmuKEGUcQthWyF8z9RgyBMxed9xAeTWEs0oo6Rt248LfTPetE4OePR3xURqJtp1fZw5tXU4lof5qAf1/v/kKcgjmT+4bJ05pdn4ihyM3o88aZvGHDR9WyGp2UeyYXEn9ICYgGwT31cpMWuWpG+R2yME7dR2UnOvWr46+wkQY1xXCXEJ0GPSojQeO2owLuunmVN+jLkmvBp/Z4GaF/F/ZP9bxofKWFzopmrSNiu9Ebi51P1dP4QjTFfh9CwaaidRKDpQN/31YR+Bhb7BQyry9c1pbikaCgZoNniEOWxgfyJQ== X-Forefront-PRVS: 09888BC01D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB0851; 23:Sr5ag/LhtTZBE02omzOxFRhAO8TbsU1PpxgOlPb?= =?us-ascii?Q?3AzJ7+Th2aV5NNSNoVgSbtsnzZed2CZiBZHZHQ7pZ4i6hNJ44W/WxrjcXV+w?= =?us-ascii?Q?Sq4UJVHDJGf3XU/8gpZokEmJpLLn2GJRnDdA5GMQlCvfwFtE4m3U363oU7sh?= =?us-ascii?Q?BX66949gstfZXJnQ22wZDpKg4USCxebWSfSpqOVgl4p44XYYf2ZHHhTPgXRh?= =?us-ascii?Q?PqZlGqAOOaV9M4PesCJTxGmJ+hYE78tRtNA4AcbIHXRcjzVOuW9NLY2RkrCY?= =?us-ascii?Q?8qrp6qK3fhA8Lj4JkEWyHjv4SuTqZs/+0WJinvy5THkC0zsNM4g0X5cqU5Gz?= =?us-ascii?Q?Mf/noN8K5vUkClHYEifmtSgxDuBwnyOgQBaBNUXbKwNa4U6OnlvYqXLDG2KM?= =?us-ascii?Q?pjEAsRbhiNZXM8KxkCg7/7Eis0GDvGFbpv1yxpWnG9qiTTBeKZjsXbvKwFQr?= =?us-ascii?Q?5MzsPECl6UkO5M2IpD/vybQr4x0ZIQZh0eNNxQUxI5PHv1lW+D18FRgCPVyU?= =?us-ascii?Q?Rrs2PBQ2wSdpnT+53VL4Mf2L34ftDyBSTtxPXKqW08G7KVoQp92DnYGj3Meh?= =?us-ascii?Q?TmtVGicpseAb4vs/VxSeBmv+seJYu+pitgAoB5x9OF/cNdQIlRsO46Wmkyef?= =?us-ascii?Q?rZPX/xRDMJLgURa2f7iLEiua8XdjT9SCUm/etZWZiuIIjXKjLVfnw/5LNZ1X?= =?us-ascii?Q?euZxzDNHu4OKg99gdSNOiOhOrIAhegnWLssvT25V3rB7+DHo+jiMwKLqXM2r?= =?us-ascii?Q?zYQ60yuz5rgZ/UUmQyrncQaENVZWXR4R+VnVYmP7fT+pMNOXNGoVW2b6Lmp1?= =?us-ascii?Q?GFG0lPU/VMrldLnPTmtShnKmwx3NdDHIM4ZHQuCsFgz7ymii/KKeSpY1/7I8?= =?us-ascii?Q?BCxzQ2lo3pfPcOAXloj/77Cr0DafVeK2M4fmjkgasCY9S8kPNIlrAcIrxvF4?= =?us-ascii?Q?ux7H97wGQBZmiATD+1B3ICBus/dkSRVd2FzibpUYKOIBigEB1b9FRGvY5M/E?= =?us-ascii?Q?3f4gvSTNfA/U8S68TwrHTcVP3WomshzQSY9QuoVeBQVUDUTu81Vzd5gunOCt?= =?us-ascii?Q?QVyiGzp1n+2dIqjzJb5n3NIL/qDVrRm9FcQbwB/KtZBHQQvgsNGaF35FmAjJ?= =?us-ascii?Q?X2MLo181puc6Wpll/br4jnql4pEjHvRaE9qQjOCl76NR9zwwnTdq7i6sCmKd?= =?us-ascii?Q?4s6G1aoQo1eO2AuTKlA4G1GS9Y5thcMDxdiSr+nIBorEg+O1CPDlnh5rM3fD?= =?us-ascii?Q?iVR1TpzdQCna2I/0QZUE=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0851; 6:GvdDPOFHNks24xBgdkqMV7CW2kOmGYOOkr3r9k9I9JflfxtHbw5WbGZnSqvZUiUQ2Et+WYY1w38Apsd2kY3tvevFnlT9lSODEM/bui28OOJME6NB8A0wYsTOvB5KqE3RfesBHtSNAwA8usOG4654dKoGGHc0TWYs2cSDnS/SctG9/+fIdUivndZ3dYOp0Gcf/665G0zyFicZiF8R9VILSErh35Av0Rv4BYtBjoPagYJEZEMJoEuWiz0eE67n5KZ4XC+liQ+3S+qC59x2+YuTnls64WFuR8ZIemhlem8DWYTlQtUjE6Diwr8VW7RiZXUM; 5:R5PC1LTbNc6LAjNXgDWM08iJ/9Av6Y8/wA94WMlJM1XaFSNnX+ny11QDjqOipZ7my+LJzSjhC4u2TQo399EFurSBsJHXycYiiplAuJnuYV1V2eBnTxEYAc5+g6hBFY8UEEBt9QpYRjNFe8L+vJd9fB2Qbih1FHq9OKD5ePtVil4=; 24:eZwlkRDOThkDJw/ZWrddP1P9AuNtEGed0FFl6WkVvNjCTTGPwv1DamSqmSnUGyRy+8tl+7eu7SpU9DbART8A4314AGio2w3ZPCzGVwwEL3U=; 7:pyskenzkpBp3rS4HZrcVP0s2QGKTFROTYYu8iKQAL8TPeqBiUe/yDWQi8/PMaVOBEwunKYzQTmoy7zviZR5FuloL6f0hQJBARhR2oyN8duFrwvC7JTcRFqOUgvvvWtd4UzpvCd7FkE39UlmJTK1cQ1gMOtbRXKIyoQep6Dtw2RnYSLVilw+6MMlHeMzKXHvwY8iGWV41zQ7YszH3CCcClIStQD6cwAJYgMM3TNEZSYhlBOQwq8/aUyudM5E+O2YBniyprh986ktF8fw3rdnp3g== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2016 15:06:22.7227 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB0851 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160629_080646_598133_63C3F860 X-CRM114-Status: UNSURE ( 9.05 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, anson.huang@nxp.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Re-order and concentrate the same type of clk api for better code maintenance. Cc: Shawn Guo Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk.h | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 508d0fad84cf..df87d8888d80 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -51,28 +51,6 @@ struct clk * imx_obtain_fixed_clock( struct clk *imx_clk_gate_exclusive(const char *name, const char *parent, void __iomem *reg, u8 shift, u32 exclusive_mask); -static inline struct clk *imx_clk_gate2(const char *name, const char *parent, - void __iomem *reg, u8 shift) -{ - return clk_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT, reg, - shift, 0x3, 0, &imx_ccm_lock, NULL); -} - -static inline struct clk *imx_clk_gate2_shared(const char *name, - const char *parent, void __iomem *reg, u8 shift, - unsigned int *share_count) -{ - return clk_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT, reg, - shift, 0x3, 0, &imx_ccm_lock, share_count); -} - -static inline struct clk *imx_clk_gate2_cgr(const char *name, const char *parent, - void __iomem *reg, u8 shift, u8 cgr_val) -{ - return clk_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT, reg, - shift, cgr_val, 0, &imx_ccm_lock, NULL); -} - struct clk *imx_clk_pfd(const char *name, const char *parent_name, void __iomem *reg, u8 idx); @@ -97,6 +75,13 @@ 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 *imx_clk_fixed_factor(const char *name, + const char *parent, unsigned int mult, unsigned int div) +{ + return clk_register_fixed_factor(NULL, name, parent, + CLK_SET_RATE_PARENT, mult, div); +} + static inline struct clk *imx_clk_divider(const char *name, const char *parent, void __iomem *reg, u8 shift, u8 width) { @@ -126,6 +111,28 @@ static inline struct clk *imx_clk_gate_dis(const char *name, const char *parent, shift, CLK_GATE_SET_TO_DISABLE, &imx_ccm_lock); } +static inline struct clk *imx_clk_gate2(const char *name, const char *parent, + void __iomem *reg, u8 shift) +{ + return clk_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT, reg, + shift, 0x3, 0, &imx_ccm_lock, NULL); +} + +static inline struct clk *imx_clk_gate2_shared(const char *name, + const char *parent, void __iomem *reg, u8 shift, + unsigned int *share_count) +{ + return clk_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT, reg, + shift, 0x3, 0, &imx_ccm_lock, share_count); +} + +static inline struct clk *imx_clk_gate2_cgr(const char *name, const char *parent, + void __iomem *reg, u8 shift, u8 cgr_val) +{ + return clk_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT, reg, + shift, cgr_val, 0, &imx_ccm_lock, NULL); +} + static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, u8 shift, u8 width, const char **parents, int num_parents) { @@ -143,13 +150,6 @@ static inline struct clk *imx_clk_mux_flags(const char *name, &imx_ccm_lock); } -static inline struct clk *imx_clk_fixed_factor(const char *name, - const char *parent, unsigned int mult, unsigned int div) -{ - return clk_register_fixed_factor(NULL, name, parent, - CLK_SET_RATE_PARENT, mult, div); -} - struct clk *imx_clk_cpu(const char *name, const char *parent_name, struct clk *div, struct clk *mux, struct clk *pll, struct clk *step);