From patchwork Mon May 2 17:12:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J.D. Schroeder" X-Patchwork-Id: 8993901 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D96039F1C1 for ; Mon, 2 May 2016 17:13:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 593AE2024F for ; Mon, 2 May 2016 17:12:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61B5B2024D for ; Mon, 2 May 2016 17:12:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbcEBRMo (ORCPT ); Mon, 2 May 2016 13:12:44 -0400 Received: from mail-bl2on0112.outbound.protection.outlook.com ([65.55.169.112]:26900 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754662AbcEBRMe (ORCPT ); Mon, 2 May 2016 13:12:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garmin.onmicrosoft.com; s=selector1-garmin-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=PIqHbx0YbW1+tgmCH9pI1cPImzsLpa5HaoSflzFhSLk=; b=MkEIhXEqNuFlGUyNanBAlwL6vwu4KKpO+Ng1HeQ7jEfqM/v8JmZwi5nLiMtPvb9hwYc8Hj3fifv//rg/rOW2bnLo9oirdFLuRl/m0YvfoIV55XYQh4TrLpdNu/vULqV78rUI3FnYHVCgjstX8aJHzFPQivA9yuwmWxukB7TDUT4= Received: from BY2PR04CA0020.namprd04.prod.outlook.com (10.255.247.30) by CY1PR0401MB1337.namprd04.prod.outlook.com (10.161.213.17) with Microsoft SMTP Server (TLS) id 15.1.477.8; Mon, 2 May 2016 17:12:30 +0000 Received: from BL2FFO11FD045.protection.gbl (2a01:111:f400:7c09::141) by BY2PR04CA0020.outlook.office365.com (2a01:111:e400:2c16::30) with Microsoft SMTP Server (TLS) id 15.1.485.9 via Frontend Transport; Mon, 2 May 2016 17:12:30 +0000 Authentication-Results: spf=pass (sender IP is 204.77.163.247) smtp.mailfrom=garmin.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=garmin.com; Received-SPF: Pass (protection.outlook.com: domain of garmin.com designates 204.77.163.247 as permitted sender) receiver=protection.outlook.com; client-ip=204.77.163.247; helo=garmin.com; Received: from garmin.com (204.77.163.247) by BL2FFO11FD045.mail.protection.outlook.com (10.173.161.207) with Microsoft SMTP Server (TLS) id 15.1.477.4 via Frontend Transport; Mon, 2 May 2016 17:12:29 +0000 Received: from OLAWPA-EXHT01.ad.garmin.com (10.5.143.141) by edgetransport.garmin.com (192.168.18.221) with Microsoft SMTP Server (TLS) id 14.3.266.1; Mon, 2 May 2016 12:12:24 -0500 Received: from ola-5cc9c42.ad.garmin.com (10.5.143.129) by olawpa-exht01.ad.garmin.com (10.5.143.141) with Microsoft SMTP Server id 14.3.248.2; Mon, 2 May 2016 12:12:16 -0500 From: "J.D. Schroeder" To: , , , , , , , , , , , , CC: Subject: [PATCH v2 1/3] DRA7: Fix clock data for gmac_gmii_ref_clk_div Date: Mon, 2 May 2016 12:12:01 -0500 Message-ID: <1462209123-7332-2-git-send-email-Linux.HWI@garmin.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462209123-7332-1-git-send-email-Linux.HWI@garmin.com> References: <20160427171658.GA5995@atomide.com> <1462209123-7332-1-git-send-email-Linux.HWI@garmin.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.000.1202-22298.001 X-TM-AS-Result: No--4.483900-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:204.77.163.247; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(979002)(6009001)(2980300002)(438002)(189002)(199003)(189998001)(107886002)(19580405001)(77096005)(19580395003)(2906002)(2950100001)(4001430100002)(36756003)(4326007)(575784001)(50986999)(5001770100001)(86362001)(76176999)(50226002)(586003)(16796002)(1096002)(40036005)(5003600100002)(5003940100001)(48376002)(50466002)(229853001)(6806005)(87936001)(11100500001)(47776003)(106466001)(2201001)(1220700001)(5008740100001)(92566002)(81166005)(921003)(1121003)(83996005)(2101003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0401MB1337; H:garmin.com; FPR:; SPF:Pass; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD045; 1:XberA0VBS/RBfiWjkHYnswlz257WCTpGhwRtrBav7OtbWcOts2uLBH/tushXLqLB+3jNPSEzqGAwvzm726sTG5vHNlJVviAE32X66rEvRof5FtjCrM07GM0pobmSdf+kzFinZQtbKXwPW4lxK0las3O1eltao2JDHLH0FMUlA2p5OBDkWZOS4JDVFBDGYQRNnKyP+tE5tcBSrXND3Jeo8ejdakxGC/f23gU+p85OCV/5mks9Wu3vRRqJ1qRkxx/8qWOdutOTPr2znWWiRUgZwauadCdeJJ60Buc48OxFo6UX/XQ8G388oSyDjvMi40iEAD6TNP9SnIX9qtA4Zas8Ry6dUOJ4J/FOo8eh6L4nk2hSNW05vgmvu1fVdAueECC8rXgnYxGelaaV3j2Sq8kp3qpMs/i2PaTQDCSzhKrJEB9EIyp3xrvq61WQNtnxWz8JCYv3RdcuEElmMkNthog8gvi6vi69LxvluvbDN5Koip/wpCa+MIuvzqHgaNJ5X922Kf2lqXrMp8+DJsFwkEkWWQ== X-MS-Office365-Filtering-Correlation-Id: e57936b7-f743-46a9-ef1f-08d372acf174 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0401MB1337; 2:962Mc1FtMQInnOG5YIosWUoagM5HDKaAvxCHabvF3PTDbaYkra5uOP2rWqXilOhQ/25l++TXA/ye1wS7pZkEeiKNf3K/ktz04We/pshaZwLCRA63QMQJb8NqXvcIe6fJM1LRMBnPhhZJXnd+P8RQ8kajsV8LQac+dyM1lv5GmAITV3zf34vcVkN3vTPawh5E; 3:TfAxTbzNN/c8rEdZhu/pYGwZlBqrhHG73jI6+fHG5aoTCLj76jrBRGjjRaornpZEhlVQ1B3t026TvBaAL6ep7baYEX0rb/YCr6BRmAR/5h1JDNRMyWqVetH8q7TphccExLJB/0BfvjR4cuonX1PE/2V8xTMFLVsmMT7cqMveZdv0yrAW9qVEXnN6Mx/jJ/9olQc13Mj6ma+B7urllAxCh+kH9o0zmEY6t3XF7NmwBb3C9MWoIzRrwFtL1wnY5ECSTIImrMTd5dBbsjAnoDXskQ==; 25:8lqJyiuKgVLd3/6hIMr22UDRwYbUV7/kfsW7gqyT/yOgD1zraEHxsZCNNNAUzotsMheLw8h7190FAZdReCV4rQcN51MjX23hysUGJTfPYtI7lvXZm/9ftLNxIHF6OOJXIutsN8Ap1PliiXebrMVBFIjsf7DxMcbB76jKzSUgjhzb1XzcDVt/pQT2qjQsIxQa+fehlEuSQrtrdTDBizypFqwEtOXRnO73ie3dvCBhkMY4e7UhID9vQISdSeS/dksnvS3eMi2SGYFStPZHG+KgCdFAamdFh3VCv/B3W0Yu+9ffoxfszZ99k2DEcttPXJMKnu+CGo0fjkpTfUSilwk3WA== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:CY1PR0401MB1337; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0401MB1337; 20:KkQRyIYrwxuzjTo1f1dwXGQgRBzme6OYR+f3qF31KV5LVu2loC0txeudPpF9JAUzfZC5p5fZGeTwMy8H+D3jd8Wg6r09nRy5Ko+7hMrDlR+4vMLMypv2CRk4jr2ldo36snEH1S6PXZRrtxmSFSMbTbKTPvHG2+AiDsgrMlkXIF8DGSmpQrO7zsS9PTZtdmzN2jdLSbSJDDfx/Z2JTqNYhb+10koWfX8scOPaY2L33CbiT6CjB3l1oLzzvNLi0CFJGTDJagCDgpPVcFplypuWX9bC5n2wpwz9zYclQsozUq+0wqy9269Eyz8fSKbABpWITsgHw8tU09xQzwstXRoJgeAG0Sv9mRwlLoNTNvhMUl44SLEY/Diaohy1g0Cj6BJ+vOdaZCnRB/kY9cHGyurdqfQEVZDO1m6aYz2ky/HI1BUSu++5uULVP2B0BnHNe4V+mWcZIpi/JbAdsHElOSWguFPYfuLt1Z1zPvqByHv/U1gjrud6PhbWPVvPGIro0bb5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(13023025)(13017025)(13024025)(13018025)(13015025)(3002001)(10201501046)(6055026); SRVR:CY1PR0401MB1337; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0401MB1337; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0401MB1337; 4:yaZ6LsVhKCudrzY4k1ArmTq6KAEZ2ARv4O7tJDvZIWb00VDz76ol8yaOfZAmNL0FobVKdnV22U4CUHC7MwvD5+d39pUaPpIBZzWEFpWIboMa5L1dqSEmM4xO/fmKuNSaGVgOEhkxExcqpyGKqvOPOBEBb3m0negajx5YsTctzj2xcj+3pn1mJfGTgNnT7ganmYtmKh0ALISzSkiOmsNQH0xzIt8K4umtTGwGWt0rkvbZ1MmgDxOa/LX0tkCU9Bv3FK74DX56QmRnCy4zmGAuLsl1xU3g0a9DXrGM9UMNNiq+QTtdkEPAOobJYbTu4rG4h1v7mQUZp+sf2YBFVdxtXKT+pnyF8GpP2BIpj4aQF5mvIa36xQIOqfDfQ9BNPqd/QDmfBe9qZG5ZMm/KFvDaQx6/vMKLZpGEaGaMBXYL1gM8qDuAsBHEXG01tIzh0jLxbtx7KVKgWcQqysxQfm0trsiQUfhcZj4AGXFacwbZEKM= X-Forefront-PRVS: 0930AAFAD9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0401MB1337; 23:b5uNaPLc1816eaAipJgI9NbQIEz+MALVxxqpYbj?= =?us-ascii?Q?geebd3cBkybUUmC3e0eQXpg3XQugdfr5Kfo5KRq3jAC1XqHwGuVjITUIUxdV?= =?us-ascii?Q?S/5Jc0mIiJNs4ZZ7aqg7Oq8OeRc5+RZ2o0LKdrqF9Io+HVJhgGpPbunlG3HA?= =?us-ascii?Q?NZEvm5PqfW1Hh8llT2i2V5aHHzxUfn62dI1aFkpuujgENm7EMK+ILv81wOHp?= =?us-ascii?Q?u/+uQxAOcleV2jVWUGaSGfXSWeJMZKxZFkp3B4U30JXFzgU5upFHpJ916Hs+?= =?us-ascii?Q?jfiRZKzPXvvGddE1xC3AFIHjBs0LiVfzgheehwM0XkE3YJcKNH6bqzPycQen?= =?us-ascii?Q?efNBBUh6rz1hihxwJOdZFWtD8XjrQHB9euM/S+TbJWVkadGD72VgApOAvvJu?= =?us-ascii?Q?Hhu9a40SNohBJ20mDKLHBvnk9W/QY6+GZZ9SqCHIPH48/Pzan0n3vfDZ2GYI?= =?us-ascii?Q?8/3rCqdVlUX6C1y5Iue+1tqHfPe2+cZX5rZmavLAzwNw05IFoY0902ndAlrt?= =?us-ascii?Q?308tsAoC48ixTXySZYTv99wOWNIzK35DdcbP2bceCtfPJ/EMReXGfKJ1iEG9?= =?us-ascii?Q?2iVrvMhWozasHxRe60vUo/3kayB0XJez5BNtVd221wWces19uGHXt4MWhy+r?= =?us-ascii?Q?JbjnE4EXZVE1NfsDmVREMi1pluTsIdXPfbja0fwFj9BjFs71F2opez0ihFRj?= =?us-ascii?Q?Rt5q4ASilkuGzud5w5FRCuGwvwTlBGC1SI0FNZXxQTI0VRo4s/fHJMusnS8P?= =?us-ascii?Q?kRiDFxjBU84HNt1S9V/O1iU7GpRediJj1Fh+VR6u4BFkQ81n4jxpTA/kpnIJ?= =?us-ascii?Q?waKJ6qsl2kksHrshdVIZUowXe7LpIU4FECUKSVK+VLnQlqShvNRuB5cKqxI3?= =?us-ascii?Q?ylQn1DxbRrAl+DrYNY5GgSlOAjvSCtUha7o4kqNWkTipGnq5qGzlQlBcAXTX?= =?us-ascii?Q?PohJZxxLQCmLc7GOwVHR7b3MT7X8VL6Y8uksfkgr5DKE+IRQfL98CZjJkpmR?= =?us-ascii?Q?yYY39bGElnK5hPVRyjrBCvryIhlYuzESmv7izuiUOj+NHGRZvD7W7mPdaoPp?= =?us-ascii?Q?0kfreBaHLCWbIaAgbDW1CGZbgEiy2GiKJdBosEZAanJEVX833slv9ws7Ai36?= =?us-ascii?Q?GzjSiqrkw08LcAvo2X9kjy2KAO6tKynmAB6FC5E3cUNIUxWTvOoSjS2mb0c7?= =?us-ascii?Q?SGHt7x3EEsAL4S8rSiXcmz1XYp0D/jxoBmvTnYHaDFSvEifHONMOuXmCfjAD?= =?us-ascii?Q?EVDSFPRIUUP3bA7FsPnY=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0401MB1337; 5:YBQKTH/ZT5r7EYGMZX2DrNSqdEw5TYTP7rS8koOoH7ykAtq4CMJgrY0ysNY+lIYQvgY93yXZbl/pFJgDfdnULOx/lYwXKyatTE7vcrImpbwTAfxt2d7G6QOJXb4yhF22T8mg0q/Fq0aKCRzG7m4pag==; 24:v2CUtf724J1eyL4lj2PyiDGRtFQh22FZsEiFoEidkzEWz/wlgm/kyUHXmsX5aJ1mLmiNC2q51Hlr6FHXeHUTiuX0yAZh3lT67vZ/VAcnJbo=; 7:2QaReDXuKJ+aqjZkeooKAG7moytfrKlHh2ByQMFjqLYYfukMbImZOyE1zsm/BD3rADmSUcSo+kZUHyTxqI8Oo/egUO1jMu9FaPe4mdoEzRoopsYGNSpx8bKzGNKCicEyUr6UEBFf+P1XPxmxshPn5LgMVjAzrPSvC1x1sycKjleHClnrrnPtHub395i4J7KA SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: garmin.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2016 17:12:29.7477 (UTC) X-MS-Exchange-CrossTenant-Id: 38d0d425-ba52-4c0a-a03e-2a65c8e82e2d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38d0d425-ba52-4c0a-a03e-2a65c8e82e2d; Ip=[204.77.163.247]; Helo=[garmin.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0401MB1337 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "J.D. Schroeder" This commit fixes the clock data inside the DRA7xx clocks device tree structure for the gmac_gmii_ref_clk_div clock. This clock is actually the GMAC_MAIN_CLK and has nothing to do with the register at address 0x4a0093d0. If CLKSEL_REF bit 24 inside of CM_GMAC_GMAC_CLKCTRL, is set to 1 in order to use the GMAC_RMII_CLK instead of the GMAC_RMII_HS_CLK, the kernel generates a clock divider warning: WARNING: CPU: 0 PID: 0 at drivers/clk/clk-divider.c:129 clk_divider_recalc_rate+0xa8/0xe0() gmac_gmii_ref_clk_div: Zero divisor and CLK_DIVIDER_ALLOW_ZERO not set By properly configuring the gmac_gmii_ref_clk_div (GMAC_MAIN_CLK) to have the parent of dpll_gmac_m2_ck always divided by 2 the warning is resolved and the clock tree is fixed up. Additionally, a new clock called rmii_50mhz_clk_mux is defined that does utilize CM_GMAC_GMAC_CLKCTRL[24] CLKSEL_REF to configure the source clock for the RMII_50MHZ_CLK. Signed-off-by: J.D. Schroeder Reviewed-by: Trenton Andres --- arch/arm/boot/dts/dra7xx-clocks.dtsi | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi index 8378b44..3f0c61d 100644 --- a/arch/arm/boot/dts/dra7xx-clocks.dtsi +++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi @@ -1718,13 +1718,20 @@ reg = <0x0c00>; }; - gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div@13d0 { + rmii_50mhz_clk_mux: rmii_50mhz_clk_mux@13d0 { #clock-cells = <0>; - compatible = "ti,divider-clock"; - clocks = <&dpll_gmac_m2_ck>; + compatible = "ti,mux-clock"; + clocks = <&dpll_gmac_h11x2_ck>, <&rmii_clk_ck>; ti,bit-shift = <24>; reg = <0x13d0>; - ti,dividers = <2>; + }; + + gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_gmac_m2_ck>; + clock-mult = <1>; + clock-div = <2>; }; gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 {