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,