From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755890AbcBVWAt (ORCPT ); Mon, 22 Feb 2016 17:00:49 -0500 Received: from mail-bn1on0079.outbound.protection.outlook.com ([157.56.110.79]:51855 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754469AbcBVWAq (ORCPT ); Mon, 22 Feb 2016 17:00:46 -0500 X-Greylist: delayed 6325 seconds by postgrey-1.27 at vger.kernel.org; Mon, 22 Feb 2016 17:00:46 EST Authentication-Results: spf=fail (sender IP is 66.35.236.236) 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: [PATCHv2] clk: socfpga: allow for multiple parents on Arria10 periph clocks Date: Mon, 22 Feb 2016 15:52:46 -0600 Message-ID: <1456177966-5839-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: BY1PR20CA0026.namprd20.prod.outlook.com (25.162.140.36) To CY1PR03MB1374.namprd03.prod.outlook.com (25.163.16.28) X-MS-Office365-Filtering-Correlation-Id: cf8af267-7eb7-4b4c-dd87-08d33bd39d06 X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;2:6UCpaQFiycitffMUhXgNuy6qn2chCqxsrGgjkvzYFPjh4zIr2FRkQfZpoJeUxbVjxHqVqT2/v0Fg5WHHaQ3OZVkBrqOZ2VsrjcEHnuwFUMKVsEI8DMH762W9Lx3rgJq8jeu495MyySKJbFmP5hUyfKotmE12wgQT+yDv51PsdY+Dql2Yfo7O9GKj+yvYAB5+;3:GEjSUFHksC1f6r8TCJ1xjF+uoCGcxZ8RmrZgs+mPFt4+fYF9ZjEGdaiar6ZG5zEjOgDM2jnM3bx5+oLeaamuW7xqI8OTNlB35hFj8dgL7ob3LgG3AGQ7pBgLwMc9TRC7;25:eEjeVP/fl0HCY+9v4qSYlkWOY0BOMRX+bnTFU78Hxchq65vgom9qJhTe06d6jGHPRpP0WwKVjHpOb0aSckGvZrUx5MsusjVfDrnsPFPI7hpJlXoKCc+xNgjt619Wy7/CEOAGV4S9s6NDXfz17tLgpuUKa824NZnk5cKdOKxaAdgUmeI26OCcJLOG8MTi8qhbidaJJNhPCYEm6iZtu2WbnwhceOfsB1spzBCyafkG5q6eOCnuHW5KSsS7gKTB9Q0FY0MMWekCUFEjFuTutjAUiGCU0XsFf5ZP2nIgjVYhUT4Pmv4+yaIjIHUmCKsRFLqc+3X6l1pg+ePONEGagSL7tbM6wbIN9H3MEgoKbAtv4bg=;20:fLO63pUQ6BS1AqcDWbKQF8ZZYBN9KEPNO8DyMe1cNZxvFfKoSK3pn2G7m1ADb4olEXpbk+qaORBrNbnfB9GP3zj0/5VLmH/celVCo+zdXRqDk3c8h3S66wKJwfkwCuW4lUMXiGk8KMbGh32dcA4/AViGtmenxvLnCNyDojfuPpo= X-Microsoft-Antispam-Untrusted: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1374; 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)(10201501046)(3002001);SRVR:CY1PR03MB1374;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1374;BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(13015025)(13023025)(13024025)(13017025)(13018025)(5005006)(10201501046)(3002001);SRVR:SN1PR0301MB2032;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2032; X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;4:sNpQhwZ37o6sbHBf0hNALclqOi2lKwPz5vAyBJgvgEwSlXUkU98elnQ7EnQII00+w9Ny+6dIFOXdpwW5khi+qwpO8sDUTKwt4zMH5MnjCWJ7JkVamUSdbQXBTDNre5eETfA++q6g4VMjBLP2anb4mZFE0ix8NroLmkOGjWKGvrU+MHGTE7dRN4UyKzrib2jix3xK8j3FAv01XHMU36QuhHblw9WPALas59FkbD8w3v5bEKC+mFEvrQYHUfzGsSzeKB7Ifd/3TIGZ78IpZWZY0sc0F2WLrJ839N2qvdaJIZFY3YYldgZebvijm+XX5fiSlTI3h2s0Qhejdm5nu6XYPaLraA8L6GZexrAfdx7qI19nycmVKGIW1QZvcQxnQKH/eHY/vknQFCxc7cd6dExYv04si0acjAvT2BGfSsFiPWk= X-Forefront-PRVS: 0860FE717F X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(87976001)(42186005)(50986999)(53416004)(3846002)(189998001)(110136002)(107886002)(5001960100002)(4001430100002)(2876002)(86152002)(66066001)(5004730100002)(5008740100001)(2906002)(47776003)(586003)(1096002)(4326007)(33646002)(6116002)(48376002)(50466002)(50226001)(92566002)(229853001)(2351001)(86362001)(40100003)(122386002)(5003940100001)(19580405001)(77096005)(19580395003);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: =?us-ascii?Q?1;CY1PR03MB1374;23:WSBwxdfuuIfws1S373ycY6sa4rWhRwgx3VHHCDt9T?= =?us-ascii?Q?uVrEqS77os5eqWPqjb09LycuAQq3eABvLdtr6K4HLKA+6RHN+O5k1T7j00Mg?= =?us-ascii?Q?s4mFvGpGdMdO9NF2EAVxDcqpg5Js88cn011FZ7rys4CPDrbX6YOt9tFG2zpt?= =?us-ascii?Q?5llwxKOtIOmglurwTn+e4zwE7Ux5tbLP36ah3RIgcgg4fxJ+RhOn7Q9OSHbJ?= =?us-ascii?Q?sH7NkoKDmuC3QmFC0/tKU/m2lM93aqfHT/oVdKoV7OKPKPr9nvMPtOZwFd+9?= =?us-ascii?Q?4Lu6U2vkunBRem8P4oBoujMpgWWfgnNTBq482DbPEBEiGdaPnBEPq8DhSOGh?= =?us-ascii?Q?D1HC10CqEkAfOwfl9URnBxAH0afRzB8+p0EOEBhWNODXnAbb4YEE3wugZR/T?= =?us-ascii?Q?Od/fhkZOARGj/AfJXcDkuzqWKP6tBpzXagwQjo7K+LxRbS3x4xh6ZgCBET/t?= =?us-ascii?Q?Pa5l1AxauV7K0aWxXqx6+v9N/y7/+R+ksyji3aZi/DqYUaeD179RxvcxTFEo?= =?us-ascii?Q?WOZpLnd3trW2PjnairafXVfgoRBrjiKNPmOPiHQvIhX8k4ANQ5FAx0yZOX8I?= =?us-ascii?Q?hw1ZKCqEGPGAPlxOwt2aTe7UH04lKRKGB+seeJYef5TG5rbq0NYq+aTFtU/T?= =?us-ascii?Q?N/ScpuZQKY33EeutScHrwwabbzVtjJGerpDS3ffutuga3yJHzlIy7wFByjlv?= =?us-ascii?Q?H88NYFvh8DdsmLZQ+KMd2Ld/qssA3NfucsJIfTxxIP19eLv2P164VdHoIyTC?= =?us-ascii?Q?fSLY9Ui0qTIiFEQhPsRMgj0jDoNQQ+KL7BIfh9KUu0wGJdSvttcrPX99Z9Fp?= =?us-ascii?Q?EyVCgYXTeWp/JqoEo1CO47c+d/HjVd2WEeYpWi8Ht7Lmg6vMNnnn/NvPIrYc?= =?us-ascii?Q?PjawSa37w0Z2UZ5lnMfgk8iGOssDiUjXSJ5JwK30iwboUNzt9k6WUBghKvqi?= =?us-ascii?Q?oIlqB98ac++vaQ9ik/lMKSVgkvrX2E7XhHxxz6safYCmUhm+Yu89pK86emKy?= =?us-ascii?Q?k9b4Gcj5nRCBvPLau4Q4Msy?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;5:69SySLIXDYW3yQLwkkorCVal5I2LkB5Nrwo2NwpfHwd6a412b0cQEhb54azQdXI4ywy/sIuMhJlM564uhan6WYGVDama8qDWZqDzNwU2w26vBF3rRN1Ebjy2vTRCTkqotMNUqeX/U62Bhuri//x6XA==;24:qR53cGpAz+F3muDJMjskcFwm4KdvOxX9RIeKoStQLUS73B7rz+vfioMfr7aMzTCnWqPl6mHC7gLLZVrxYzndI/y65mEqIkO9qeyg9Ww88kA=;20:21/I+L67qofD+okdtv2u7AYISN46LGCJ5XIwpDenZik6rP8rZZG9RrdYtxlNrOt/Rv9S3jlQGaBeQ9Zb5R8vf4cQ8uCrhlMRquxrXYrm/ru+0Czyj3W5lhED77LWSHMeRxDEsvvq7sF/dVhqh2flkXiS6rGdYVbID++wjhjUt2Y= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1374 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11FD047.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD047;1:UaM8/bcvgt/VT3g0S3OpE/NAoJ+eBbI4w78mi5/gh4UGeKF4a83AsKeaddS5Dpa6zqeEZlOugvEC//bneYT5pHW2gyssT8ksJoiPFoq8uu22tp0S+mtHYGUFEbwYoetHJRGEk3vJvSiMgcKBsQmGNSJGqpcPUsdhQ1dAa3pGtCBP3bFlv6TNMAVIumenbr4x9wlouyjTQ8teQ+xsSnKxT1cWLpVY05nW8sZ2/PAgyc4N5V9izYGbDpc+fFI/O+TxCPf3+u8fJ06Ds5USUm7QewjLWpabYFq7KiLB8QJi1FN6dRsLeLBRe7pxe80U6RgpB/xFGfxrvrdlMm1qQo56uK6s7ebyOPhf7/JxPcK9rBpfLfL15mHHrcE3GUD22uQq5cRpJthq+LMsUG0xylykHLYG4Tk2sB2Yzp4sVHrDqI4= X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(87936001)(3720700001)(956001)(53416004)(50986999)(3846002)(189998001)(6806005)(16796002)(105606002)(107886002)(110136002)(5001960100002)(4001430100002)(1220700001)(5004730100002)(21840400001)(86152002)(5008740100001)(2876002)(2906002)(47776003)(586003)(4326007)(1096002)(66066001)(48376002)(33646002)(6116002)(50466002)(229853001)(92566002)(2351001)(50226001)(86362001)(40100003)(85426001)(122386002)(5003940100001)(106466001)(77096005)(19580405001)(19580395003)(7099028);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR0301MB2032;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;MLV:sfv;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB2032;2:vdjzJ+y2QLThwvlJ/D18YJENyZ90SKEUNR+3IXewsF2XIjhuuffpgfAM5IiR4PtaxhpxXeFtyJvEM8lSAriw0scNH/ppBcdxr4KhcT/GSvlfYpQeylhTY9ZB5M8uw1v2R0Znai6kJlyhld+ywhbUPLmm3UgCFsOydpP1+Dwr8ndZo+U/MEA/2qhWFYAJwy64;3:8mO6l35yNfznqC92gUJop70LzmHhgUuIS445IeiCkmZlZY/4ow5PNdTLm+6KerZCSsbK3bF7T3fPXdSiZlw0WeGPUDcF0M3ThrLgZBT3RxnUoz/NUxdmndwWRFTqSOrWnkWC5o0/0qsOYcwMnyWcTZv3KUwn2Y0UQ6nU2AC7vQUEZ2d+N5xvCMa04F93V5ZlgrHsHByb4zAnYInZGd+7NrBXj1WoFi1b43agPukss3kcDiqSJdHut+IDy6vRPuG6;25:C0LNn6JV9vYB2JyWo05sJkrGKcejLLtEQv2RrQPLW+NkIBvKQjVgWyIKhKwDSugBG1Vatqr99V2OaS0J9j9VXbgLhA/mxE8l07swH76DvYj57aisRMT6bg0I6Irjlhzu5m8nLQoR2Tuw7An6LWbwrnNpmnfk31yCAVMlR+WFOHBiSEWcxHIdA8yhJlRyg+L55z4omXVuWp+FKA28nFdWIotPd5kfxcXmb/4++VAr8puJPn5v8xgdkJQtAp7i9Eyy2rNVtsSxCWafkX9V86f+SBiSmnnpYNwNoQxgwy8tHQkk4ccQoAvqsjBZGXy2V9PCL+mY+UjcMl/+UPtMQdIv1Una0OI4sf/To5svsZeuwr8= X-DkimResult-Test: Passed X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(3001016);SRVR:SN1PR0301MB2032; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB2032;20:DQUCdrnmbWGPbDm88GnNQiPl0qWMmkFGDS46UaJ2Uu03C3TMVj4GQYykiYAD81G11/v9PT8uZoInuVAPLpVWLxDm7h6GihHGr/qRoZspkyaDP9JDODPUtm623M5AHq1jx94yJVSWvxkgzNhkdGj+4qP9zK0jhR7PzDyt7CKVCBU=;4:XX+segEuvOgCDb4t+n6pSTMldMEpoesVFeCXGrIiqJCdOxgBxHs+ViMQmCmB6Yi442aUtQdDF40w/YhVFIwZHUYa2IVJEis2Lo2kBvWNowgv3fIluFMyq6P3xNG/5PUU3JkjF8ii7Wa7WpLHpzR0Eqw84sAnBvfj+TZ+28YT3PiCVRyjc2Izh+RG3PaD1QdLUpEapN/xouHjsTX+LAItK9vQvuqufeE7FYQJeP/ZXraLxErJUjb6Lc8TbYjaTSa1qNq4ZRjyNX2d3lVhy8pkfWeD7vhzDywSVu4P+wvKDXVAP6xcKW4xnWRLeCjFqY6QEF2gVMgE8SK+sfBnG22O1cBoltPAZ7x0cj84QnZUYFFNWtGakVMh9tt/ppPa4M0OZiYdDumUUdzjEBmVmVHmDCVnrpcv9n7PsWrzPncmEzjyQqHMRAen+hY3c7PuBFGqMqFGn7SQ8euWzmvK9XpMMvxyO1jo1NjHFkqpZWWWubP3TtYqeONQV8Pz/PqpiWjk X-Forefront-PRVS: 0860FE717F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0301MB2032;23:Nk72/WoVt8M6xqewzYNbVSEIvyIV2+QOL2b4Eom?= =?us-ascii?Q?mO4mN3loaQRhWRGdc3F000pHTTCO8Wihecjee6n6GH2lGuJGmPUMXfNL7Eux?= =?us-ascii?Q?XsMMKgpLnD6pr4/7w5gou7Z8t3T3xzAAOhvicMFHLQuyUlgvEbXj61x+FJUb?= =?us-ascii?Q?DKxl3tSWst7BmfvLg94opp19AIG4v3/yPb356e1PUJpDpiIzhA/EK7kwX9DW?= =?us-ascii?Q?Zfj8eYmGGZs5L4u1lfaoTAykjTXLj6ELEXLYnd5RRi46oBvQIR3LMQS2/iRw?= =?us-ascii?Q?fVrPibKfsjfzXTW/AIo4mvx/1datPsvcTCBRRQl6m4yIFFTi1YIVCwsea6AI?= =?us-ascii?Q?pwUqPDFr33EQDiFnOXo+nKdOrhQY6oTZ3EjjZLZftNyYCnW5pK7R3wFmrDPC?= =?us-ascii?Q?2Cz03qg2r5C+mm/OI7vPpBmhpQX+Og6CzRYuOyOwlrfAD1I19Ui45qLL/eA5?= =?us-ascii?Q?qs4f73qGadLvnzNwZ6i34Kpc/wpDQkpkHz8XqM7i7YCkM1ihKCvUOT3s7IPx?= =?us-ascii?Q?QeDlKRNnILIDzx6JdNNaf9Wmk5zuIiiipMtWL1JBIwKn1ZZ6W3PZuW42GnIj?= =?us-ascii?Q?AJ+FlJ80oNA+Q4zEwwFZHyZrrvLG0o08z9kizVzEl5QhFpdB/zzp1JEbDzeV?= =?us-ascii?Q?b9bbzjddFjmiY2lLVX7tfPlbRGHe2Tu53n0MziJphCYNzxGqj9nEyXsD0Pgr?= =?us-ascii?Q?5YquOtyhfUDG0iAIdOOf6K6+KA3qIcJM2x8lisYtXKcYVUlucSwY/LsaVMov?= =?us-ascii?Q?5QHQwkxRRh5weuBFnL07qka14eSlRb3bob7XFrfvHMRV90JQTNmJDP/hrjkB?= =?us-ascii?Q?deIVKaqK4kfPmPHwn3R/oRYLcKNOGy/+83DvTXfMhMvYkgvwvfVimejEOPn6?= =?us-ascii?Q?tbWr1d1WfR++h71wzlU5IgfJo31XwTwGIZxyA8eO9MEkQm1EfyG2EZ0/94Ms?= =?us-ascii?Q?FsfIGupnlaEbYZ55MyRYsL0AMl9aqBl7BqoIEJxKqwuxRZbDbnuPEkkuLVHB?= =?us-ascii?Q?SCibzGnAYdoVLVK0Rd6LvH0jzZDCym0dP2uvOiVebIIcCWfoj84jnuEYNIj7?= =?us-ascii?Q?Y6Z9Id96s23+7Fk83g61ZYzlb+nkdv5Y6TgNZ757GH0Po58a8CVFdqnYIErq?= =?us-ascii?Q?CvxQPgP6dFlXqm+6pYr6xkHAYdLzuy1i0MpwCmz1KCw2Zgz+QuQrdXMfsrRJ?= =?us-ascii?Q?2zFajduMDYyKdXft4K6OQrq4Evqf5PWzaZhX1KzR0nrQO41XgSaO/yVOrTYa?= =?us-ascii?Q?mDrXzPQkoCDqm40frF+MknGCH0KsQ3w3kR5sRv1/z8/56IiYo9lrpum38rVY?= =?us-ascii?Q?Xrw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB2032;5:/fF+mYg6X+eHd3j3vasDEy4gwP+eGEzjzsYfX2iRN30ts+r7DbCU0gSH8wNYpHIOfyKoj5l0Vh5F4SQ/rcK/GU3FL2QU/IrUUSZB2Yc0z+xPvvd0xdCFKERydD8eKloe3uiGjqv/0kTjItoZQXKC+g==;24:fnDXJub777rAa0QluMU7qgK65xxer5pvBeGRclqS2ADqhU875M2/rSS9lBEMnn07kF37C7EoP734DyKrPrXzg2MQMG75yxnrVe9frylDiiY=;20:GQ89+L2OT03dx+ITkGq9Z11JeBZReHXVG3QaO3O2Rd/KIzE6+DbsBTAmsmLXQS7YJIIqfWH+KUfJwrv/zDAxLec0E+q5riv9TXkj9mt0rBdjgXiBzM94Yb2ZK83jqYqmW1H6wob730+lBHrrR+mrGvngq9nrForu9IPRlq0MSM0= X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2016 22:00:44.5486 (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: SN1PR0301MB2032 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 --- v2: fix compile warnings --- drivers/clk/socfpga/clk-gate-a10.c | 6 +----- drivers/clk/socfpga/clk-periph-a10.c | 7 +++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-gate-a10.c index 1cebf25..c2d5727 100644 --- a/drivers/clk/socfpga/clk-gate-a10.c +++ b/drivers/clk/socfpga/clk-gate-a10.c @@ -115,7 +115,6 @@ static void __init __socfpga_gate_init(struct device_node *node, const char *parent_name[SOCFPGA_MAX_PARENTS]; struct clk_init_data init; int rc; - int i = 0; socfpga_clk = kzalloc(sizeof(*socfpga_clk), GFP_KERNEL); if (WARN_ON(!socfpga_clk)) @@ -167,12 +166,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..70993f1 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,9 +109,8 @@ 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.parent_names = &parent_name; + 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