From patchwork Thu Jan 9 09:51:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11325361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7151B1395 for ; Thu, 9 Jan 2020 09:51:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B98F2077B for ; Thu, 9 Jan 2020 09:51:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="YwbyEoxt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729821AbgAIJv6 (ORCPT ); Thu, 9 Jan 2020 04:51:58 -0500 Received: from mail-eopbgr150077.outbound.protection.outlook.com ([40.107.15.77]:26668 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729170AbgAIJv6 (ORCPT ); Thu, 9 Jan 2020 04:51:58 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jkMfifWn6iT/RU0PzTYyz258TlCyQwn0ji4MegNu2rd2nlR2NxXdVm7a4y+8FOJMuEFiyIb63GQHo6UyzDkefxTKQlv1djuJlHdGJ/OuyyaWtM1zy2btNEw4hXl/I249FsVghZ7DZwu/rDGbNpHDESDl0zixUC6W3gvQfFy/qGYNdg3Myw5gS8iyk8tyKq1aTxZMw6Yno2Ef+o0rap8vy2xTqE3X62IARTNhITzy/wKEoS141sW+2AYeLAxXqFAiBUF0AJ3EgDhPMhVkNR5zSIPJ0WYCDzylOWgxPsWWb5P6Qs991/GIomtaw4op2+h7IE58OzrA20+NC+rHrhabFg== 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=0Cf1zCLId+N9/Ou4et2vAH1Xuiq6AnPLT30Ercj9LOE=; b=Oel0XLf+tNIBCaedtAwIMTV0wJgDzrf/phnHKnmrjCMIkWLz1u6PNsS0hRgKtwriqfPhXufYbpmR549GGfk82zM3cZwEtT0AreeINIe0Sv0IKDERdZJ0jA+lT5VleXecr+/cWzQr0aqAvVu634ckxPQD6ClNHGc0EXt15h2HxJ4e3mobw8xRnrubLMpAvToGZ7RtKZUvKQOmMepEnWB0hQmsB+Ld591HK9Tk85nIh0xJPoQJT0AKc6Df9bewL6xIkVyTPk9EIccqp0suLSpAJ9op+B+EV/JcGdAYNEzy60FBbOyugMZ3YOB5WauL15jQyC4NKKokd+v7lMrk/JWg1w== 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=0Cf1zCLId+N9/Ou4et2vAH1Xuiq6AnPLT30Ercj9LOE=; b=YwbyEoxtMLGAolplTD53TF8XubRAiHpP2lW8Q/mLbv6pkbbPtAJbXk1SkZwS+TuG46dgQJrWF54DkPrd+zq5wPUFkDjpuowZ8VmDwizQwmcjn6KarlznShsrpg/aN94k6ltlLYNywqZZFYcnp2zD+UubWmsTGEcKtjA5fdip6ig= Received: from VI1PR04MB4496.eurprd04.prod.outlook.com (20.177.54.92) by VI1PR04MB6878.eurprd04.prod.outlook.com (52.133.244.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Thu, 9 Jan 2020 09:51:55 +0000 Received: from VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b]) by VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b%6]) with mapi id 15.20.2623.010; Thu, 9 Jan 2020 09:51:55 +0000 Received: from localhost.localdomain (119.31.174.67) by HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2602.12 via Frontend Transport; Thu, 9 Jan 2020 09:51:49 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez CC: "kernel@pengutronix.de" , dl-linux-imx , Aisheng Dong , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anson Huang , Jacky Bai , Peng Fan Subject: [PATCH 1/4] clk: imx: composite-8m: add imx8m_clk_hw_core_composite Thread-Topic: [PATCH 1/4] clk: imx: composite-8m: add imx8m_clk_hw_core_composite Thread-Index: AQHVxtJtEmvfMffSOkGVxP8XepIuvA== Date: Thu, 9 Jan 2020 09:51:55 +0000 Message-ID: <1578563269-32710-2-git-send-email-peng.fan@nxp.com> References: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) To VI1PR04MB4496.eurprd04.prod.outlook.com (2603:10a6:803:69::28) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.67] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ab077a2c-971d-4998-95a2-08d794e98f6c x-ms-traffictypediagnostic: VI1PR04MB6878:|VI1PR04MB6878: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3276; x-forefront-prvs: 02778BF158 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(396003)(136003)(376002)(366004)(346002)(39860400002)(189003)(199004)(6486002)(26005)(4326008)(54906003)(69590400006)(36756003)(6636002)(71200400001)(6506007)(110136005)(52116002)(478600001)(8936002)(6512007)(316002)(16526019)(186003)(86362001)(6666004)(2616005)(956004)(44832011)(66946007)(66556008)(5660300002)(66446008)(64756008)(2906002)(8676002)(81166006)(66476007)(81156014);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6878;H:VI1PR04MB4496.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: eOSu1OnozzUUGIB+O9P4ojWAtUU1W/P9la0lDjzFvWhrzUjJzyWF0FmIZtMw1EFF3dDj2PbPYBZd8vBwXDaPf5m6X8nD70cDq4ZCSphyLLkkC1r5smUCQX08ToUc162Gbfv5ZfwfhbPs7ouKN1ipwbnmH2hvPRi/cBvECayKFxn76ZXn4axMo8IgpYbrHKEhVl6pF0iInvNDuNphmHjgK6BTrCgc6m4znYmsragljj13obq/tBjwnlgppzu5QFPPXwcjSbRiB9K7JH/hZrErY2h4kbnoCkwMvL4Wce4rxUST748xNJfbenDXpEGhKcaaeUy1wYnUyx+QpQVEwxqwwkW0Bkh3lsMg5SZmb0pulKL124rXOYl6pvZ+iXOaTasCXg0Rs7QjW6kZmte96phx7rmLmcm44kWYhczOAgZqGoATakDCGWvXA5D68/KQUZJe2nHavgzKURLPLHXVIt5FYgVHAN05NSOvjOPDiaSsZBmJxUAcuCmZbmTIQePJxGvi MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab077a2c-971d-4998-95a2-08d794e98f6c X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2020 09:51:55.3321 (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: BOFzTUgSMFeEISOhI6pjMhJq2f3TnlLf8kXBPL4qKWNHgRETDx+L3VZDaz4gABBO9L37lbIkkv7fovFemDTFUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6878 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan There are several clock slices, current composite code only support bus/ip clock slices, it could not support core slice. So introduce a new API imx8m_clk_hw_core_composite to support core slice. To core slice, post divider with 3 bits width and no pre divider. Other fields are same as bus/ip slices. Add a flag IMX_COMPOSITE_CORE for the usecase. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-composite-8m.c | 18 ++++++++++++++---- drivers/clk/imx/clk.h | 12 ++++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c index 20f7c91c03d2..4869c16376bf 100644 --- a/drivers/clk/imx/clk-composite-8m.c +++ b/drivers/clk/imx/clk-composite-8m.c @@ -15,6 +15,7 @@ #define PCG_PREDIV_MAX 8 #define PCG_DIV_SHIFT 0 +#define PCG_CORE_DIV_WIDTH 3 #define PCG_DIV_WIDTH 6 #define PCG_DIV_MAX 64 @@ -126,6 +127,7 @@ static const struct clk_ops imx8m_clk_composite_divider_ops = { struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, const char * const *parent_names, int num_parents, void __iomem *reg, + u32 composite_flags, unsigned long flags) { struct clk_hw *hw = ERR_PTR(-ENOMEM), *mux_hw; @@ -133,6 +135,7 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, struct clk_divider *div = NULL; struct clk_gate *gate = NULL; struct clk_mux *mux = NULL; + const struct clk_ops *divider_ops; mux = kzalloc(sizeof(*mux), GFP_KERNEL); if (!mux) @@ -150,8 +153,16 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, div_hw = &div->hw; div->reg = reg; - div->shift = PCG_PREDIV_SHIFT; - div->width = PCG_PREDIV_WIDTH; + if (composite_flags & IMX_COMPOSITE_CORE) { + div->shift = PCG_DIV_SHIFT; + div->width = PCG_CORE_DIV_WIDTH; + divider_ops = &clk_divider_ops; + } else { + div->shift = PCG_PREDIV_SHIFT; + div->width = PCG_PREDIV_WIDTH; + divider_ops = &imx8m_clk_composite_divider_ops; + } + div->lock = &imx_ccm_lock; div->flags = CLK_DIVIDER_ROUND_CLOSEST; @@ -166,8 +177,7 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, hw = clk_hw_register_composite(NULL, name, parent_names, num_parents, mux_hw, &clk_mux_ops, div_hw, - &imx8m_clk_composite_divider_ops, - gate_hw, &clk_gate_ops, flags); + divider_ops, gate_hw, &clk_gate_ops, flags); if (IS_ERR(hw)) goto fail; diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index ea84d2993b57..a74a409724e7 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -483,20 +483,28 @@ struct clk_hw *imx_clk_hw_cpu(const char *name, const char *parent_name, struct clk *div, struct clk *mux, struct clk *pll, struct clk *step); +#define IMX_COMPOSITE_CORE BIT(0) + struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, const char * const *parent_names, int num_parents, void __iomem *reg, + u32 composite_flags, unsigned long flags); +#define imx8m_clk_hw_core_composite(name, parent_names, reg) \ + imx8m_clk_hw_composite_flags(name, parent_names, \ + ARRAY_SIZE(parent_names), reg, \ + IMX_COMPOSITE_CORE, 0) + #define imx8m_clk_composite_flags(name, parent_names, num_parents, reg, \ flags) \ to_clk(imx8m_clk_hw_composite_flags(name, parent_names, \ - num_parents, reg, flags)) + num_parents, reg, 0, flags)) #define __imx8m_clk_hw_composite(name, parent_names, reg, flags) \ imx8m_clk_hw_composite_flags(name, parent_names, \ - ARRAY_SIZE(parent_names), reg, \ + ARRAY_SIZE(parent_names), reg, 0, \ flags | CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE) #define __imx8m_clk_composite(name, parent_names, reg, flags) \ From patchwork Thu Jan 9 09:52:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11325363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A09F1580 for ; Thu, 9 Jan 2020 09:52:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E2F82072E for ; Thu, 9 Jan 2020 09:52:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="oGxFEn89" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729897AbgAIJwG (ORCPT ); Thu, 9 Jan 2020 04:52:06 -0500 Received: from mail-eopbgr140080.outbound.protection.outlook.com ([40.107.14.80]:57486 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729170AbgAIJwG (ORCPT ); Thu, 9 Jan 2020 04:52:06 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KG3QDthfan+AkxmaoC44kIr1yOuDEUI+XOcE8s+jHQ9PEyWnkTK5KKVbIvkCuSBnrD7+f5ajn79/0FoXBOUiEPbozqEcu9TdcrIXJcbcszOwK8HPpOjx4qyvNM3k7E9BBsSgcBPixt5cryKigqBkkMB7NGAv1xV5FA5ZG65frtB+NUyHxRaaLuhWyO3b00vfnHgYb2JRrEVBFDAM2qPBOupWDaaUGapg6RHja99c5+W6g+ptD0sksqswLlS6ygAJrnL7NYR2Y/7sMZwGU0/IgKreRTVKMzOhBhOPDWI0tsV0Sss81vti7jLZUdAhqL0nsKVvD7d77SX8nXP4Ngn05w== 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=muRifBPHRwcqLMy00aKt6JR3b/i4J6Lpr9xqb2CLxMo=; b=T6QIdved3GdoMej7Wyy10/7p2KbjJev0w6Hc9pWRbplCNGlFQeNiX+C5onk+KvhDAr/ZpgZFQlrYIazrmnueN1DTv10ewWTd98zdoFuUbRXuMM7kookKNRf14rSycoeClUs9QYcCa50SIc5cM85/f9rHldNEoGXvz9ZnFcWYOWGqp1KrYexF4scjszUDf67K61dKaKztgnkeXRArfvTySxy3Vs7u92B2Dhi2KyI6Q1Va/0BuMz5UE+NX/qaNPohKreymrEh6UoGadyFdeC7bYxwqgNKLOgZHVhlRnt66nVjJzjWMBidcitWuVDFvL51tpjIbVWwVcILHE9HR2EnkgA== 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=muRifBPHRwcqLMy00aKt6JR3b/i4J6Lpr9xqb2CLxMo=; b=oGxFEn89zWmElkJ4mG5szYY8nYEOqMeKa3m+pLQ7VCVlyN5FLoHDBpAXk0x/hYxdhkm5usAT2cF50LWRYXUq8nTVrXyAvamTlXnBTaaCouBEaq9OFP+G/F4GO8k6SrNAdhmgLzpBq9LNtyhkTSFZVE/C98ohkRiwT9JOAfdwllA= Received: from VI1PR04MB4496.eurprd04.prod.outlook.com (20.177.54.92) by VI1PR04MB6878.eurprd04.prod.outlook.com (52.133.244.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Thu, 9 Jan 2020 09:52:02 +0000 Received: from VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b]) by VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b%6]) with mapi id 15.20.2623.010; Thu, 9 Jan 2020 09:52:02 +0000 Received: from localhost.localdomain (119.31.174.67) by HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2602.12 via Frontend Transport; Thu, 9 Jan 2020 09:51:55 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez CC: "kernel@pengutronix.de" , dl-linux-imx , Aisheng Dong , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anson Huang , Jacky Bai , Peng Fan Subject: [PATCH 2/4] clk: imx: imx8mq: use imx8m_clk_hw_core_composite Thread-Topic: [PATCH 2/4] clk: imx: imx8mq: use imx8m_clk_hw_core_composite Thread-Index: AQHVxtJxubTNOuBidU6XCx51bC8+lg== Date: Thu, 9 Jan 2020 09:52:02 +0000 Message-ID: <1578563269-32710-3-git-send-email-peng.fan@nxp.com> References: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) To VI1PR04MB4496.eurprd04.prod.outlook.com (2603:10a6:803:69::28) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.67] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c2b488d9-cf7a-4836-cfa3-08d794e993d0 x-ms-traffictypediagnostic: VI1PR04MB6878:|VI1PR04MB6878: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:239; x-forefront-prvs: 02778BF158 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(396003)(136003)(376002)(366004)(346002)(39860400002)(189003)(199004)(6486002)(26005)(4326008)(54906003)(69590400006)(36756003)(6636002)(71200400001)(6506007)(110136005)(52116002)(478600001)(8936002)(6512007)(316002)(16526019)(186003)(86362001)(6666004)(2616005)(956004)(44832011)(66946007)(66556008)(5660300002)(66446008)(64756008)(2906002)(8676002)(81166006)(66476007)(81156014)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6878;H:VI1PR04MB4496.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: wDG89ymshYTqWy7uo+8p8wfuNm4kS+zcYTqWdI9hlvEHYE6OnDTljznZbZxDOEmb6SfNNT9Z/8Htv7h7aarALUa6b/lnXCZofto8kmBYFL/3rt1p4LE3EryBZERNHxfLOhpUtflIp1K3MKDycE2iaMII6OXOSsk6RLYtfXjAwMGRZFf+Ngs5jEOccttaR2sTVIjJHdiCvrFKMq6BzosAkOEYZtOxXX1uB5fj61KolB/5FIbKqjGEH7Cdid8pLeFdK5c8+qfE2ArOBX3GQqZZ7G+J/c+tAwvz+ax9cHYnAhXht1a5UxccRarwpQ1uKV1tFKBKIDdy4/f8iuT3v52gGBwP2SxpGN2jeaXARpxOK9PIsMVaQGJirHbNrq8vA+Y1VLPcwM9KZ7ZRIhyB9r8PUs5m7PBBIOvexth8Bon8tiXLwIxtC/suhq6LaoC079jdCLanS6uKdx5GQfIOz9BKZr3KCB3tqr7LL6ks8eRdIRAvGUIFfIME0opF2d7gu6DtIDJAH8Tu7QVqEBR7WCq59g== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2b488d9-cf7a-4836-cfa3-08d794e993d0 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2020 09:52:02.6439 (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: n2LlPYd3hHLwF7M0MLu5ZI8x0r6O5P8pCpuNljmHtUrNdnDJtzGpszaDY0GUP6EjRvpMoNbhzESMG0NgbihJBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6878 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan Use imx8m_clk_hw_core_composite to simplify code. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mq.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c index 4c0edca1a6d0..5e22950d4907 100644 --- a/drivers/clk/imx/clk-imx8mq.c +++ b/drivers/clk/imx/clk-imx8mq.c @@ -403,22 +403,13 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) /* CORE */ hws[IMX8MQ_CLK_A53_SRC] = imx_clk_hw_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mq_a53_sels, ARRAY_SIZE(imx8mq_a53_sels)); - hws[IMX8MQ_CLK_M4_SRC] = imx_clk_hw_mux2("arm_m4_src", base + 0x8080, 24, 3, imx8mq_arm_m4_sels, ARRAY_SIZE(imx8mq_arm_m4_sels)); - hws[IMX8MQ_CLK_VPU_SRC] = imx_clk_hw_mux2("vpu_src", base + 0x8100, 24, 3, imx8mq_vpu_sels, ARRAY_SIZE(imx8mq_vpu_sels)); - hws[IMX8MQ_CLK_GPU_CORE_SRC] = imx_clk_hw_mux2("gpu_core_src", base + 0x8180, 24, 3, imx8mq_gpu_core_sels, ARRAY_SIZE(imx8mq_gpu_core_sels)); - hws[IMX8MQ_CLK_GPU_SHADER_SRC] = imx_clk_hw_mux2("gpu_shader_src", base + 0x8200, 24, 3, imx8mq_gpu_shader_sels, ARRAY_SIZE(imx8mq_gpu_shader_sels)); - hws[IMX8MQ_CLK_A53_CG] = imx_clk_hw_gate3_flags("arm_a53_cg", "arm_a53_src", base + 0x8000, 28, CLK_IS_CRITICAL); - hws[IMX8MQ_CLK_M4_CG] = imx_clk_hw_gate3("arm_m4_cg", "arm_m4_src", base + 0x8080, 28); - hws[IMX8MQ_CLK_VPU_CG] = imx_clk_hw_gate3("vpu_cg", "vpu_src", base + 0x8100, 28); - hws[IMX8MQ_CLK_GPU_CORE_CG] = imx_clk_hw_gate3("gpu_core_cg", "gpu_core_src", base + 0x8180, 28); - hws[IMX8MQ_CLK_GPU_SHADER_CG] = imx_clk_hw_gate3("gpu_shader_cg", "gpu_shader_src", base + 0x8200, 28); - hws[IMX8MQ_CLK_A53_DIV] = imx_clk_hw_divider2("arm_a53_div", "arm_a53_cg", base + 0x8000, 0, 3); - hws[IMX8MQ_CLK_M4_DIV] = imx_clk_hw_divider2("arm_m4_div", "arm_m4_cg", base + 0x8080, 0, 3); - hws[IMX8MQ_CLK_VPU_DIV] = imx_clk_hw_divider2("vpu_div", "vpu_cg", base + 0x8100, 0, 3); - hws[IMX8MQ_CLK_GPU_CORE_DIV] = imx_clk_hw_divider2("gpu_core_div", "gpu_core_cg", base + 0x8180, 0, 3); - hws[IMX8MQ_CLK_GPU_SHADER_DIV] = imx_clk_hw_divider2("gpu_shader_div", "gpu_shader_cg", base + 0x8200, 0, 3); + + hws[IMX8MQ_CLK_M4_DIV] = imx8m_clk_hw_core_composite("arm_m4_div", imx8mq_arm_m4_sels, base + 0x8080); + hws[IMX8MQ_CLK_VPU_DIV] = imx8m_clk_hw_core_composite("vpu_div", imx8mq_vpu_sels, base + 0x8100); + hws[IMX8MQ_CLK_GPU_CORE_DIV] = imx8m_clk_hw_core_composite("gpu_core_div", imx8mq_gpu_core_sels, base + 0x8180); + hws[IMX8MQ_CLK_GPU_SHADER_DIV] = imx8m_clk_hw_composite("gpu_shader_div", imx8mq_gpu_shader_sels, base + 0x8200); /* BUS */ hws[IMX8MQ_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mq_main_axi_sels, base + 0x8800); From patchwork Thu Jan 9 09:52:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11325367 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B12B1580 for ; Thu, 9 Jan 2020 09:52:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D43902077B for ; Thu, 9 Jan 2020 09:52:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="VFQedWlx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729914AbgAIJwL (ORCPT ); Thu, 9 Jan 2020 04:52:11 -0500 Received: from mail-eopbgr140042.outbound.protection.outlook.com ([40.107.14.42]:14702 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729911AbgAIJwK (ORCPT ); Thu, 9 Jan 2020 04:52:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RwxgrM7xXCWp5cp+MvBPBaVlNYO9rJr0zlZCij5D1UHOxpbEoUeiaeyZzSBv6Rzd3MHzVbrbB7GahDKUi6rMJkXURzfaacXoYUuq3Zxt8h+UX9WFtuezbVQGmO/faXSNWqwo/dgBCPftl8tQc39FETxO60zb5UpqwYyxJlVqGZYHM33xbBHbuATAd2v8dhkyCvpeetMv8CnOpdHNfBUhxpLJ3boPp9B+fYoeXbvr2JDNW6eAe3WbJKkU/IpbUrAFc9KwLT+xaVf0pgR0dpMOrsv4W1LYbgFTPPXFzETJ8WG/2OdVMSBs8m00z4m+hzD0vtdHfrAPHBhp4h6KrY0q/A== 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=MIKUhZgICijkrX28JixLRv5pQtUlSzyXjt7NpcozBpE=; b=GXVH7OfEFWgt9lLiG/oIGgzYVvRVU9X+3hd/lqSHNYfwXJOwHgHe/u8LCyPJroV+zDKKe0IMFNGrJNWm8MrJkBLu51yV9exW9ru1lKGrtVsTiwb3F4rxLDxq2lC/VEWdREaMp4dFse8qYTNtq8TD3LQZGy1rICupqKRqs+qwZmFg4MBEJrqJpHWKPPhIIblVrCAd1i5NaJjqzjXTHijsCAdoMp8053Ii8o+NUXeELJc6os19k3fxDUt3smpFpBUuVELvOT6PekBWUhvEFRfHpV3bOoXhRfiNtpFfnmXl5UeneZQ7S0xwyrY6UL6t2s1ScThkaVuK+YCiL/BQ+yBrqg== 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=MIKUhZgICijkrX28JixLRv5pQtUlSzyXjt7NpcozBpE=; b=VFQedWlxaaH1EmkLSpzw3ToNcV9oY9UOJMpCh3tSei2MpSNxSi5UtAwEKGqCaWwSeTTiixSOl+jAwCutkJezpklAjy4pLAQ76efPUwKgVphrdHBz/o6pxGRJbkMk0mgJj3471FErcusFspfjoLjOyRN6MGzYYI1dL7mAnxJoH3I= Received: from VI1PR04MB4496.eurprd04.prod.outlook.com (20.177.54.92) by VI1PR04MB6878.eurprd04.prod.outlook.com (52.133.244.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Thu, 9 Jan 2020 09:52:07 +0000 Received: from VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b]) by VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b%6]) with mapi id 15.20.2623.010; Thu, 9 Jan 2020 09:52:07 +0000 Received: from localhost.localdomain (119.31.174.67) by HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2602.12 via Frontend Transport; Thu, 9 Jan 2020 09:52:03 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez CC: "kernel@pengutronix.de" , dl-linux-imx , Aisheng Dong , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anson Huang , Jacky Bai , Peng Fan Subject: [PATCH 3/4] clk: imx: imx8mm: use imx8m_clk_hw_core_composite Thread-Topic: [PATCH 3/4] clk: imx: imx8mm: use imx8m_clk_hw_core_composite Thread-Index: AQHVxtJ07Eg4kmVY8kOhffTV5CAwEg== Date: Thu, 9 Jan 2020 09:52:07 +0000 Message-ID: <1578563269-32710-4-git-send-email-peng.fan@nxp.com> References: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) To VI1PR04MB4496.eurprd04.prod.outlook.com (2603:10a6:803:69::28) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.67] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 33e380a7-d40c-43db-6d35-08d794e99692 x-ms-traffictypediagnostic: VI1PR04MB6878:|VI1PR04MB6878: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:361; x-forefront-prvs: 02778BF158 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(396003)(136003)(376002)(366004)(346002)(39860400002)(189003)(199004)(6486002)(26005)(4326008)(54906003)(69590400006)(36756003)(6636002)(71200400001)(6506007)(110136005)(52116002)(478600001)(8936002)(6512007)(316002)(16526019)(186003)(86362001)(2616005)(956004)(44832011)(66946007)(66556008)(5660300002)(66446008)(64756008)(2906002)(8676002)(81166006)(66476007)(81156014)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6878;H:VI1PR04MB4496.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: viODdROdMcIU3l1o2Tdi4pvo9OnBS5BgzmYGuO221RE0WOcZdZmxZ973wrjtvJpl788bgokTVTHUfdGVPC2lPVmvNrJwm60cuQldtBiIVSnCrfa7RS55nzvMIvEhw47Y99CkCF3+J/mBCgsiBCP0xvBwXos/i5LEb2zw4LTWJvi/3eahUs9WmdZA4tw0Y/EMDx4j5Vg/d21Ht5yXkebpe8CnAQydaqirzSmuYNevAk+s8LJy820FulrLpAfj01m5r2yALobaXJSecfNVdppR5v4GCHml9cz5dmy0K+fpsODMCB9RLo9cfsW51DuA923MPkiHVZwDbiWpWTNocijywPT5aTdtSIKf9oHTqlt09TZDHYWl94qDA0toMAp7ZkSZDcpkLLrHx9DP3l4t2vxOWTnY4ipFl+C9GAJ35lwolYpi9jvis0tQKpaFxqTOPL1q4uvusDKV25FD5IGB7HE3TBToTEyuUCsXvPvBF0EgcydYvLvOzgoJiET1YWPgT6l7JCaK1uo9GIoBzMLKLyriVw== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33e380a7-d40c-43db-6d35-08d794e99692 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2020 09:52:07.2542 (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: cqLRgJ1yCL9zObZZrZb+OEbgLWxFulpifFKjr4ntAjhoBVWEbMKfC/dhWLU5Wk4Pmq3S510CrEGmrYPhDiIvtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6878 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan Use imx8m_clk_hw_core_composite to simplify code. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mm.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index 55862652b19f..19883611a5ab 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -414,20 +414,13 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) /* Core Slice */ hws[IMX8MM_CLK_A53_SRC] = imx_clk_hw_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mm_a53_sels, ARRAY_SIZE(imx8mm_a53_sels)); - hws[IMX8MM_CLK_M4_SRC] = imx_clk_hw_mux2("arm_m4_src", base + 0x8080, 24, 3, imx8mm_m4_sels, ARRAY_SIZE(imx8mm_m4_sels)); - hws[IMX8MM_CLK_VPU_SRC] = imx_clk_hw_mux2("vpu_src", base + 0x8100, 24, 3, imx8mm_vpu_sels, ARRAY_SIZE(imx8mm_vpu_sels)); - hws[IMX8MM_CLK_GPU3D_SRC] = imx_clk_hw_mux2("gpu3d_src", base + 0x8180, 24, 3, imx8mm_gpu3d_sels, ARRAY_SIZE(imx8mm_gpu3d_sels)); - hws[IMX8MM_CLK_GPU2D_SRC] = imx_clk_hw_mux2("gpu2d_src", base + 0x8200, 24, 3, imx8mm_gpu2d_sels, ARRAY_SIZE(imx8mm_gpu2d_sels)); hws[IMX8MM_CLK_A53_CG] = imx_clk_hw_gate3("arm_a53_cg", "arm_a53_src", base + 0x8000, 28); - hws[IMX8MM_CLK_M4_CG] = imx_clk_hw_gate3("arm_m4_cg", "arm_m4_src", base + 0x8080, 28); - hws[IMX8MM_CLK_VPU_CG] = imx_clk_hw_gate3("vpu_cg", "vpu_src", base + 0x8100, 28); - hws[IMX8MM_CLK_GPU3D_CG] = imx_clk_hw_gate3("gpu3d_cg", "gpu3d_src", base + 0x8180, 28); - hws[IMX8MM_CLK_GPU2D_CG] = imx_clk_hw_gate3("gpu2d_cg", "gpu2d_src", base + 0x8200, 28); hws[IMX8MM_CLK_A53_DIV] = imx_clk_hw_divider2("arm_a53_div", "arm_a53_cg", base + 0x8000, 0, 3); - hws[IMX8MM_CLK_M4_DIV] = imx_clk_hw_divider2("arm_m4_div", "arm_m4_cg", base + 0x8080, 0, 3); - hws[IMX8MM_CLK_VPU_DIV] = imx_clk_hw_divider2("vpu_div", "vpu_cg", base + 0x8100, 0, 3); - hws[IMX8MM_CLK_GPU3D_DIV] = imx_clk_hw_divider2("gpu3d_div", "gpu3d_cg", base + 0x8180, 0, 3); - hws[IMX8MM_CLK_GPU2D_DIV] = imx_clk_hw_divider2("gpu2d_div", "gpu2d_cg", base + 0x8200, 0, 3); + + hws[IMX8MM_CLK_M4_DIV] = imx8m_clk_hw_core_composite("arm_m4_div", imx8mm_m4_sels, base + 0x8080); + hws[IMX8MM_CLK_VPU_DIV] = imx8m_clk_hw_core_composite("vpu_div", imx8mm_vpu_sels, base + 0x8100); + hws[IMX8MM_CLK_GPU3D_DIV] = imx8m_clk_hw_core_composite("gpu3d_div", imx8mm_gpu3d_sels, base + 0x8180); + hws[IMX8MM_CLK_GPU2D_DIV] = imx8m_clk_hw_core_composite("gpu2d_div", imx8mm_gpu2d_sels, base + 0x8200); /* BUS */ hws[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mm_main_axi_sels, base + 0x8800); From patchwork Thu Jan 9 09:52:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11325369 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BABF61580 for ; Thu, 9 Jan 2020 09:52:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F1722077B for ; Thu, 9 Jan 2020 09:52:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="DtspO91a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729928AbgAIJwQ (ORCPT ); Thu, 9 Jan 2020 04:52:16 -0500 Received: from mail-eopbgr140054.outbound.protection.outlook.com ([40.107.14.54]:27970 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729911AbgAIJwP (ORCPT ); Thu, 9 Jan 2020 04:52:15 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V93RTlWNOMOkbbnD68ndWVz5G/IoA8/944HEo2xVZ+qYL5J01mK6miORiYi8jTcwyQvAijSSCUy/nJdf+NktiUctuHL7uViyyY76Cff35Ux+I3aAWS1U7+hC/2VFeG6cFZSBePrKTp6xWiGQ53SZvwXetONqtV+sjgsxPMsG8wIVw3+/+ZyoYzkRMXzZsVm5yn8pKi9SrTkco9bPrAnZFO2tKyDe6A/IUuJQ6s2sh8Ah486CEQyFCt+GpQLpqwQF2aJOs+ebogvc6e+/zU5munmXuLIeLiUlGb++HwDwODYHXp7Mpagc/u5nrTxVCJseA7U4/9PFJBRKXAYoT/n7ew== 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=WGkeqFi7mk6RIvg2cExnLIPeqBYwBqHWVfAtZps9++4=; b=k/I9WZAy/L9buRmy8jq2tgqWoRxyaoUKQmcAF219+/9KjLROUkjI8xaB7BYsBACcM7ykwva849gSEsreo2VuqKjGJBOAecE1EOxXnzav4UJJIKwDsv03L7cJVdoCd1Dd7gM+ZjHU8tFv/JRnr+d/hoJeSzpITRInSGmsf0u1CaqfpWeQxb6HJzftWEOF+USugAZz9C39nHRiJIlvCqWWiuezG05k5W/agIus9XKcLLCI4q+rfoJYhwE/G5D2em4pmT6+4Xb3LBM/+udG+idB8+6tG95OvWHmuWN2s8nHGBzCk73j7TAz0XvAbn+ccviRKW5kVlDde9lNPK/GfiIxZg== 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=WGkeqFi7mk6RIvg2cExnLIPeqBYwBqHWVfAtZps9++4=; b=DtspO91aL6wmzD0rtBuWs6L0pDYm9k763t3qnfD/CnB2cMrdwfLUYqAOqx+9kDt7hVD63wbMVCBPquBK9D06+0dWb/ND/Oxiu2D4BStyeLQAq6HLKg+QQ5jthyEV0GThCjzOq3v2SZvPWAVYFgnRh3p6pEfxgm0OxorXLl5DyVI= Received: from VI1PR04MB4496.eurprd04.prod.outlook.com (20.177.54.92) by VI1PR04MB6878.eurprd04.prod.outlook.com (52.133.244.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.10; Thu, 9 Jan 2020 09:52:11 +0000 Received: from VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b]) by VI1PR04MB4496.eurprd04.prod.outlook.com ([fe80::25c7:9207:684a:5e2b%6]) with mapi id 15.20.2623.010; Thu, 9 Jan 2020 09:52:11 +0000 Received: from localhost.localdomain (119.31.174.67) by HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2602.12 via Frontend Transport; Thu, 9 Jan 2020 09:52:07 +0000 From: Peng Fan To: "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "festevam@gmail.com" , Abel Vesa , Leonard Crestez CC: "kernel@pengutronix.de" , dl-linux-imx , Aisheng Dong , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anson Huang , Jacky Bai , Peng Fan Subject: [PATCH 4/4] clk: imx: imx8mn: use imx8m_clk_hw_core_composite Thread-Topic: [PATCH 4/4] clk: imx: imx8mn: use imx8m_clk_hw_core_composite Thread-Index: AQHVxtJ2jGNwG3tWe02xw/BwGaR/Ug== Date: Thu, 9 Jan 2020 09:52:11 +0000 Message-ID: <1578563269-32710-5-git-send-email-peng.fan@nxp.com> References: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> In-Reply-To: <1578563269-32710-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) To VI1PR04MB4496.eurprd04.prod.outlook.com (2603:10a6:803:69::28) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.67] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 51f01f3b-ddd8-4f5e-2f4c-08d794e9993b x-ms-traffictypediagnostic: VI1PR04MB6878:|VI1PR04MB6878: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:361; x-forefront-prvs: 02778BF158 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(396003)(136003)(376002)(366004)(346002)(39860400002)(189003)(199004)(6486002)(26005)(4326008)(54906003)(69590400006)(36756003)(6636002)(71200400001)(6506007)(110136005)(52116002)(478600001)(8936002)(6512007)(316002)(16526019)(186003)(86362001)(6666004)(2616005)(956004)(44832011)(66946007)(66556008)(5660300002)(66446008)(64756008)(2906002)(8676002)(81166006)(66476007)(81156014)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6878;H:VI1PR04MB4496.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: ZgMmmolOwLDu4R1Dtg7E3dlhV8O5W1pUhTmqBhIzzYPwUMS/hv1Yes1AsxYPm18pLADu1K15Uzv4X1UVVbNM+GNAQvaw6pm5PDjIf+Owh3HdBNxG7YdrPm/WVUyNOR1S+lCaeQbwqf0P0eSGYPFRv8Cv+fwzMhzbpkaMbKo2cSpz8ULT14vCdEj/g6iXz/JIoguV7cXKe6OTx6Xjf1+pkfQRPnuPakwuH3e/3sqeaRuMe+FYPofjRslU65yZmicb/JSU3p0HKyWQFNkzkNHpIEiUaPw78dDNJC8LHEUe58iEIXc8eaM+PgnPC7333+1Pc0BMxY5vixRn8Q7FD68/sXZGC3EY6A7CnrHB7NUZA1ieCqA+SeIf4WglmCdACl7oGWTXpCFowioP+UrILahg2/N6FBWihFWYd+A9iFbRRxRvjYxr8WQXCs6YaypLQq/Xg1cN7K3adEdg60y6y25nIIIeQasRNuGt3v6ZZGI4bRL1BjGlCC7tSwWkB8dHftQFXQrOVTHdxxzVdGv1UQugHg== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51f01f3b-ddd8-4f5e-2f4c-08d794e9993b X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2020 09:52:11.7436 (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: NG7xcg4xVZT4cDIVmt3xg7jJwpdg/J9DXSM10qaQ2V+tx9+06G9xM43eYTIxl63fwCeBeDpi+jDapHBaiZy0sA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6878 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan Use imx8m_clk_hw_core_composite to simplify code. Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx8mn.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index e4710d3cf3e0..3737aca5fb02 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -413,15 +413,11 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) /* CORE */ hws[IMX8MN_CLK_A53_SRC] = imx_clk_hw_mux2("arm_a53_src", base + 0x8000, 24, 3, imx8mn_a53_sels, ARRAY_SIZE(imx8mn_a53_sels)); - hws[IMX8MN_CLK_GPU_CORE_SRC] = imx_clk_hw_mux2("gpu_core_src", base + 0x8180, 24, 3, imx8mn_gpu_core_sels, ARRAY_SIZE(imx8mn_gpu_core_sels)); - hws[IMX8MN_CLK_GPU_SHADER_SRC] = imx_clk_hw_mux2("gpu_shader_src", base + 0x8200, 24, 3, imx8mn_gpu_shader_sels, ARRAY_SIZE(imx8mn_gpu_shader_sels)); hws[IMX8MN_CLK_A53_CG] = imx_clk_hw_gate3("arm_a53_cg", "arm_a53_src", base + 0x8000, 28); - hws[IMX8MN_CLK_GPU_CORE_CG] = imx_clk_hw_gate3("gpu_core_cg", "gpu_core_src", base + 0x8180, 28); - hws[IMX8MN_CLK_GPU_SHADER_CG] = imx_clk_hw_gate3("gpu_shader_cg", "gpu_shader_src", base + 0x8200, 28); - hws[IMX8MN_CLK_A53_DIV] = imx_clk_hw_divider2("arm_a53_div", "arm_a53_cg", base + 0x8000, 0, 3); - hws[IMX8MN_CLK_GPU_CORE_DIV] = imx_clk_hw_divider2("gpu_core_div", "gpu_core_cg", base + 0x8180, 0, 3); - hws[IMX8MN_CLK_GPU_SHADER_DIV] = imx_clk_hw_divider2("gpu_shader_div", "gpu_shader_cg", base + 0x8200, 0, 3); + + hws[IMX8MN_CLK_GPU_CORE_DIV] = imx8m_clk_hw_core_composite("gpu_core_div", imx8mn_gpu_core_sels, base + 0x8180); + hws[IMX8MN_CLK_GPU_SHADER_DIV] = imx8m_clk_hw_core_composite("gpu_shader_div", imx8mn_gpu_shader_sels, base + 0x8200); /* BUS */ hws[IMX8MN_CLK_MAIN_AXI] = imx8m_clk_hw_composite_critical("main_axi", imx8mn_main_axi_sels, base + 0x8800);