From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755483AbcBVUeL (ORCPT ); Mon, 22 Feb 2016 15:34:11 -0500 Received: from mail-bn1on0071.outbound.protection.outlook.com ([157.56.110.71]:4352 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752022AbcBVUeI (ORCPT ); Mon, 22 Feb 2016 15:34:08 -0500 X-Greylist: delayed 1126 seconds by postgrey-1.27 at vger.kernel.org; Mon, 22 Feb 2016 15:34:07 EST Authentication-Results: spf=fail (sender IP is 66.35.236.227) smtp.mailfrom=opensource.altera.com; vger.kernel.org; dkim=pass (signature was verified) header.d=altera.onmicrosoft.com;vger.kernel.org; dmarc=none action=none header.from=opensource.altera.com; Authentication-Results: codeaurora.org; dkim=none (message not signed) header.d=none;codeaurora.org; dmarc=none action=none header.from=opensource.altera.com; From: To: CC: , , , , , Dinh Nguyen Subject: [PATCH] clk: socfpga: allow for multiple parents on Arria10 periph clocks Date: Mon, 22 Feb 2016 13:53:11 -0600 Message-ID: <1456170791-22718-1-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR13CA0056.namprd13.prod.outlook.com (25.160.82.27) To BN3PR03MB1365.namprd03.prod.outlook.com (25.163.34.151) X-MS-Office365-Filtering-Correlation-Id: fe3992e5-f7bd-4181-60bc-08d33bc2d82a X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1365;2:2euLCCeLzq0ENqcj4mYFeSdmhi1w7vslME1rtz15onwD3Pp3JY5jT3BdZZTMytZezBsVgpZzCrv5qHd0JS21Du/FTvS/mglKzc5pJEiihB3lf+CXLCUL09bHFFFuXpqMPEM6sZqF+d7BRCMSwlCp9lCDxSzCGiVmCwPa90LPrEDr9p6IqjSIHaDI0teLQrmF;3:luyvlOZK+9Zf45Edpysr037cZAGmnPLQD2JKLlKweQvxRSrlD25lGGFRea3smIbcgyZz0wGOPilsoinZdhD88LktDgoJVhhb1DwEtEI7xHBD4RdntPCAqURdwEkWTcR7;25:qmP8+hcDpVLkxkA2JeYWZobTmuyhgSI7HD1tj3PRLgNPgHpQ4Vsbs90HUB2Ct4hQ5ck9qPykd6DvLF7XSz0OHHj+0NahNgsji+qB1oC8gHnwjoGRGYEbOKOb6ATB0xQCK72IOOHUnO0CibxyyLh/XtqSXcST5dUrSavSJu/LsON3N6pWcgCFCPSH2MJF9eHIah8c/Qm/7lWZD9EzqmjfscVxF5A4xwf9HgXB7UR21t9MZGDhEWyM18cw6IAZcZEePa7Ej/17gdPUluirpkU2wlVzpz3cNrZkOIMiw8UE6qMUZ9xjArMK/VbxD0MzG0xavHNmKZMJZrKFcfChdQKQAFJWlMC2R2hLmXJjWFc52Hw=;20:6f5/mHzs5BU+Xx1haeCLzkEX74B9HxxTykeC+5joXODT3Ieg6zqH3f4sZZHZlUFPuzb2hqyL7M28u5JpKJ4GPYP40qwz21Q4xs64UuWaL3PJFwss5trjKSf4teIfmfracOjti0qMsf0N3KmHdZyOgLImDIjdhWxBVx55XCThato= X-Microsoft-Antispam-Untrusted: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1365; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(80048183373757);UriScan:(80048183373757); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046);SRVR:BN3PR03MB1365;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1365;BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(13015025)(13023025)(13024025)(13017025)(13018025)(5005006)(10201501046)(3002001);SRVR:BY2PR0301MB2024;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB2024; X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1365;4:IetJu7+m7iKvnXD95/Yr39YShmO28+wNoqbm1bFKp9M8YLJy+/xu/3f3+uDO1ElwlnyecmOAhUpV00qC/3kdkGEcMrF/tF983T07HTuTTQgxWpwchAeE7ZCtRLLDUL8DB6UUYKeAtDBgu5mP/A6WYfDAcdEIp9dipZMYonrqxydKmZ4JxQm3PQVoqTyoV5jebrA821C5AawkmYFgXrqpTfhl51HE21vxO1Z2FS8Z5uNeITei4Lo5F9O0W5cwrO99ycr+o3V85P0SigABOKxCyaZ6cU8TQk0IDsQKQ+U8m3bMFzxZtFneWEiL+fDoD//PY6MTSDJtEnWu/q9VyCawxqvU3ErqyGP4tfWwV46Du/4WM3Z7Yt+ozqzVdfruBIuq1Kx9rYLt79KXDIaMy0E8Ka0Dy3StiEgjYmys7L6KHO4= X-Forefront-PRVS: 0860FE717F X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(87976001)(42186005)(3846002)(53416004)(50986999)(110136002)(5001960100002)(107886002)(189998001)(4001430100002)(5004730100002)(86152002)(586003)(2876002)(5008740100001)(2906002)(47776003)(4326007)(1096002)(66066001)(6116002)(48376002)(50466002)(33646002)(50226001)(2351001)(92566002)(229853001)(86362001)(40100003)(122386002)(5003940100001)(19580405001)(77096005)(19580395003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR03MB1365;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: =?us-ascii?Q?1;BN3PR03MB1365;23:2fjGjEIAeIT4LrLhqrqjB50cLJc6WwdrP5t89F6Su?= =?us-ascii?Q?QQc6Tz+ieAez7snBP83B9+/oe44GUv0fLPHCC+T1KI4BGUcZ9duVPUatZwQo?= =?us-ascii?Q?DVhOWKvSut2qcAs7HLpff+aqfW9YlkgwrTHJsoSRud6ujf2v8bVbbtcG3LH5?= =?us-ascii?Q?gJd2KAsYD2XWv3h7FP22OzY060KtmtqRAIHDG8vqKwvbvKIl0K23OrtcLx6K?= =?us-ascii?Q?PWLRCaD1hVHsKCbjUiyOP71k++DZOmBBx57Gpef64OZc/mjIpw22q/eQzzQ2?= =?us-ascii?Q?s6LUxiMViv5xmkhVby0kgc4vNbE+bqZGbDzjioNzbf/d6gyIWGE0nxSLPWAb?= =?us-ascii?Q?JtlW/QAfAhwqL1emaboh9JIDlLa1Vr+DFC0TbwogO9WNbSiIgjU2V7ALkda+?= =?us-ascii?Q?iHEw4fe8GEhI3WHAJEoi7YGci8xC6AgHqak4UNut3j7Bg2d29yenGIBzYG0I?= =?us-ascii?Q?dfxQft9NBeaFa0kMbxy/KQy2IHjbvkERkINRZRm7E+W5ohFO0SWFMNITJJS2?= =?us-ascii?Q?kYJ/jZLf/VELMCZuJ2jH7jA5eHzso0eJl9/znBThKp1zzNxOv1pxugI6Hvs6?= =?us-ascii?Q?CX66YFDsuQpKYATW69bNr5/wl7NF1fd5ThHw6jfCIE5BEbVdzv7WBfyWA1kL?= =?us-ascii?Q?mZrTTASGLA0PkIhbXfWe+3R0DIKRgmdreObIm9ahzPM9nPAtop+Pr3JDz8K5?= =?us-ascii?Q?hp2Q2Z4rdRwRB8oR0RSLfOfWM+eZ+s4lLFvTHFPnd0Ur/tW/i+8tgMz9bjze?= =?us-ascii?Q?sDFi8JATmZKI8JCFgbVIrogfYx35deJHEHA3h/dLG0RM+tPvA6NVOkkgGnDz?= =?us-ascii?Q?hkC0iSHJLTW0GZMdQV6KAVBXpzRrl5OtaqTwI+SRmzu+qQ0tgLG0tRJb5fKJ?= =?us-ascii?Q?80oaSy0KWX7SPOkmxyGpVPk0zg1gt//33qtg0Q6vG1f1UJg6MfZBTISFPeOt?= =?us-ascii?Q?9lXfcpCesnw9AKbXKD05AgqT28Px17Fh+H9VV5EdZproCMPZO5iNctti95yE?= =?us-ascii?Q?5ncHz5qePVPRHmq3vGycZih?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1365;5:Mbkkp4AjMqKMpLfVgDgOhNkr9auJGT5uounc5U/mAu73NSFlcv/S67sSAVoVVsLr2TQkINTKPuAyEaWopXc5M9DGASJwgaxcMjoUILY3TYFeE4n/mt3n3w8OTIRVVf8ZMPFNreTJlHrH4RNSwkCY9Q==;24:qu+0oobI+yMUQ0l/KMhuGS9mMcLUgS/XdHMHV90UxasmzC2wq99eljBZsN0gTFhhHOap8DdcW+FQYdFP826bBsauUyk0IfMvMZRjhSWfTmo=;20:gFicBlvgva4iuMDo1uQAmuxG8Sv7OcYLHo+4SJyMPILHRuRziuhfjoFhUte7wa7XHYQHeteJPdNybEKemuDGEwTBWUkPbFQkLCd/AVd8/JAaFEAl7iHhzpjmxAGd8SG0LVaPU8GylEWtAN2czg0FAbSC2NhqklHNFWVIsx28zWY= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1365 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11FD055.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD055;1:Wy507n2pZOcvGdAJYwhhpAA85X/TKx5AphDpuUm/jo7YEdCDfEVN5JLQtRpFIPoFfy9e7OlK81Ad0EqXxUVLvQ/I5BIvqBl9zDMhZuSgpFBiu5REOGTKJrfQn76pLzVMFOVcsSY5fJ9/UWLOUB2pHSULm48QAOcOpwnzlCaP3pjHuJ8RFP+gDhYIdaWH+ccWG0bbEEjh5KxYp8dQCVKx5gEQq2BKEBKJOTjkup+3LuF57aKyHMTuFwnbvCF1HTZLgtjYwbosUQxs25yt6WlSPzsrc+v42E7XkC7cZ3eRkxXXNsJc2yCRt8cN4sUOmvqTQo6wV8HLFKzXhkQBCbbnva/3bs514vzAFqdxU6aIakMO6nNffdnFUVTuoQq89nQZucr/xTSgJrAvV63JZ1MEkFx5izhRvicf5XMOaqOSgXE= X-Forefront-Antispam-Report: CIP:66.35.236.227;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(1096002)(87936001)(956001)(3846002)(53416004)(3720700001)(50986999)(16796002)(6806005)(11100500001)(105606002)(110136002)(5001960100002)(107886002)(189998001)(21840400001)(586003)(4001430100002)(66066001)(86152002)(2876002)(2906002)(5004730100002)(5008740100001)(47776003)(1220700001)(4326007)(6116002)(48376002)(50466002)(33646002)(2351001)(92566002)(229853001)(50226001)(85426001)(86362001)(40100003)(5003940100001)(122386002)(19580405001)(106466001)(19580395003)(77096005)(7099028);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR0301MB2024;H:sj-itexedge03.altera.priv.altera.com;FPR:;SPF:Fail;MLV:sfv;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB2024;2:gBBTRwtDzqxfHQ312/l6mli8B2BPhjReXeWu5MJxYQFyssUvS5qf0ywUXttKM/zVCdSVx74Ma2vjP8VuniP+nXAggY8JAI/5R4z3dQGXpNMertRjfBTvsoxIvmoBplQK4y/id/jV69az7hporTmrl543nOwe50U5s0mufIhP0oh2XAf6jbH2x5HEuY6JOuvh;3:87aD2nm5lN6ciu+hmuZZJFUrr/1GsRcFzzxS6gGTb+VkcgcY/zkwdjmdVhnAQJFBdIy4ngTDH46KaeJmkKBcygB4VUjcFAVUzbEMiKHnKoVdQP9PlyptA+qsmloBpxEKlkf2xuED+Kq4qs1mACYiEBLItSZ04Vlan6RSqOi7saMcm7/qkJT/plFj8hEadBG8w7hdIEFCW+o9xKBvn1WCPfHS1T26FB86xpL1FTODSrQSnon9uUGMM/WhI2IigvWL;25:QLHQWsdRLwGm3XHCVxaCxOQy5ruVve6BlEvI8bamYqazT4z3V9kPIJZI4o5z5aTv76Aqp+jPoLnNh8DBnlKCrkeXzCLAsWuTxFRYxx7ro0WtDrdBNbIBpCyg7Uh56Q5MDLidYOhfgVeNHUa46rYaJNiBaQbkUtsF5XaKpt/FxHlUMJjCLTs9FUJV8Il2PrSR0NADIbT34dlK4dGu+7omsP55E2CxVi6hTOQ9s8D2FIPajAjmnorJPKXV8QsLkAu35D72r7WgZyhL/0fYLiNiMEOlA8OYod9UgpUDXCoH8Bs/H1fPWlZ/qj7+hsuGplS8BfbQZXM/UB0kwJJoedVDMqCfFpzpnhS84lcudlwsZSg= X-DkimResult-Test: Passed X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(3001016);SRVR:BY2PR0301MB2024; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB2024;20:sWSi4x57W8VOSejALQVzL/ztO5BENkK7qr9gtK0sERIbxfGfavqVHn2AgFQyG0TkDJbDtc2ikBH/I0VzJCPfWbeFg+nNVaHwW3QDaToiSKApyeiaV73osWpTrBbT43yhmkl1KNsz7clxLogawTu8MAtzhEH0CkdsP9F1yw5vllc=;4:v/jtHSd4nCgfNBDWBj6lUWEq+KmYJxs7n6iberR+O50V2k7ZJgk8iMZdSdWpkXW6Hf4zziIvM5GoG9cxit7p4F3w32ZH3dTATRl62mzGOeB9CA9lBumpqzTduktX0xaH0tR2QU4jD7pIoUPG/NQn19zIZL788gC6T6xJg0gLGR/uaWS8/Y6gQEJuKhexHoHb+4pyMJc4x19DuQ7r7L7JWs2ywt3C/psDbdH3qPFtCOOUJy1eNHKWfRlJgdFLifEze3pys5oiB2jVRDwFt3ii2MrX27BPPnx+eeHmH3KBAF8rtBjLXI+rROTu4SJ9mXDK73nlo8M7RSsUMR+TfgOCbNCkAghyqA6ogK4kPd/3zYnTumr8rfXe2v9HxtZ58n1kPUqvIqnTaqh8Ku26e13rs2w/fV02Bka52un7XMExgKXumYK/lWH1tSgsWhL1bd2ZAWq0N6lWpGJTq0R80s1G1dCJKVvc7yX07/BvJaEPLi2Lx4e6cOCFJv0V/DMl1685 X-Forefront-PRVS: 0860FE717F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR0301MB2024;23:azVyVl+MXqgL6W4AAX0l7IRXVKjlsSdIolmlzmB?= =?us-ascii?Q?e6KZwcHAUXNpvmiDo9hH6IHXBpY6ufFTNH+AjyiIIpyLPK1vX3XeCORPsh0R?= =?us-ascii?Q?fme52gfHDEAZHF7J/M9kezITGwr5Y0ILfWVjos66Z26SK58heS4h23m1N9Qe?= =?us-ascii?Q?J6Q4ux9IviqFEYSFY6NC4fBTquq7ck17A03BA3LIk+S/6PQaGxpjeVXC5s1i?= =?us-ascii?Q?L6Gu3MZOa4NyN5jF7cEo27HMyAB6dMWRCgd0xA2nx7oo1k36x0CyIvDIZ2A0?= =?us-ascii?Q?U4c0jOdcqD+SNW2t2moaSY+/VQ6TSI4GDqivXTNs43iJGLMfBHcHGydP2zxV?= =?us-ascii?Q?b8FF3rQlvn/QM9cqqOTD6v5P/V9/CYAzBbqHaF00cvn+iTh0CDSteyFnaz4M?= =?us-ascii?Q?BGZL8tlq3f8ctLE5DXdPPSUAwFT11fzrJrpLvNUaiCx5lORMRzIcEjjgcTrs?= =?us-ascii?Q?seUJcqwaIEL7cNWNLVo42enfI5cKCpTsONirt1FMHNoRDo6qO3wbP/caG07V?= =?us-ascii?Q?s3FiC+fUquhL79nR8q5+e6rzjAwyt5jIPFnvxAP4nB7WiUWXaRHnjG/3w/P/?= =?us-ascii?Q?ZA5ury2hOT/SF4xukBsLMOPcM44ynlpUS79q/MjsmeuZx+wzXXQ44O5KcE53?= =?us-ascii?Q?SzYPEobfIn1Oqzi3JIuwv6cSsfZSsSjNOk4yYrEnY4KLLB108pmvVuchFajt?= =?us-ascii?Q?kb+kW2C2XbeM80AQXYATUbw1OivqwCTUIXmJpYcd7wJh2nuydEzexfOfALoH?= =?us-ascii?Q?sygWbX5mZvBSakdO98l0kULWboAW0BjNxpPQzwG0QTgHfgLxzHSgT0JOrZSu?= =?us-ascii?Q?20DoBS1zaQgypsN/z8jr/quLnIiH0u84BkD+3oUsXZrxj30TuefxhXYkv0uO?= =?us-ascii?Q?Vw6vp6a3+DhD9SNOb/A8oHt4sgblUeWMFGYtA+45wCQjnE4GX3Io/vvtXKL2?= =?us-ascii?Q?eA5udZ62aXAFYTm79DsEp+19eiZfptE7GEHNbfZY3YxUntazhPdG42cY+KGU?= =?us-ascii?Q?2EeHjy6G6id3ixjSA2UcrCa6WBJbjUaXPKbFOwbdh3UlL7kqgPdelC2Rvkmb?= =?us-ascii?Q?2U1E+A1F4CvCG1fHZJGhDDeMq6NbArXYcZTvcXFAhY+NoiFNxg0Az+OAvUcL?= =?us-ascii?Q?/TADIm9lYGL119gyidCUrE5Z11TgX3Em3N1i2QnSrJQrcZ7nIbUigr+9lu2G?= =?us-ascii?Q?QBc93DH2DWonSXx2RwX/fiOfDrP8ec/hZgvPG70xZ5P0A7gMHywaXatsV3e7?= =?us-ascii?Q?338X9VaQNNIVgjoyJJIhRnYiJA6R9G2Caf16kYcNOSEdbC9qV/gIT5JF5gcA?= =?us-ascii?Q?4NNwUeSOMnY9hWTlvLwCvK/oIaubjVgHIOdxxHnaSJukx?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB2024;5:Wc7uyxes8YXM8Fj1qr8kVCK+Sg4jvyPmHEWCTO94yQ1W6jbpqxqeIU2Z5vLglVSw5AOpT0sZpIrbu016yqrpWlam5MonCkPtO6TY8hY3xyYHyAzw4DB/V8ePTQKMhvY/ew73Qj3fYcSF3St5u9YA9w==;24:35JAEaxEt/FZVqI+km0VOZNKHnKR1NIGQ154I6DFKEa8rNdjYhFeuDUceEHUbQKt/yW3Id7hEVr2SkdQjWvmdTvXLLy0iZw3hr2AjjmUk1g=;20:1bMqhD61zJCQ94jjADM8CleRrvlORTVnH0NjjgTY2itjzZDOvUXD3u5g9WDLS19RxLwgQaILIzy3l0alPuZg/SqXsBZ8MReHfDQxLR7v33MdKhbU/N8pFQpDDw0zkNTyk15SkKJGzUkClgTxm1eAB8Sp9jbB6yD/RrLP9cTybsU= X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2016 20:00:42.3694 (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.227];Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB2024 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinh Nguyen There are some Arria10 clocks of type "altr,socfpga-a10-perip-clk" that can have multiple parents. Fix up the __socfpga_periph_init() to call of_clk_parent_fill() that will return the appropriate number of parents. Also, update __socfpga_gate_init() to call of_clk_parent_fill() helper function. Signed-off-by: Dinh Nguyen --- drivers/clk/socfpga/clk-gate-a10.c | 5 +---- drivers/clk/socfpga/clk-periph-a10.c | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-gate-a10.c index 1cebf25..0b6ee7b 100644 --- a/drivers/clk/socfpga/clk-gate-a10.c +++ b/drivers/clk/socfpga/clk-gate-a10.c @@ -167,12 +167,9 @@ static void __init __socfpga_gate_init(struct device_node *node, init.name = clk_name; init.ops = ops; init.flags = 0; - while (i < SOCFPGA_MAX_PARENTS && (parent_name[i] = - of_clk_get_parent_name(node, i)) != NULL) - i++; + init.num_parents = of_clk_parent_fill(node, parent_name, SOCFPGA_MAX_PARENTS); init.parent_names = parent_name; - init.num_parents = i; socfpga_clk->hw.hw.init = &init; clk = clk_register(NULL, &socfpga_clk->hw.hw); diff --git a/drivers/clk/socfpga/clk-periph-a10.c b/drivers/clk/socfpga/clk-periph-a10.c index 1f397cb..2b7e215 100644 --- a/drivers/clk/socfpga/clk-periph-a10.c +++ b/drivers/clk/socfpga/clk-periph-a10.c @@ -74,7 +74,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; @@ -109,8 +109,7 @@ static __init void __socfpga_periph_init(struct device_node *node, init.ops = ops; init.flags = 0; - parent_name = of_clk_get_parent_name(node, 0); - 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; -- 2.6.2