From patchwork Wed Sep 9 20:44:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne X-Patchwork-Id: 11766239 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 C4192112E for ; Wed, 9 Sep 2020 20:48:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 8519421D46 for ; Wed, 9 Sep 2020 20:48:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3VLoeL83"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="BtCLWo03" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8519421D46 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+orC6uB9t4Y3r7/6omXGr1jsO6Y0EZ8IdZePfYGADfs=; b=3VLoeL83A77bMJ8qImm59Nt7O CboRCR//WG5Pya5GrbMRKe6PNQRjkDc+zt7OnkyxgcVlvcWsQTgxAWu7ud4R2V0Y2QPi0EBKNMYgo v+zj7SEe3kDg0n7CM2u6XuM44xv3w6ak2ytPGc/N4/6ziGQENia3Eyn0l8I2ViLcIuiEZVq9YdDlh c9y3LZZ555MVtT+9tJB99Sbr/GYMOFJGeCyMCDGDT68RnhR9yoeuWrVF3iVeNnDdu1aJyHpTxT6+m OHrduxHAAdfO/1HQb2CBQWqcYhSNwyf3yZC1VoWg6/UAOUPZx422nzncAqHOPidgUdixIJEq2blfN JKAHFzJqA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG6z9-0007e7-D1; Wed, 09 Sep 2020 20:46:31 +0000 Received: from mail-dm6nam12on2073.outbound.protection.outlook.com ([40.107.243.73] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG6xn-0006yT-24 for linux-arm-kernel@lists.infradead.org; Wed, 09 Sep 2020 20:45:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ra7A1eTiLuj30iXnFbEZsut9H3lH/ZPpTUIPX+g1wu81/xFU1gMSFnPwSFDYke8epeo1uBm5HVClz7UWmIYGAs8nc72u1trwnCIacR7lnEbBGwTJIuhfIhFBipk7+9WMZmciMbDqcx6ltJLRgCMXSPiw6gFq+yHRf+cQeKNYj5PsCe4XwW0D/Ic6NYuU0zVeDyrlexZf1FIMLNaArFZQzrPMRv/MltdQnldHZ/DKEhbFrzon9xESjgguJ0ioP+ni1RgeXGbv+I7XAKh/CcaX82XOTDfKxJLy3KrT/Jbid8MCQ88QAlXXsSSdjl6mblFXMOylb7ToM4iWFELuwlxfnQ== 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=XM1VryKH+n0t0tM5vUbDmaqbzjNnNhJztsFboYXue8s=; b=g3mVFTXaIkyXpXOFhOouNRhpzV+Gs2KAODhwTJLLdjn/i0ZUDnkMre7/3+/uoYMKxK/9i9Hy2t0wH5FEIWuqgUCJghiCdh11tQKk90bl69Jya1L6eSfwXoIiyPuGyVEsxKIt6yYWu6DRlliQGbEqtHAbKFnA0wO+xBvdg+Umz+zAAeKfUmP7mrWX7WX1OJ8W+XxH1fxqAE1feCRUdqi8mN/twxUspYL+TJG+4Qs8025MQqFV6XBqcRm7nGLH8tZPiC4ACXQ6m5RqAhV4E6zoc0c4N+S2eso7jE8IiSOaM21leo1ubuurinrNmamcM9qoxQI9QREQXtfZdQDzewhabQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XM1VryKH+n0t0tM5vUbDmaqbzjNnNhJztsFboYXue8s=; b=BtCLWo03HsqJBgy1GdHskfFphZ/HRdtovAi6X9YqJJX9dsBFV/NJRNKVtAE2Y9jZX2gVG3SxuokBNyXYEY06akFrbsPQtYaUURED7+8LNwww0XjdCLUdmUTmjiZihwfOuy5jMY0yUKNbOM6fEjLR2yLUPIQFCxzLKLXAzJfC8j4= Received: from CY4PR16CA0030.namprd16.prod.outlook.com (2603:10b6:910:60::17) by SN6PR02MB5102.namprd02.prod.outlook.com (2603:10b6:805:67::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Wed, 9 Sep 2020 20:45:00 +0000 Received: from CY1NAM02FT053.eop-nam02.prod.protection.outlook.com (2603:10b6:910:60:cafe::ce) by CY4PR16CA0030.outlook.office365.com (2603:10b6:910:60::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 20:45:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT053.mail.protection.outlook.com (10.152.74.165) with Microsoft SMTP Server id 15.20.3348.17 via Frontend Transport; Wed, 9 Sep 2020 20:45:00 +0000 Received: from [149.199.38.66] (port=53384 helo=smtp.xilinx.com) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1kG6xP-0001xR-Ko; Wed, 09 Sep 2020 13:44:43 -0700 Received: from [127.0.0.1] (helo=localhost) by smtp.xilinx.com with smtp (Exim 4.63) (envelope-from ) id 1kG6xf-0007dx-S3; Wed, 09 Sep 2020 13:44:59 -0700 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 089KisL3028426; Wed, 9 Sep 2020 13:44:54 -0700 Received: from [10.18.5.8] (helo=xsjamitsuni51.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1kG6xa-0007dJ-8c; Wed, 09 Sep 2020 13:44:54 -0700 From: Amit Sunil Dhamne To: mturquette@baylibre.com, m.tretter@pengutronix.de, sboyd@kernel.org, michal.simek@xilinx.com, mark.rutland@arm.com, linux-clk@vger.kernel.org Subject: [PATCH v4 1/3] clk: zynqmp: Use firmware specific common clock flags Date: Wed, 9 Sep 2020 13:44:46 -0700 Message-Id: <1599684288-20917-2-git-send-email-amit.sunil.dhamne@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599684288-20917-1-git-send-email-amit.sunil.dhamne@xilinx.com> References: <1599684288-20917-1-git-send-email-amit.sunil.dhamne@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e125bc2e-b1e0-4412-f211-08d855013851 X-MS-TrafficTypeDiagnostic: SN6PR02MB5102: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AfVf3X437snjZa9K9lFyms4EQ+wqsnRBB02FJj67P1RsX++oYFokukzmhhlqujUqLFWtqZqFs1JQ00ECpb1bMpMM5JRvbw6O7MilNWuLRk+R6gIi0+G7boI4P8vcQjdAoLS6zDPp09oQQBPfuUPUV4tvgKQTW8n1moYC8vG9K+XEtptA3Vn43qs7Zmz7Iltzeihokomq9/ihtjvu4/E4Bm24LJ8DfTWII3PRleYxOihS4t8aC3g3Jt2bZ/8/NJtJUVLSvYGi9D8uRHwlc99RLrKAP7C+mf0LOuwilOjHoOE81hVjDKT+OAEevjM/ak7nmZN6e7l3DO/2CxjqnLc8uwmP7mey6wVJHAu8r+fF6aB6MTAiakYV9DKO8wEpsneQlFSoxyZxW3zYCrE88A8foQ== X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFS:(136003)(376002)(39860400002)(396003)(346002)(46966005)(6666004)(9786002)(70586007)(5660300002)(82310400003)(7696005)(316002)(54906003)(2906002)(26005)(36756003)(8676002)(186003)(70206006)(2616005)(478600001)(426003)(47076004)(81166007)(82740400003)(107886003)(356005)(336012)(4326008)(8936002)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 20:45:00.1057 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e125bc2e-b1e0-4412-f211-08d855013851 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT053.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB5102 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_164507_276034_21DC9D3A X-CRM114-Status: GOOD ( 17.27 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.243.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.243.73 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tejas Patel , Amit Sunil Dhamne , Rajan Vaja , tejasp@xilinx.com, linux-kernel@vger.kernel.org, jollys@xilinx.com, rajanv@xilinx.com, 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 From: Rajan Vaja Currently firmware passes CCF specific flags to ZynqMP clock driver. So firmware needs to be updated if CCF flags are changed. The firmware should have its own 'flag number space' that is distinct from the common clk framework's 'flag number space'. So define and use ZynqMP specific common clock flags instead of using CCF flags. Signed-off-by: Rajan Vaja Signed-off-by: Tejas Patel Signed-off-by: Amit Sunil Dhamne --- drivers/clk/zynqmp/clk-gate-zynqmp.c | 4 +++- drivers/clk/zynqmp/clk-mux-zynqmp.c | 4 +++- drivers/clk/zynqmp/clk-zynqmp.h | 24 ++++++++++++++++++++++++ drivers/clk/zynqmp/clkc.c | 33 ++++++++++++++++++++++++++++++++- drivers/clk/zynqmp/divider.c | 5 +++-- drivers/clk/zynqmp/pll.c | 4 +++- 6 files changed, 68 insertions(+), 6 deletions(-) -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/drivers/clk/zynqmp/clk-gate-zynqmp.c b/drivers/clk/zynqmp/clk-gate-zynqmp.c index 10c9b88..695feaa 100644 --- a/drivers/clk/zynqmp/clk-gate-zynqmp.c +++ b/drivers/clk/zynqmp/clk-gate-zynqmp.c @@ -121,7 +121,9 @@ struct clk_hw *zynqmp_clk_register_gate(const char *name, u32 clk_id, init.name = name; init.ops = &zynqmp_clk_gate_ops; - init.flags = nodes->flag; + + init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag); + init.parent_names = parents; init.num_parents = 1; diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c index 0619414..a49b1c5 100644 --- a/drivers/clk/zynqmp/clk-mux-zynqmp.c +++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c @@ -120,7 +120,9 @@ struct clk_hw *zynqmp_clk_register_mux(const char *name, u32 clk_id, init.ops = &zynqmp_clk_mux_ro_ops; else init.ops = &zynqmp_clk_mux_ops; - init.flags = nodes->flag; + + init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag); + init.parent_names = parents; init.num_parents = num_parents; mux->flags = nodes->type_flag; diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h index 5beeb41..974d3da 100644 --- a/drivers/clk/zynqmp/clk-zynqmp.h +++ b/drivers/clk/zynqmp/clk-zynqmp.h @@ -10,6 +10,28 @@ #include +/* Common Flags */ +/* must be gated across rate change */ +#define ZYNQMP_CLK_SET_RATE_GATE BIT(0) +/* must be gated across re-parent */ +#define ZYNQMP_CLK_SET_PARENT_GATE BIT(1) +/* propagate rate change up one level */ +#define ZYNQMP_CLK_SET_RATE_PARENT BIT(2) +/* do not gate even if unused */ +#define ZYNQMP_CLK_IGNORE_UNUSED BIT(3) +/* do not use the cached clk rate */ +#define ZYNQMP_CLK_GET_RATE_NOCACHE BIT(6) +/* don't re-parent on rate change */ +#define ZYNQMP_CLK_SET_RATE_NO_REPARENT BIT(7) +/* do not use the cached clk accuracy */ +#define ZYNQMP_CLK_GET_ACCURACY_NOCACHE BIT(8) +/* recalc rates after notifications */ +#define ZYNQMP_CLK_RECALC_NEW_RATES BIT(9) +/* clock needs to run to set rate */ +#define ZYNQMP_CLK_SET_RATE_UNGATE BIT(10) +/* do not gate, ever */ +#define ZYNQMP_CLK_IS_CRITICAL BIT(11) + enum topology_type { TYPE_INVALID, TYPE_MUX, @@ -33,6 +55,8 @@ struct clock_topology { u8 custom_type_flag; }; +unsigned long zynqmp_clk_map_common_ccf_flags(const u32 zynqmp_flag); + struct clk_hw *zynqmp_clk_register_pll(const char *name, u32 clk_id, const char * const *parents, u8 num_parents, diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c index db8d0d7..af06a19 100644 --- a/drivers/clk/zynqmp/clkc.c +++ b/drivers/clk/zynqmp/clkc.c @@ -271,6 +271,34 @@ static int zynqmp_pm_clock_get_topology(u32 clock_id, u32 index, return ret; } +unsigned long zynqmp_clk_map_common_ccf_flags(const u32 zynqmp_flag) +{ + unsigned long ccf_flag = 0; + + if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_GATE) + ccf_flag |= CLK_SET_RATE_GATE; + if (zynqmp_flag & ZYNQMP_CLK_SET_PARENT_GATE) + ccf_flag |= CLK_SET_PARENT_GATE; + if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_PARENT) + ccf_flag |= CLK_SET_RATE_PARENT; + if (zynqmp_flag & ZYNQMP_CLK_IGNORE_UNUSED) + ccf_flag |= CLK_IGNORE_UNUSED; + if (zynqmp_flag & ZYNQMP_CLK_GET_RATE_NOCACHE) + ccf_flag |= CLK_GET_RATE_NOCACHE; + if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_NO_REPARENT) + ccf_flag |= CLK_SET_RATE_NO_REPARENT; + if (zynqmp_flag & ZYNQMP_CLK_GET_ACCURACY_NOCACHE) + ccf_flag |= CLK_GET_ACCURACY_NOCACHE; + if (zynqmp_flag & ZYNQMP_CLK_RECALC_NEW_RATES) + ccf_flag |= CLK_RECALC_NEW_RATES; + if (zynqmp_flag & ZYNQMP_CLK_SET_RATE_UNGATE) + ccf_flag |= CLK_SET_RATE_UNGATE; + if (zynqmp_flag & ZYNQMP_CLK_IS_CRITICAL) + ccf_flag |= CLK_IS_CRITICAL; + + return ccf_flag; +} + /** * zynqmp_clk_register_fixed_factor() - Register fixed factor with the * clock framework @@ -292,6 +320,7 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id, struct zynqmp_pm_query_data qdata = {0}; u32 ret_payload[PAYLOAD_ARG_CNT]; int ret; + unsigned long flag; qdata.qid = PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS; qdata.arg1 = clk_id; @@ -303,9 +332,11 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id, mult = ret_payload[1]; div = ret_payload[2]; + flag = zynqmp_clk_map_common_ccf_flags(nodes->flag); + hw = clk_hw_register_fixed_factor(NULL, name, parents[0], - nodes->flag, mult, + flag, mult, div); return hw; diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c index 66da02b..775d54f 100644 --- a/drivers/clk/zynqmp/divider.c +++ b/drivers/clk/zynqmp/divider.c @@ -311,8 +311,9 @@ struct clk_hw *zynqmp_clk_register_divider(const char *name, init.name = name; init.ops = &zynqmp_clk_divider_ops; - /* CLK_FRAC is not defined in the common clk framework */ - init.flags = nodes->flag & ~CLK_FRAC; + + init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag); + init.parent_names = parents; init.num_parents = 1; diff --git a/drivers/clk/zynqmp/pll.c b/drivers/clk/zynqmp/pll.c index 92f449e..d188924 100644 --- a/drivers/clk/zynqmp/pll.c +++ b/drivers/clk/zynqmp/pll.c @@ -302,7 +302,9 @@ struct clk_hw *zynqmp_clk_register_pll(const char *name, u32 clk_id, init.name = name; init.ops = &zynqmp_pll_ops; - init.flags = nodes->flag; + + init.flags = zynqmp_clk_map_common_ccf_flags(nodes->flag); + init.parent_names = parents; init.num_parents = 1; From patchwork Wed Sep 9 20:44:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne X-Patchwork-Id: 11766225 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 774E9618 for ; Wed, 9 Sep 2020 20:46:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 45C0321D43 for ; Wed, 9 Sep 2020 20:46:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UOQ5031x"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="ps2w1NuK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45C0321D43 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2h5WmKGR5MoLJu6shM0IH9X22zgEvUZthTMtAVCgpAw=; b=UOQ5031xyz8cMMCQpefzXoCN8 ejPu60sw71Dj517c8kiBjEX0KM8ZCgZdJzJAjhCNwgCk82Vl4gsOagf506E09z5dULxmxpU+mpvlq VreXTWC0NAe/a9RN8TTPM9gXK21JhTcCcAj8oqlMGhVfQWsTnjoG4H+5g6RjR34Q0S7fH3KVBaPd2 BH398QERN48/cChwVRdtEE8F31cpmHa4ID0kYYuG5Epjb5GIc9XEwlWr6BiX62YT6zdjqef+CC4rw LL9EObB60rJJfhuPzgceRc+7KG/jOU/XH/jShdOolpsWYycrjNaXX/Qu3newJoRq3ayNObsC3Dv9f JseVF3mdA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG6yh-0007Im-1l; Wed, 09 Sep 2020 20:46:03 +0000 Received: from mail-dm6nam12on2053.outbound.protection.outlook.com ([40.107.243.53] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG6xl-0006xs-Pd for linux-arm-kernel@lists.infradead.org; Wed, 09 Sep 2020 20:45:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drmc2TKIEScpMMy6ZcX/PpIJBlTAE/kdHNBS+DCwjvC++6Gqcr9DCuhwzg1YkhiErkEgA954eNbZfli53S1OSXIaWToW1iDd7r6gWtXV5kGdkJD9oHDyyqG7hZU1Pry2Qu2q0WYFJNcEgrTDNdRHci3W1DR+jJkn5MxjYY6/VEANvYVxlEqSlkr1XTV/b/IWhtWZtQvWFaKhpBuOQOelxRsMFGv+cowHfYX63d1cQqvLUsBYkvtQ0WSFVMF6kuCtsP3WH/zOjQ5OU/P87Aux/QZxwup+RtJhQvp5lhCGrsEZBVUIZrfSR7B2t8zKzuhludgvD6FuQ3chC9nwufvhNw== 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=H/Dk7N+byDPchs8YFviZueMQRM37HPoXqKBbno3ylho=; b=CUo3s6V4aL5+3jN4PYhSY/YpMxbzOG8LPrz8X0Lnuj0u1H2RCBgTvIJQNH5ojzcGaLaCoOTRKs/XFWcgKg/v2GD570/vPukX8AN5TrU4veWXzeGfCSQo8GJOPR10Du0yP+SZSNU/xVb+FyLBZUxKuPIe+hlD99P0qf0ImzHZe9/4KSbVA53vBYBbpw4eueYptt4j3BScGzSeXqSqEGcEc1+nX/+NQgf0hk6o8jjQH7cDTc8geDa2uCB7CbXGlHvCAw9iJ8WQtZgXCrUyO0G7qZ3qjP/b76ttFRuNVc6Y6YfisiF7Jwvm3OSE7ZkE6aibSgMr3QcfLExBVF4rsymS2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H/Dk7N+byDPchs8YFviZueMQRM37HPoXqKBbno3ylho=; b=ps2w1NuK9d9SQwiLAEWvA80qiePjGySpd+PcXA+0bEL5ERKteMKInEpYlInTLiSYuQLdOxpxVYKUxOB3ZuxG3Ys342ozvoDxkbG3EoWz/l4GgdryRGiwRk8cFf5+IaX2KGL/5R5LzyhhwRfiVuAvBb/6gBY7BHisocK0Pqfweww= Received: from CY4PR12CA0028.namprd12.prod.outlook.com (2603:10b6:903:129::14) by SN6PR02MB4782.namprd02.prod.outlook.com (2603:10b6:805:90::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Wed, 9 Sep 2020 20:45:00 +0000 Received: from CY1NAM02FT006.eop-nam02.prod.protection.outlook.com (2603:10b6:903:129:cafe::58) by CY4PR12CA0028.outlook.office365.com (2603:10b6:903:129::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 20:45:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT006.mail.protection.outlook.com (10.152.74.104) with Microsoft SMTP Server id 15.20.3348.17 via Frontend Transport; Wed, 9 Sep 2020 20:45:00 +0000 Received: from [149.199.38.66] (port=53394 helo=smtp.xilinx.com) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1kG6xP-0001xa-PC; Wed, 09 Sep 2020 13:44:43 -0700 Received: from [127.0.0.1] (helo=localhost) by smtp.xilinx.com with smtp (Exim 4.63) (envelope-from ) id 1kG6xg-0007dx-0K; Wed, 09 Sep 2020 13:45:00 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 089Kis3C028428; Wed, 9 Sep 2020 13:44:54 -0700 Received: from [10.18.5.8] (helo=xsjamitsuni51.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1kG6xa-0007dJ-AZ; Wed, 09 Sep 2020 13:44:54 -0700 From: Amit Sunil Dhamne To: mturquette@baylibre.com, m.tretter@pengutronix.de, sboyd@kernel.org, michal.simek@xilinx.com, mark.rutland@arm.com, linux-clk@vger.kernel.org Subject: [PATCH v4 2/3] clk: zynqmp: Use firmware specific divider clock flags Date: Wed, 9 Sep 2020 13:44:47 -0700 Message-Id: <1599684288-20917-3-git-send-email-amit.sunil.dhamne@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599684288-20917-1-git-send-email-amit.sunil.dhamne@xilinx.com> References: <1599684288-20917-1-git-send-email-amit.sunil.dhamne@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0aac3241-ddcf-4962-4747-08d855013865 X-MS-TrafficTypeDiagnostic: SN6PR02MB4782: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:873; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NBcse43MaSUrEA+6mtSSDayxsA9nekKXdx9k84NTbqGq+ixLxxcs7N/cftGyhRkgOxxMnWue9P83cf4BBqV3TuV9lCRaXgvR6kdbrRfouUXIGUekcKjleo5N8WlfEGPB3yA6iRoc03IJiJu4SmhfyhDJfNLCBnlw+6avbPc9iI9or+J8iMqp7aQxLtWYWO9oz6MjMcSKUZV6qy31wx4+X/k6fkowpzqeUJCSNvFNpu7KnSgVwV+yAnpO2fNTSjXtrI1ucMkGKEbomFDImpQ2i662aqo/d+1eOaBNJob6kwiIsUlsQBgzrSp/8bS6QxRy2tOt6MN1hd+E2jpxjpyt1mkUOauOfSGwuM0YRb2irQa/IVfmyMfwp/c9lLHkeov+UoqtQerh6nZe9wBbG8+Z4Q== X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFS:(396003)(136003)(39860400002)(376002)(346002)(46966005)(316002)(2906002)(336012)(7696005)(26005)(8676002)(2616005)(426003)(9786002)(81166007)(82740400003)(5660300002)(478600001)(107886003)(47076004)(83380400001)(356005)(4326008)(8936002)(36756003)(82310400003)(186003)(70586007)(6666004)(70206006)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 20:45:00.2324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0aac3241-ddcf-4962-4747-08d855013865 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT006.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB4782 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_164506_030384_C9143F36 X-CRM114-Status: GOOD ( 14.00 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.243.53 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.243.53 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tejas Patel , Amit Sunil Dhamne , Rajan Vaja , tejasp@xilinx.com, linux-kernel@vger.kernel.org, jollys@xilinx.com, rajanv@xilinx.com, 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 From: Rajan Vaja Use ZynqMP specific divider clock flags instead of using CCF flags. Signed-off-by: Rajan Vaja Signed-off-by: Tejas Patel Signed-off-by: Amit Sunil Dhamne --- drivers/clk/zynqmp/clk-zynqmp.h | 9 +++++++++ drivers/clk/zynqmp/divider.c | 25 ++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h index 974d3da..9b2ff35e 100644 --- a/drivers/clk/zynqmp/clk-zynqmp.h +++ b/drivers/clk/zynqmp/clk-zynqmp.h @@ -32,6 +32,15 @@ /* do not gate, ever */ #define ZYNQMP_CLK_IS_CRITICAL BIT(11) +/* Type Flags for divider clock */ +#define ZYNQMP_CLK_DIVIDER_ONE_BASED BIT(0) +#define ZYNQMP_CLK_DIVIDER_POWER_OF_TWO BIT(1) +#define ZYNQMP_CLK_DIVIDER_ALLOW_ZERO BIT(2) +#define ZYNQMP_CLK_DIVIDER_HIWORD_MASK BIT(3) +#define ZYNQMP_CLK_DIVIDER_ROUND_CLOSEST BIT(4) +#define ZYNQMP_CLK_DIVIDER_READ_ONLY BIT(5) +#define ZYNQMP_CLK_DIVIDER_MAX_AT_ZERO BIT(6) + enum topology_type { TYPE_INVALID, TYPE_MUX, diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c index 775d54f..14adba0 100644 --- a/drivers/clk/zynqmp/divider.c +++ b/drivers/clk/zynqmp/divider.c @@ -283,6 +283,29 @@ static u32 zynqmp_clk_get_max_divisor(u32 clk_id, u32 type) return ret_payload[1]; } +static inline unsigned long zynqmp_clk_map_divider_ccf_flags( + const u32 zynqmp_type_flag) +{ + unsigned long ccf_flag = 0; + + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_ONE_BASED) + ccf_flag |= CLK_DIVIDER_ONE_BASED; + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_POWER_OF_TWO) + ccf_flag |= CLK_DIVIDER_POWER_OF_TWO; + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_ALLOW_ZERO) + ccf_flag |= CLK_DIVIDER_ALLOW_ZERO; + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_POWER_OF_TWO) + ccf_flag |= CLK_DIVIDER_HIWORD_MASK; + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_ROUND_CLOSEST) + ccf_flag |= CLK_DIVIDER_ROUND_CLOSEST; + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_READ_ONLY) + ccf_flag |= CLK_DIVIDER_READ_ONLY; + if (zynqmp_type_flag & ZYNQMP_CLK_DIVIDER_MAX_AT_ZERO) + ccf_flag |= CLK_DIVIDER_MAX_AT_ZERO; + + return ccf_flag; +} + /** * zynqmp_clk_register_divider() - Register a divider clock * @name: Name of this clock @@ -320,7 +343,7 @@ struct clk_hw *zynqmp_clk_register_divider(const char *name, /* struct clk_divider assignments */ div->is_frac = !!((nodes->flag & CLK_FRAC) | (nodes->custom_type_flag & CUSTOM_FLAG_CLK_FRAC)); - div->flags = nodes->type_flag; + div->flags = zynqmp_clk_map_divider_ccf_flags(nodes->type_flag); div->hw.init = &init; div->clk_id = clk_id; div->div_type = nodes->type; From patchwork Wed Sep 9 20:44:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne X-Patchwork-Id: 11766231 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 3FBEE112E for ; Wed, 9 Sep 2020 20:46:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 12F54206C9 for ; Wed, 9 Sep 2020 20:46:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="phCd535V"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="a3QwWiSZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12F54206C9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FC9pQL6aYvWglDc0j+xMMtSxd/UZh8lhLcwmLPOHRIc=; b=phCd535VTYvCDVwPGgs3+BfKp 0W9smGjolIAieuY0j6dSUl1FuAvek4p14b/iDOMFKDvrooKKG7Q638Lbd3daeNOocTR+LR44txEub Gu9vYbbTFoZ/9fF+54Nsz1sZYbmVG78N1qzRdEInzFT3EwdOZKqyPbllAIfXZNnUE8mcTWUvoCGC0 xh6a25JYczZnX6tm73dB6W2F5KHSagpalOO8eGV5mHV7TlEsvrwnc8Ubres97ybxiYuyvcqe/xUUf U8/eilFxIn6GSZnTopvC4omM+q4VZLg0b3wSpU/MwMgJGbvvUmlJzfQz+/zA4+iLQWL3Ty4m43GT2 eQ29l8L8w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG6yt-0007W2-RQ; Wed, 09 Sep 2020 20:46:15 +0000 Received: from mail-mw2nam10on2077.outbound.protection.outlook.com ([40.107.94.77] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG6xl-0006zA-Vo for linux-arm-kernel@lists.infradead.org; Wed, 09 Sep 2020 20:45:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X8aI0AeZyNTpLM71m85C71Q6EcboDOhBCdwIXtW6xncEATeZtNCEn0uCuiW3vzeT0gqNlsGK6cwxinSiORIVGP78S7opL+eWLs8uqTG3FIEZkZ25MJ4LzOdY84ghYJSieatQKdKWnUV4daHpjKTGchoYwdZMd3kCXPvS7yIS+3L4Yh0cZK9ScKQYylMlbxfPQHDoOBvElbP9xv6AkZydfIYex4G1eppVrP6S+iw4lBFRrghvt66Iw1Adn7AGrF+kKzkBA7jdrkYVin30/fPg6+IpUXcGXPp4MbLoNCGN+bcn2l5RXz/J7NdWfvoGlbPOvl0ntxY7rM1nCgOrym55OQ== 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=x+2KOMwY5wmlKbRnYeS1i3/CewJ6egRkFbSWXAdbvWg=; b=U+zqj5bxoshgimCswGQYCAWNxICdRUirpM0vg8KfN6V9NAl9lM5ZRSi4ZhOu0nJrJZZ5eO5yufyOVWbBaYvH/41PpPWwEGOU0AzvwR/kGIpWBp718pU8sM0+h21GvxPrzlsrTLiLjCx3DqYRrXbvC9zwFb3RwvbmneR/Ei2oiiLC4ALxLmXoI5hjP64568ZJNnoCQTFgAX7L3L/2gTrC+S2xJCOoKDyMdJEehCXZKOQ82Wy3fJ2VRYkPc1Cc3C69Ffx1ZkxD/+KBIo9sqQiKvRAaXf5rL79y6kVgsbkM67MCIpIHxGg0cUy4+y2No77u0y7lyv2n63ja7D2SkTqcoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x+2KOMwY5wmlKbRnYeS1i3/CewJ6egRkFbSWXAdbvWg=; b=a3QwWiSZZa0vVJUulOLVOux6o3cwJbXTDJ5pe70FzwFZ7DTGkPk72Kt1mKBOQCFP6qlc/lDc59NgAzePPKmFteeSMyjoSbUoYoOYjCdDFM/fO0T7Ls5AQeD5spXNjldiMru33S2urFdROcxwSIn1q/HjCg23hb5o9FJl9PbKPUA= Received: from MN2PR19CA0065.namprd19.prod.outlook.com (2603:10b6:208:19b::42) by DM5PR02MB3670.namprd02.prod.outlook.com (2603:10b6:4:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Wed, 9 Sep 2020 20:45:01 +0000 Received: from BL2NAM02FT046.eop-nam02.prod.protection.outlook.com (2603:10b6:208:19b:cafe::fd) by MN2PR19CA0065.outlook.office365.com (2603:10b6:208:19b::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 20:45:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2NAM02FT046.mail.protection.outlook.com (10.152.76.118) with Microsoft SMTP Server id 15.20.3348.17 via Frontend Transport; Wed, 9 Sep 2020 20:45:01 +0000 Received: from [149.199.38.66] (port=53391 helo=smtp.xilinx.com) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1kG6xP-0001xX-Nj; Wed, 09 Sep 2020 13:44:43 -0700 Received: from [127.0.0.1] (helo=localhost) by smtp.xilinx.com with smtp (Exim 4.63) (envelope-from ) id 1kG6xf-0007dx-V5; Wed, 09 Sep 2020 13:45:00 -0700 Received: from xsj-pvapsmtp01 (smtp-fallback.xilinx.com [149.199.38.66] (may be forged)) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 089KisMZ028430; Wed, 9 Sep 2020 13:44:54 -0700 Received: from [10.18.5.8] (helo=xsjamitsuni51.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1kG6xa-0007dJ-CQ; Wed, 09 Sep 2020 13:44:54 -0700 From: Amit Sunil Dhamne To: mturquette@baylibre.com, m.tretter@pengutronix.de, sboyd@kernel.org, michal.simek@xilinx.com, mark.rutland@arm.com, linux-clk@vger.kernel.org Subject: [PATCH v4 3/3] clk: zynqmp: Use firmware specific mux clock flags Date: Wed, 9 Sep 2020 13:44:48 -0700 Message-Id: <1599684288-20917-4-git-send-email-amit.sunil.dhamne@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599684288-20917-1-git-send-email-amit.sunil.dhamne@xilinx.com> References: <1599684288-20917-1-git-send-email-amit.sunil.dhamne@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 1c991082-c092-4d43-0d78-08d8550138dd X-MS-TrafficTypeDiagnostic: DM5PR02MB3670: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:989; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l798Zs6l7FTqI6g07g8hyEuRm7n2nkpS0zLg6jDhix4vbInwWohVgj0GbkEHxoWAXHErL98Z3n8e8/Pz/TGgTNQE1CtspvLJYatvaCM3Y4NHvEkYdF2gMBV092uYIZQ49VxZ0bKTBeegXPGJQVmGwa/WjbOVDH87obgvFDXrPEK7pOvSjJua9wZkUSBpzdM8t1N8efacGkS1VSKjYDTiWgi4e4oin51IhClyjIHIKth9HIHx+NXxse7q7lGymzBj67XiVh/HZa6NmkzjJgyBZNvgJYrLl68EVPaCygQ/eGH22TuuumGYFFLq2QO60cVL0takyrDZNF9Il7LsDRYSpI9lFp5HwM2U7MFRExGQuwBw86OIr9+0+cqnsjbXBgObI7C5F22P459iBRZIW7L0O2q2JVBfHlae2RLEU0pUdj8= X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFS:(136003)(39860400002)(346002)(376002)(396003)(46966005)(5660300002)(8936002)(70206006)(70586007)(6666004)(356005)(2906002)(7696005)(336012)(107886003)(81166007)(82740400003)(36756003)(26005)(426003)(4326008)(47076004)(186003)(2616005)(54906003)(8676002)(83380400001)(316002)(478600001)(9786002)(82310400003)(42866002); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 20:45:01.0164 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c991082-c092-4d43-0d78-08d8550138dd X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: BL2NAM02FT046.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB3670 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_164506_389510_44EE79AE X-CRM114-Status: GOOD ( 15.21 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.94.77 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.94.77 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tejas Patel , Amit Sunil Dhamne , Rajan Vaja , tejasp@xilinx.com, linux-kernel@vger.kernel.org, jollys@xilinx.com, rajanv@xilinx.com, 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 From: Rajan Vaja Use ZynqMP specific mux clock flags instead of using CCF flags. Signed-off-by: Rajan Vaja Signed-off-by: Tejas Patel Signed-off-by: Amit Sunil Dhamne --- drivers/clk/zynqmp/clk-mux-zynqmp.c | 23 ++++++++++++++++++++++- drivers/clk/zynqmp/clk-zynqmp.h | 8 ++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c index a49b1c5..4c28b4d 100644 --- a/drivers/clk/zynqmp/clk-mux-zynqmp.c +++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c @@ -90,6 +90,27 @@ static const struct clk_ops zynqmp_clk_mux_ro_ops = { .get_parent = zynqmp_clk_mux_get_parent, }; +static inline unsigned long zynqmp_clk_map_mux_ccf_flags( + const u32 zynqmp_type_flag) +{ + unsigned long ccf_flag = 0; + + if (zynqmp_type_flag & ZYNQMP_CLK_MUX_INDEX_ONE) + ccf_flag |= CLK_MUX_INDEX_ONE; + if (zynqmp_type_flag & ZYNQMP_CLK_MUX_INDEX_BIT) + ccf_flag |= CLK_MUX_INDEX_BIT; + if (zynqmp_type_flag & ZYNQMP_CLK_MUX_HIWORD_MASK) + ccf_flag |= CLK_MUX_HIWORD_MASK; + if (zynqmp_type_flag & ZYNQMP_CLK_MUX_READ_ONLY) + ccf_flag |= CLK_MUX_READ_ONLY; + if (zynqmp_type_flag & ZYNQMP_CLK_MUX_ROUND_CLOSEST) + ccf_flag |= CLK_MUX_ROUND_CLOSEST; + if (zynqmp_type_flag & ZYNQMP_CLK_MUX_BIG_ENDIAN) + ccf_flag |= CLK_MUX_BIG_ENDIAN; + + return ccf_flag; +} + /** * zynqmp_clk_register_mux() - Register a mux table with the clock * framework @@ -125,7 +146,7 @@ struct clk_hw *zynqmp_clk_register_mux(const char *name, u32 clk_id, init.parent_names = parents; init.num_parents = num_parents; - mux->flags = nodes->type_flag; + mux->flags = zynqmp_clk_map_mux_ccf_flags(nodes->type_flag); mux->hw.init = &init; mux->clk_id = clk_id; diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h index 9b2ff35e..87a2e12 100644 --- a/drivers/clk/zynqmp/clk-zynqmp.h +++ b/drivers/clk/zynqmp/clk-zynqmp.h @@ -41,6 +41,14 @@ #define ZYNQMP_CLK_DIVIDER_READ_ONLY BIT(5) #define ZYNQMP_CLK_DIVIDER_MAX_AT_ZERO BIT(6) +/* Type Flags for mux clock */ +#define ZYNQMP_CLK_MUX_INDEX_ONE BIT(0) +#define ZYNQMP_CLK_MUX_INDEX_BIT BIT(1) +#define ZYNQMP_CLK_MUX_HIWORD_MASK BIT(2) +#define ZYNQMP_CLK_MUX_READ_ONLY BIT(3) +#define ZYNQMP_CLK_MUX_ROUND_CLOSEST BIT(4) +#define ZYNQMP_CLK_MUX_BIG_ENDIAN BIT(5) + enum topology_type { TYPE_INVALID, TYPE_MUX,