From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754707AbbGYDvm (ORCPT ); Fri, 24 Jul 2015 23:51:42 -0400 Received: from mail-bl2on0057.outbound.protection.outlook.com ([65.55.169.57]:29536 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753504AbbGYDvk (ORCPT ); Fri, 24 Jul 2015 23:51:40 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; gmail.com; dkim=none (message not signed) header.d=none; Authentication-Results: codeaurora.org; dkim=none (message not signed) header.d=none; From: To: , CC: , , Dinh Nguyen Subject: [PATCHv2] clk: socfpga: Add a second parent option for the dbg_base_clk Date: Fri, 24 Jul 2015 22:30:18 -0500 Message-ID: <1437795018-27601-1-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.4.5 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BN1PR08CA0052.namprd08.prod.outlook.com (10.242.217.180) To CY1PR03MB1374.namprd03.prod.outlook.com (25.163.16.28) X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;2:6sXqFt6CM22qgGavZUQM/hm9DlLtfuIaC+uAHp9xgpt3cabK5RMx2sm6F5fCaLyQ;3:QxJd+YES4SA0GP3J/mV1d6ou4kN2Fvuqz8JX+5zwQx/e05+7nxg3c9nCUjww5elLSdVsFieuElkmRSGs0pGuU4GqQjynoLCBbkTd6MwfUFfQYxi6CSbA8bjFivWT93vC8Wyid0JhV4crCAqZAXgH0A==;25:JMbreZhOOddNiirFjiLxbQ/g+jZ1RBu4cLQKXmp9NdI0IiqITVcdN+d2Aopukq+0QPgnEdNGQpWZ0JyDKusdsHtuDB7yjWRt2wA2b/8+A9mfD3bZGVipGhZgVNvuBZkeRK/0cyfjJZ8xq9hlWAAIobhUURYWz7IhvzWbAsu+EwIrdYR/oBIAkJQXgdmbDaocdHVS/nv13USoWHmf3bry2DVcmMTCV1feJaJFUe+zWIQ9v1uE1BLoKiNLCyY3ETojkzm3Swxi1GktpqI2OnjqAg==;20:Mn9GISwy/l7ImRg9MoM/WFBXHOkA1EW4KNfBZJEUuikCxIvEth73HLDn18BbFDGso6WJw9q+pB3nD1/Fhsir1lXttR3SE5hX31FfMHJ0sXZdOaugZoa7gfHF/mgHIT2TqdQ/o0RRuKIl3B/hMAGQfGuQ75Ibkj4P/xjIj6MiphY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1374;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1491;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB279; CY1PR03MB1374: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:CY1PR03MB1374;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1374;BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BLUPR03MB1491;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1491; X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;4:ijJ8zts8hEb9GBrWOn0i96TH91Ll9TrWiu4m4DpA3eoVJsbQV6MWK5PRpfrOFAWSPrgMsbHXj9eYWquNpl7qWYJxm1nSvBpS4ZiuokuH/YXi9LVEsblNf3n+fItjbXzVg4SbJGgY00MB6L5XuGiKJTvoi912LhCmVhvYsxw6nsLAru9O91VOOVZ/XVCzu0zXvD3jRLJXEWtAi0yXv3/ckc6z2oR6MYbDeJAagodEMWLU9l/wcJGtwj1utjo5pxbi73PwtaBHYRaCmh1TYMAVssVW6mP91vfqcfS4nJKlBgw= X-Forefront-PRVS: 0648FCFFA8 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(42186005)(5003940100001)(189998001)(66066001)(53416004)(50466002)(5001920100001)(48376002)(19580405001)(46102003)(47776003)(86362001)(50226001)(77096005)(19580395003)(62966003)(86152002)(50986999)(77156002)(87976001)(5001960100002)(92566002)(40100003)(122386002)(33646002)(107886002)(229853001)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB1374;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;23:WM/S2bhk1MgUqSDZEbQhprggZskot3tYWs//q//MJi5eO7A4/NbRkfJcBr+64iJLZYnQr6QQ5K9viT6XSTFBT4b7SutWz+iisjTA+xztwBmTXmhsADk5p2lF0OxRlBi5FfYH3XqP5eqTFx02Pl2RlxF5uDAS0dlxAj0ubfD5fpFv1MEXWcXWtPepLmsVxC7pFijSkecFCOKt6vP+iz6YzqnuW/eZRkj5a4KxngF8RJpGWCSMFXyU4xuk8etncYxbh0eNR1/EpkTMcDXVyeUDJb5W3gxbLXPJVj0Taj9gcwHXKmfry3ETEBWz88MSufs1frIET1ewFcguHRSq1FAq8E411OKUxKRutcLK6WHb8TA+vHqTfLBHJLdBFM69iRQ7suDRE14wseOWprprijFctM9hnET+MG2xjNCJIso9AaZB4vMTDgQC8Qn+1li6KFpzfw9sCNgItXuktni5LtBBxMk8bK6My2cmwLfb76G9pu2qEZyNvoLa0vxURKHkOZuigroyoHEVegAyYU1AkqykLKoodJ3aSSEh4dOkIzZZ5G08jH7/KvY4CWS8lV2ATGFyFV8YMPz1aQbjiVXS2DfDXi2Km9O2x5ngk9svLItO7J3Zkp7hnon4g3sbCPGn4x1ikKqCnIkaRv/GvOlgB8pm/3GpXfWR/78alEMA6plJeDNHgsO3tibzrxJk5wUsHtmBGBoqg+rP48gbRyBaDlim7Dx/W4fOJ/5q6Qx98U17MSuxkjhfx6XHylskomYLk4s8F8v0GwYjt/ZgMseN/+XA6C0OIDUf7rf+86hT9+FcTpc8D7dwhhjIkTGKECQhJ3F9C54wi1CExnj7U5PcaBSWkQ== X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;5:f0rfsQge6qutqWMEl/ze2ZQ9YR/Cz4lJLT4nvKJxMuf8DALk06gfzT+2rjspNsWd8FR7fg01aFadGhvGbwddfoBl3wNH4QQWA699XN7dIkU9oyE/OzL3oxJ3ywETO59vu2BTDpBekVohGeoqkYbrBA==;24:iFfiCu7JztBtYVB9OvELFNI/9em7F0DoArtrYvYSLj7Ls6EnVglELDllZQ2O6WFUQfQrCsbGDeoAys/+O0GoxsCjZEwD2AcGJmfcSIh8pfA=;20:CYsqOCFG4h2M+Gawg1uAW2BWXDKMK7uplZCc45lrGiDXWybTLPXy/G6pJuv2dWJnBOpIoeJ1MrFnLTKAdhODBAo0I3VuMfO02hSkY5OMGOVw5iPFfqOI+go2+MLAwkyJrUa3Ij/tgTS+nwR4RqJqYiDGoTvZqUump2ZxAA+T3ws= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1374 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11FD032.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD032;1:DJrD95n7GRtJ1aBYjWvfnMJKtapYAKibv5RGJ5zF1Rd/sp3Ow+xf44XilEthwK49WWgYSfkiWUVcd2rB8FIvnYywaOw/49gNureHYqCxQml60i/yI9OBbEYMvztiGtsaDM5GPAtsm4LUgCGXSTNdy+JkbTbUZJBYV/xWdMZdvd3aNxYFET7XNd5KQUzMQlgBnHABKkV7hmwB4fIWKQ2ZQl0ftB3YEJje9qrBPwIylTFH34cNjxv2IJ6q1/Xiiw5m6uYc0EouNsV0UaSoUKBTsk6SYHUg2Hggy9CB5PDVQoxkWf8Ip/c2cv6cgpyhFE9p X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(339900001)(199003)(189002)(77096005)(47776003)(85426001)(46102003)(229853001)(50226001)(5001960100002)(105606002)(106466001)(92566002)(5003940100001)(66066001)(16796002)(19580405001)(53416004)(87936001)(50986999)(107886002)(62966003)(33646002)(77156002)(6806004)(189998001)(86362001)(50466002)(19580395003)(86152002)(122386002)(48376002)(40100003)(7099028)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB1491;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;MLV:sfv;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1491;2:VwOgVgYs86s8DajNFRITKS8B13iWefRrwek6mHfT5L+Pz7toh/L/HX3toZnWuJd/;3:Ey/DQgU1vVSTNSYl1SAL5qXjl40NN63GdM0DIQc1UzIgp7R9nk9IePlm1ZhgkBsIQHEmDa5K+bB86ImNx8bqwntjkFEioqkf6QOC8nXVtC+KVDLv2mOaOkw58bala/7av8WmMdi90wPBWYTxpANokzej/4ra+AHQRP+o/cdh+fkjEfZhCiu2jAEfnwqFQ31SBGNvpzCY+GQAfBvZHoO27LpcueKQBCAe9ccq9CgTPnw=;25:X6RrqXLMVKxv2w09Nb7TLDgBzsW7KdU0JkJaRvfwhOTZvM+Pn1tyqFVbzLb6DWQkaCRV9sPPynuVbCo1WAfuBjNoeVsL36J2uRcJ0YChsVAxFbzir6i6v1rKC5I5LlhF0IzW5nyMUu0SWuDNcYXBPXaO3yxK5EZTM7da72SdAcGU2zwX51kszoC0MPy1sQAu9N9VXRn5IX6bwymN4LoLdv+F8Z+1DYB4oNvXFUixSpEFGvLvQp1plJbCySmq/fD49CmBlm83lFLxOlBNwZZEFw==;20:659xXxi3xNMXU/xIB0P3HdvK9BV8CnmwdQ+coZPVBCwUND0BPrgv4frfNlRqz0e4Ek/IhGBovSTaEMGg7K8cUAMNYzwGFHs6l4027JDwuZtSVrrojlLJIu546ZWUSG2MPCGbcqgi2QtVyGKy2quxy10rX2sIxLheT6kzdCrwePo= BLUPR03MB1491: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1491;4:Hv/582UOBwGSBOgvgku7UmyPk8OhTW1mw/asnyj8shKYWhQp4gSHxnCxXW8YG0Wc7+VNLGE0lQxmjya2YFXKVtpo1YZ3pVt9NL+8QyB4OeVvC5rVPF/QX1RTLQVM4cnCGA5SkiJT0TYhjN7T6BrbhT7VEG3vWvWbFPOu7+FHboKd6qKyYWPSeeg5DdyhPuV/mgU/NvRVtOMEpFQpYx6zHvKbTcqBRSS3rEKJW+AlNtcwMtEda0g+o0ClUS6c9f1c7xv1zpHLnmK7Qv0OgxjoDKKkS1ArkZncxKUYi1kMKmA= X-Forefront-PRVS: 0648FCFFA8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB1491;23:McTyxl5drim81Lt/imzaEYhTE8dZU2hoVs+FZr+jL?= =?us-ascii?Q?O4GBsjlizSdemY0Sb3Swl8/l3OQE3RVum35qethHPA8Qo0mAg03lhrfXAiHC?= =?us-ascii?Q?UWzDb2KHazmehA52F4SMwF15S8wgJ8r5SgrCsPVnbPGfzEGsTtBFXGGMpXRF?= =?us-ascii?Q?ntYrjqcV1hSHykquKFKxQm57rFvT7wCje+W06z9xdV9PX3y9uQ+nbgcR4QXg?= =?us-ascii?Q?2Yzses6eWJJZ/6RzbKi77fht7s4KUBsrFkIrC9hou562O7WAzsMyBIfCFkWh?= =?us-ascii?Q?/oaS8Y/dWtMX4+tNtg10IcWgkd6xfxo84em4m09cnMVScLzUprW073SLAVsM?= =?us-ascii?Q?sb59Fz8H5RMYUEvZaUldMV/Hu7cph+V+3QryfXgyTCYUfd6isi75jgAXcBxi?= =?us-ascii?Q?gbxckG6s2xmpkKzon9OnArTXaVZFLOaEUt5fQf+8mdSPU7qM2o72Oq1Y+z3j?= =?us-ascii?Q?KTas3YonppHCEtna8tvCkvorDulWk0Sm9FmADyLiiOtl9agOLn6sxBY4o5rG?= =?us-ascii?Q?aKv0z3HWqlWVGg9bWpvp2lCpXJEZP6iFoJGsx+HKuHK2aZ7NgTXbam7FvnJ3?= =?us-ascii?Q?B7zyD2Vm+NE0qx2wItbSZwWByJ7CLmH883ksWcF1TukKD/g9mkhqOtxIX4hi?= =?us-ascii?Q?mKpNyBDSbRdtayrc5LR3ENsQ+tVW5KWVq3gXEIMVvZ3ZXrvfHLf1CiHmYetR?= =?us-ascii?Q?HhdNY2N2EzLQ83uLwdE6m+Ey+oHgHEZWGPIp58dABJowYb97sZdOlZRWr9C4?= =?us-ascii?Q?Cxha5lNcT4lT7ZZkJEyXjMoKgesXdzVe0mKsXCZOH6/hgpsDAH0nFEBm9JhE?= =?us-ascii?Q?4mxqNyEw8NHCFTipGLZAYAJQHFU7gHk+SQFXRi9f6EiEtTO6FW7l2BSqmKfM?= =?us-ascii?Q?+9VrNzt6mOKrSRE3CEuSirPdBuIEVZ9VEKZa59DCaYw9Fk3Mlx/QufMjDT59?= =?us-ascii?Q?wLsQw8+iL3w/6e5ix7ar+bZsASxOo07suoS8DTYOrBIirMy86DrVoMzQcJfW?= =?us-ascii?Q?5E=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1491;5:j6mNnPgglj0j30Tx6PeqZQnUoBadnhGepuhNSEEmEaIrrB31orhMBUkvbpWQ9Kx4ilT8lcATBHOvgTlGBWG3EI2HzR4gXPYRL1XDpV/ldGI48+6kNX4e6lo1znu2feHqy/p40I5OzEfogmXyp9S1Qw==;24:PVEnRVtSLJkRiF3dhYBel2yQdMxHMn2fNZTb3D+XxsXwqKZ7T6vE1ya6qoY1sBOwxrMYexk1Pgg7ogRjx/ndK9VZE4UIXJjko8kQ4htkVIw=;20:2EkCEB4hz1aEAkK/scHHVbeprCaYEmkwGeMpe4VmMzIjWbUiI0ujfJVU0q7uCsl1lT68Ykk5OZ9Ew0RPtoJXapgQUjMnCfnk6qyf78wbxrXJ+3EF5zY3MrwoVdkphikXgS8MWYVjj03EICAlXCUzGYwvIX1llt4JCXWqs2CJh4Y= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2015 03:36:29.8437 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.236];Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1491 X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB279;2:wupG+8k6erPq1Sr8Zv9Q4krMc4FuzlnUs6GvulWLWN/uIT0Qf/iobEdSXzhFHEAQdnTeMFQ5eQXtwueETWWvSFAIu1i0mZ7BV933E5BHeVdNqBTQtwAcvrn8aB1noNNHNbV+2jMtHyIUVN5RQj4CqG0cCCAT+m6n3WNqjiXO/gU=;3:WjjWOQ41fsCCW8NnOr8cVN2kj+eAibgeDqau1ky948i4XEvUEY/1Q66mb8CL3w/5Q+7pLj+2x/eFQfJsLKYXPw1nNBSq3WTfrAs/mbDFytgRZtAbm+mpShvucumtdM6ja8DaONtyZ1phDLOwLYUFEAsRx39kAdaLRSY9K5xdiF9pEk8xe8URoDnNiXtg222bM4xq3heRut7mAw1KkbhD0lNFvM67UVVlu+Y89BmQ9Wo=;25:HUAraodDgQngDVRQ+jkz502aWbTeoKSpgqf6vCb866wlNfjc9AvKargFolP/5BksPlwrLU+w61A7M4OcbWtO9Taz2Clb73hbcreRKOoRwmbmBEtVqjWHu2cC5xOZIlOf7jnjBgIddNwytARqVyVURT+tx3E8JY9deoEVp22c7jJWOxhuV/V4jGaq9gWy7gMDjJTDL92KMhqpRbWXgRhlhqZqBAC5xOqkcAxU5qlBs8E/xfk6qJqJdL8xjv0b76fZ8hEEX14zjjjr40+9IgEWXw==;23:FKHVXFDE3q1bY9deMs7qmeizCKxHdffmt7/3slxBfoZzVFyHYUUDk8R7u97mN+/+tsXLC+MCe8qDNPeKhX8/+Zre5BSBlq4C8/cXfaONzahu5FM1W5+ev2kLB/6PgsgZJl2AMPsX+vFGf6VG4D75fhe4W4ax3WSGFLxIkBiOjeZTy4+74JHEyIrDNpSEmS/i X-OriginatorOrg: opensource.altera.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinh Nguyen The debug base clock can be bypassed from the main PLL to the OSC1 clock. The bypass register is the staysoc1(0x10) register that is in the clock manager. This patch adds the option to get the correct parent for the debug base clock. Signed-off-by: Dinh Nguyen --- v2: remove changes to socfpga.dtsi --- drivers/clk/socfpga/clk-periph.c | 18 ++++++++++++++---- drivers/clk/socfpga/clk.h | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/clk/socfpga/clk-periph.c b/drivers/clk/socfpga/clk-periph.c index 0c66863..52c883e 100644 --- a/drivers/clk/socfpga/clk-periph.c +++ b/drivers/clk/socfpga/clk-periph.c @@ -44,8 +44,17 @@ static unsigned long clk_periclk_recalc_rate(struct clk_hw *hwclk, return parent_rate / div; } +static u8 clk_periclk_get_parent(struct clk_hw *hwclk) +{ + u32 clk_src; + + clk_src = readl(clk_mgr_base_addr + CLKMGR_DBCTRL); + return clk_src & 0x1; +} + static const struct clk_ops periclk_ops = { .recalc_rate = clk_periclk_recalc_rate, + .get_parent = clk_periclk_get_parent, }; static __init void __socfpga_periph_init(struct device_node *node, @@ -55,7 +64,7 @@ static __init void __socfpga_periph_init(struct device_node *node, struct clk *clk; struct socfpga_periph_clk *periph_clk; const char *clk_name = node->name; - const char *parent_name; + const char *parent_name[SOCFPGA_MAX_PARENTS]; struct clk_init_data init; int rc; u32 fixed_div; @@ -89,9 +98,10 @@ static __init void __socfpga_periph_init(struct device_node *node, init.name = clk_name; init.ops = ops; init.flags = 0; - parent_name = of_clk_get_parent_name(node, 0); - init.parent_names = &parent_name; - init.num_parents = 1; + + init.num_parents = of_clk_parent_fill(node, parent_name, + SOCFPGA_MAX_PARENTS); + init.parent_names = parent_name; periph_clk->hw.hw.init = &init; diff --git a/drivers/clk/socfpga/clk.h b/drivers/clk/socfpga/clk.h index aa2741d..814c724 100644 --- a/drivers/clk/socfpga/clk.h +++ b/drivers/clk/socfpga/clk.h @@ -22,6 +22,7 @@ /* Clock Manager offsets */ #define CLKMGR_CTRL 0x0 #define CLKMGR_BYPASS 0x4 +#define CLKMGR_DBCTRL 0x10 #define CLKMGR_L4SRC 0x70 #define CLKMGR_PERPLL_SRC 0xAC -- 2.4.5