From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752515AbcDZRzS (ORCPT ); Tue, 26 Apr 2016 13:55:18 -0400 Received: from mail-bl2on0122.outbound.protection.outlook.com ([65.55.169.122]:38883 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752189AbcDZRzK (ORCPT ); Tue, 26 Apr 2016 13:55:10 -0400 X-Greylist: delayed 92651 seconds by postgrey-1.27 at vger.kernel.org; Tue, 26 Apr 2016 13:55:09 EDT 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; From: "J.D. Schroeder" To: , , , , , , , , , , , CC: "J.D. Schroeder" Subject: [PATCH 2/3] ARM: DRA7x: dts: Fix the 32kHz clock calculation Date: Tue, 26 Apr 2016 12:54:28 -0500 Message-ID: <1461693269-19436-3-git-send-email-Linux.HWI@garmin.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461693269-19436-1-git-send-email-Linux.HWI@garmin.com> References: <1461693269-19436-1-git-send-email-Linux.HWI@garmin.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.000.1202-22284.007 X-TM-AS-Result: No--2.482700-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)(6009001)(2980300002)(438002)(189002)(199003)(92566002)(76176999)(50986999)(5003940100001)(1220700001)(1096002)(2201001)(6806005)(87936001)(40036005)(229853001)(106466001)(50226002)(189998001)(77096005)(5008740100001)(4326007)(5001770100001)(5003600100002)(36756003)(48376002)(107886002)(47776003)(86362001)(2950100001)(50466002)(2906002)(81166005)(4001430100002)(19580405001)(19580395003)(16796002)(586003)(921003)(2101003)(1121003)(83996005);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0401MB1338;H:garmin.com;FPR:;SPF:Pass;MLV:sfv;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD011;1:My9bPYqddoWMYbo1IqCUYN6GZ4EdegxpCHNvujJusM6twXU1KMFZ1RKXBYnjQ8j41OFDdH6uyr4bvwywdwBY2MW+UgI16JxfSbq8xT5ZnvA2DiVTGbVT1PGYt2J2wpl/+0IVgFJutEZIUllEj+AUUu/uWesrh6xOM+eu7/MR5XM2Jaip9I0M/mZtwuvKBD5ynKxsL58q6mFZoE9g1WqMV4NY1L10G9w2A3BNZfBjp10BUVC5q0bkDOUWpthr3VCrdgtEI6tNrXK9gL/FSOWTesLMqJE10+dUZw15yhEgrzvo/FPmhSlCorLyQfGbEkQRjL0L1/bXILtfy4tLuI16iWx17FV9CDI2QjI5Fgs+JcObKzoWXl8aqPs0+fwkK6cqUpllzLDz7g1P+X1MUnaQvPiaXQAXRGYGKsVp/TVKLT0igXSaYOKFhVR50z2h2omHSTklhX1MtqzLcf7vbl1fe1ece6eNZJVnsINurr+IbM8qkEWFYsjMl+3zWPD30f4c1nRtUBk5fhqZcwi5q+XW8g== X-MS-Office365-Filtering-Correlation-Id: 1b65c221-cd4e-4b58-770b-08d36dfbe5fa X-Microsoft-Exchange-Diagnostics: 1;CY1PR0401MB1338;2:73fuekfqW+qWuB8PHSIK+UT7h8Cp/opDYUR/yYzMsqLIAunmSiE9DUpS5Noyz11rvZeYkeOC0kXe0OQMkB5cQguMwg2RxQdJTlqEgtOcIiW5cUlzGbgtNLIq9tpo+18EC753acj9zf9IfKW9cMGYcasrkON9W1NI1g3yliSuAqlZ9Z1p9Npw/exad6KgiETw;3:a4/nYx23lV8s371vYHpTTPA+WMN0wTvAZBJwXVriaLxm9LhetW/0gJaEB5d8ImZToulMfGhmiqNzCSRJ9LcNu5hQ1onqTZJJg9cg0EI771/cTFSsTYzCB6ndQIVi78WiOi2CZMOrKdxZeVizDvrN9eGYcxCynjolf6mY5XifujkN1O0cyY9KaK7xrINtY6bewvDT9Ib1ZlNJkg8xeJb81K/Ywd2QQam1rkzD5+EpOVnobRQCeEMrISOcs36x2LDuZkM7vlu87ojtteA2ukvDng==;25:Nrloi89DVPt8QiUTED6nSMni6ljwg1/JJ0Wk+UcAf0montir2wWvvbbJ2B/3JE9WbiMGVH8ARoobbrBPFmroeL7PjdT4pj+IyPoj3VfELwGVI/YVbFXcz64RyP0qOkTdghtAfWPencAw2Tes4POSP/mllAmynDB/TD8PFNL0TqZtkSCueEavdrRW3GoUV9sPqrXcbWboXRVZjNZfQRx1wFvTylE5pRgUuO4yX5WobcumvtTr+kPs1IG2PmOIzQ7ogbIr9CrdKJx45JJlto2zdJOazRmuVvDilKaKIXOcKcbB0V5NB5j+Ncfg1yjGLgyitiRjbvqEubHtDyUyB93whQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501002);SRVR:CY1PR0401MB1338; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0401MB1338;20:ZMblvEMw1WsrQA89uUheN4MiPrDUjwY0GKlOGhY0kyelu3QOxXyfA4fmvPUE0KmD16FxHVAhiDIev9llRfqn0/4rmPv8yRWhhgcR6ddB0AlMCzsYRmsMFt4MYNDeWXiqW3j4qrmnkPeyBgm1pOo23Kxy/sE74YtN0OimGEcD1XBij/mcXBlbUQkCc5b/fIJWM8oqQxbxl9zOVH+27FGyJZmYZmYLmEKfgbUlfsUGp6yoiLKt90m8tRu8DRKfbv3F6r2eg23MVHzPgmHYGJeWs5aDM72omO+QOYsy5H2OrXrYzsfE+LDdFRqZGVH3IBBGHuMFVrh509i2glGJQYtUSiT9QLbIgrG3GX2xquQew15w2fdvnbBp6yvHjbdVW1J4d0t7fECrH8jgW2I5SSf/lVGD/ywZrefVzIvflQW/dg4DJgOOM/NfD/T460SBXL4kvkRAcyHwLKwmkxz63iezCPS/l+pvVIKEBzq2JRyF0haAl5bMraQ6auJgNMWuuR7Q X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13017025)(8121501046)(5005006)(13015025)(13023025)(13024025)(13018025)(10201501046)(3002001)(6055026);SRVR:CY1PR0401MB1338;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0401MB1338; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0401MB1338;4:L4bYGaGRxgP5RcZlcWGBf+tblMmYk0yN8iWAAEsT1uZYCueRgKeuFf2O0RWQqDE6s5F4yCXGzXhk/U5li9WXfodYXtbzNjO5Dw+1IyIHrgQV2cgnN4rHF4HhzMIdLWMX3fF7aJDqHw9dWi6xXFGgLukkeDcEDcrETt/rffxLt9WQA7Pu1m8OVimuzEHrJ0XnvsHfBpVEZWy4IUf75XToglYSo8Ys108wLzDO1XDrlOwebdEinXBNpaE1CmXA/6sGhXwXmMooUtjn9zw78ICxutO0VKlS4xm/yrJa9HcuZz0N6ky2CMFoX0EMpYzlWNi91SjmXwUsRF8MuXADeaAMDvu8CwsTg0ypGe4jvOo936BaP/RonzcIs7jOWxprTrFn9sGWB/ownjfURSkI9xJv2s1yXC2I7B1dhAmFPUhWVX1r+mOuscQvK6iMNVo/37huLdbponrx7+Yd2jddoUg45xDXWZtXGY4Ar+XxhUifkyU= X-Forefront-PRVS: 0924C6A0D5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0401MB1338;23:vEWrOswafw8nYG75wH4owicv/zFrlv99ajDo22h?= =?us-ascii?Q?Q1BfKIt1cefgabPuo7QfVMtdWHpJg1R54eV9NSyEYNqKkbD8Nbx7LNtq6I3j?= =?us-ascii?Q?C5AKckywviqdeB0tSsUO4gkGePDtPGROtrvCNVRuvHF1KwJK5aKomPoZZgi1?= =?us-ascii?Q?RrQuGqZ2lVk1P1/aLr55YV2roM4/OTMe7CyRw6E7ZXrCClKWSrHNHSlbNaoE?= =?us-ascii?Q?Lun0Uk2VkzOs/u1lZ+3+fM6F1pmLWB6yJZ5Erj9XSjBxeRhP9hDqFV6ktbS3?= =?us-ascii?Q?0F0hfUHKnXpoOZeJcZPa460G/6WsGgraEb/VL1t+zkZhQCD/RyN8OrMglc0p?= =?us-ascii?Q?9NxCCtJN9AQfwHaenIqmzmV8hyip2GNUdPCXiGPkUVqMRUU86/1L/Zyec7gZ?= =?us-ascii?Q?gtouEFWwaT0SEDye6PZDYR4xw3qzOfqI4hVSTI4rioVqKeqpfxCA/uD1BFWc?= =?us-ascii?Q?I4VV6RxSRJeTeAKxUUntO04dss+U/EuILzIVNaOqlttwsYhtp96dOOVLScCY?= =?us-ascii?Q?XtdUk2LmEZkeTjOTOr5kx4xrlv//X9hrlww/a9wGvnSJQZk3kqC1wCoz3AR1?= =?us-ascii?Q?8u2+KpNHIgFWe2Tqpo7xFtDcgkDYnjkgKQbiE8UWnvCf6R+5KpBgJT23xTKK?= =?us-ascii?Q?YWmPlNVcZsfSuMsdFFSeiW+t4eFk/3ALwuHmcDfbs/6SCK3ZmClHJrbxXGMo?= =?us-ascii?Q?VIndXiYBI90FmX/wxrg/0dvrtHAcr0RallHSUkNGVo9UBiu1357UTHlO8XeD?= =?us-ascii?Q?9YBtB3O1Z3Rj9x9PbdG4KsVvMKU3rrizhrv/S4f2+eMWatkdjZrC3zPljjMA?= =?us-ascii?Q?E6drJSg20Pix1C6ouK1iLoeoi9Z4GvVV2sWy/4JufLh5k1FXjEieIv7YftaU?= =?us-ascii?Q?+bhorvfeEWzucRjlJzK1ATZ9Wg1GLxDINGv9f9tzAyqTBW9h6eACp01QQflo?= =?us-ascii?Q?zKM5ij+knBYigXzVubCyx9KbiYmJJqeFAcWisHGjMYnRQ4+INA9oK5IHLYLF?= =?us-ascii?Q?zPyZZBARAXiDIyL3Fr0GhnvZEbsWtpGp2uqgT9ZnNp+bYxBonds5uMCM7ZY5?= =?us-ascii?Q?lboga3a8YUkAJCKY/sJwvK5218j9dm63KxbPuoka9cu4Uoi3E3g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0401MB1338;5:3ldYWPDSk77zx+4kk3vcBvXkdTqgwLap/RenNXvzEvCnOCUoKXikNtNXbGDgt1R/czhmlZ8daUdCUxLrZge3ty5LM/5aHQtzUSY2tKbXEGC263Lam0kEIFjC/XkA0J/q5mDDiDFlmCk0YuYjIDSr+Q==;24:JcnMkHLY8uScMkuUKize7twHuvHTaXkLa4raw9qVqXQ8pW6wQBatQndcmWZPnbDJ7l9geWLhnG51726RUUhTPVmbX6i5lhIgDzXys8fqvZ4=;7:i9NOphBfo6tyrRn5W5EAm1jI6L3viyY4AjAgBQzT48At2LvXv1ll1WmFR/EhdHRgXkt/yAwOwoHuQ2LWWZKblhKyxsAMMyqIi5PrqfcOXloUGEiWs1l1A9XWtbQ1VIOSmZNsoZnQsttz+cjqsv0gP7HKk30Yet70T8j6WJbvFDBxFrgsmQWb8WRVbd+F0GeL SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: garmin.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2016 17:55:04.9023 (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: CY1PR0401MB1338 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "J.D. Schroeder" This commit fixes the 32kHz clock (sys_32k_ck) calculation to be correctly based on the SYS_CLK1 (sys_clkin1) frequency. Based on the TRM CTRL_CORE_BOOTSTRAP[9:8] SPEEDSELECT, set by the SYSBOOT[9:8] board jumpers according to the SYS_CLK1 frequency, the frequency of the 32kHz FUNC_32K_CLK is set to SYS_CLK1/610. The following sys_32k_ck frequencies get used for different SYS_CLK1 frequencies: 0b00: Unknown -> 32768 Hz crystal from CLKIN_32K pin 0b01: 20 MHz -> 32787 Hz clock (SYS_CLK1/610) 0b10: 27 MHz -> 44262 Hz clock (SYS_CLK1/610) 0b11: 19.2 MHz -> 31475 Hz clock (SYS_CLK1/610) Signed-off-by: J.D. Schroeder Reviewed-by: Ben McCauley --- arch/arm/boot/dts/dra7xx-clocks.dtsi | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi index 9d1a583..a514fc3 100644 --- a/arch/arm/boot/dts/dra7xx-clocks.dtsi +++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi @@ -98,12 +98,6 @@ clock-frequency = <32768>; }; - sys_32k_ck: sys_32k_ck { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <32768>; - }; - virt_12000000_ck: virt_12000000_ck { #clock-cells = <0>; compatible = "fixed-clock"; @@ -2177,4 +2171,26 @@ ti,bit-shift = <22>; reg = <0x0558>; }; + + sys_32kin: sys_32kin { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + }; + + sys_clkin1_32k_div: sys_clkin1_32k_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin1>; + clock-mult = <1>; + clock-div = <610>; + }; + + sys_32k_ck: sys_32k_ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&sys_32kin>, <&sys_clkin1_32k_div>, <&sys_clkin1_32k_div>, <&sys_clkin1_32k_div>; + ti,bit-shift = <8>; + reg = <0x06c4>; + }; }; -- 1.9.1