From patchwork Mon May 15 13:59:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 9727043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3FF9C60380 for ; Mon, 15 May 2017 14:00:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2282B289D9 for ; Mon, 15 May 2017 14:00:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 143D1289C1; Mon, 15 May 2017 14:00:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3799289EF for ; Mon, 15 May 2017 14:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965342AbdEON7v (ORCPT ); Mon, 15 May 2017 09:59:51 -0400 Received: from mail-by2nam01on0068.outbound.protection.outlook.com ([104.47.34.68]:21760 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965286AbdEON7q (ORCPT ); Mon, 15 May 2017 09:59:46 -0400 Received: from DM5PR03CA0013.namprd03.prod.outlook.com (10.175.104.23) by BY1PR0301MB0901.namprd03.prod.outlook.com (10.160.195.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Mon, 15 May 2017 13:59:45 +0000 Received: from BY2FFO11FD008.protection.gbl (2a01:111:f400:7c0c::186) by DM5PR03CA0013.outlook.office365.com (2603:10b6:3:118::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16 via Frontend Transport; Mon, 15 May 2017 13:59:44 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD008.mail.protection.outlook.com (10.1.14.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Mon, 15 May 2017 13:59:44 +0000 Received: from b29396-OptiPlex-7040.ap.freescale.net (b29396-OptiPlex-7040.ap.freescale.net [10.192.242.182]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v4FDxEqo015180; Mon, 15 May 2017 06:59:41 -0700 From: Dong Aisheng To: CC: , , , , , , , Dong Aisheng Subject: [PATCH 8/9] clk: imx: make mux parent strings const Date: Mon, 15 May 2017 21:59:22 +0800 Message-ID: <1494856763-6543-9-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494856763-6543-1-git-send-email-aisheng.dong@nxp.com> References: <1494856763-6543-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131393303845595783; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39450400003)(39840400002)(39860400002)(39380400002)(39850400002)(39400400002)(39410400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(4326008)(53936002)(54906002)(8656002)(575784001)(77096006)(86362001)(38730400002)(110136004)(36756003)(6916009)(68736007)(2950100002)(6666003)(356003)(5003940100001)(47776003)(189998001)(8936002)(50226002)(8676002)(81166006)(498600001)(104016004)(50986999)(76176999)(85426001)(305945005)(2351001)(48376002)(2906002)(5660300001)(105606002)(50466002)(106466001)(33646002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0301MB0901; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD008; 1:vAmmPfPlJLQuOYBAaGE8MvKfZtvRVFrHGLtjbWiZ+ZP80aL06+WeoYxP6nmZrNoOZDL37Zl0LjZ6V+IJgFId6Q1Kbq4WudTwQN1KZp7oUeeaAKmWtdZbgGsMSAU0f4zPLSAlq3R9lfFX9KHxwMGJVYi1pvXxA9RtbnJxcF3LZZL+YvHKGBmkjnM5RhZksn3TqLdupuZfP8PGPK88g7nMfBEth9Ul4IlqNLYoyOA9sYs10kPHKMEzjIvD3VhYLGeZHdyhpaOZx8A8/2dwkcRIzcoeU8y0R82OYGEFOqHtLriS4tUH6CgHzYfYVFZpp4B/mVC2Dt1VhYt16qxTooC6GQexfax0XSRAH70CS4wtjsXQojPhlEHa6WKyv58bvVPmPM99GVsdwq+DAryky0JK+5pk/Q5NnoN8cytL6TfstrMUyC4AtwuaqtY4BaVdOfjWuMeU2910K/gaaIS5l3Ehz2y/BPoTxejMHQHzhzuERlfjUCjKt59nJ3sK8WBImKJVXrzREV/WB+HVaY2NoPMvnh8ipDVsGJkqC/nfrpZhqPxaWk5FIFvS8xXPSOukHcETKNHh9MG56g9Mc+kHWa/1cp68lq6mnMbn5oNRaL1vyT6GkdJYuG/ioutvTM7F+egRa9whyWaf9CyH0DuATQAXJfHMnh8rk/MQzQknxfveaEpTY4nknmzcitKq1kjBe/KhiWBrmpl3OiZTW6p0GKf4SwFEmrVXH689HIwvpYHNggQ= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3061b10-13ff-44f2-8926-08d49b9aa409 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BY1PR0301MB0901; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB0901; 3:xGVk+fKgVHUHcLiW/bmoxkNcGNoa5o+z3aSSceyVB41QJGw73MefoLJhaHEC6yyCzoMrIp/i3jSudGw6KN1XxVUmVsXwajdX8dkhDUDdepQ0Y3W6aZC11DE7ilnokT58mW8pW9DJfnvVfcYge9K45LalW4ho2Pl5tO9GlkhQdO33Qmq9QKtALZS5yIJbTh4elHKByVeam/5/y+ytTjjePGyYIFgFfdIZyA9AdE+JywG2Ot8qXVmcCXILlbIy6/bnkgT31MY7TI5pH42AEu3L4ebanzQUJ2uo2/ykx33IBsHqqtZ3hUwN1h14RXU8aQqkcXLH8aEFcOYg7lb5FXcqImIQ7mcpyvWJ88FSy8CMZLZ6apPfCj2TFPfSZY0y783cSnWTah07xpWuq8TZNwkw3tGCaN51B8tEr0JMjqSthIPPyTiXbI8AgX3kDd4GTxBU; 25:g07ZEpuEYzROnGqzxUvM+KsTk0GlIMSH3FgD17bVquOmdICdyCALEUVGKaEnlYAffLnP/nhVICRlRzrATu1UZPo8dElpWRpQux80t6jxWfllj+9uAJp7/AhEm4jAJ2TNC+uEM2KL4Xx93y3qzdFUql4k7/orUrQtW7NN0WEsZuK4LhJaDqrhvJWFX7/S6YxL+RgXslm5Yv4ykcWko/AZqPhTQla3I/frllmhemoYYsBE+hyrKogfUZU0XrxZN/7h4qVfDfzNkHFMY6lN5ws9L5eYMOaXxvaD1ZdUSF4RcthrOMEd38nk+/BYBuD3CrnGFdo93kxoPhN8zRuL5NBUu3AJwB3cqcLyW8vQJVknoDkjzWK51GVYId7kxFk5Ixj1mb9BS9AXI3MEL6x7Ah3XzBdekx9c1gTB7McVQf1BmE7dySXAoIMyuO8Cz6VbVxmrw3wOyosLHH5og1c3rP52Jw== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB0901; 31:+i1ClbQ5YX28P9tj80iqknvVhB23hFs3XP4hZ2soVCXDRXrSam5EmXGNYn0viPTWlUoOzra47CoqtbTKVOLC3coEsA+32IFh9UjbY6zpK6dOHF+8a7ZLZ+dT6/UtGHb0eR3wdZ6wp/8CfJSCbta8STNJZusQQLxOSdWxpopNVFa20byvWJ3mg3Eku4eyhn8P30ZyOAVx5/GSymP7OvBK74et66AW+QHutot7oHId7SKM/yKPRvdok3Z4qu6b+XvqzLFdCjBxgxTJxSuYrv4SDw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13017025)(13015025)(8121501046)(13018025)(5005006)(13024025)(13023025)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(20161123563025)(20161123565025)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123556025)(20161123561025); SRVR:BY1PR0301MB0901; BCL:0; PCL:0; RULEID:(400006); SRVR:BY1PR0301MB0901; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB0901; 4:KpD55uh2MMohMXbrVXf0wjQ+N6yXCsj0Q1uAmg4Y?= =?us-ascii?Q?XtadalYzeriqzFJRPJPvTpPBte05/cLdXQDVGmcv0CO6YiZjuKmgfjRNsPy1?= =?us-ascii?Q?/oD9lEz+1RBgS/YB/M8oCmwNTCeyo+bGMd3iGzlqtkI0Xbgpp+XHFRtPHxN/?= =?us-ascii?Q?tFtXPd9x59iYadZsXUDkk8XhsxHtGbwjRDugCJ2f/J3rDBT7znowjFAqq0IH?= =?us-ascii?Q?kQDRhyOboGXkIeZ3jDrgSe2VE0VVhPKKO+g7klLKtVh/vHvasA1l5Z5iRgrK?= =?us-ascii?Q?uij9n7nenB5CHyJgR9BzoncwFxQ1UzJEBQYXakoqiKOd5W09adQMGQhnDf/4?= =?us-ascii?Q?yZ6PecIrKRvaXyftXa9wuI9GN9vt7xuV0ju70jQBcuRZFnaKVtbk+oQfh4TT?= =?us-ascii?Q?OPM/65ptHWQutfrOM+53SYQDPzow8IERTCXNCKP+sObEs3xcZ4hl/mPMownG?= =?us-ascii?Q?bKxk2B+S1dBtEPfxDN1LdowA3OyVBjACHnDvXd8qDTHnwscYx3w9JeAgosUL?= =?us-ascii?Q?1UBJvRj4/YJ7fyZcvyf3r/LfJLALagZKpN7b/vn5eCKkMSHGjLRmaR7tDsZB?= =?us-ascii?Q?0UgwdY61TVV9timqhBK22MZbCk/MteCJW87HJzG3ebfBwUy4Wwj7nwCPGOdt?= =?us-ascii?Q?7u7dTt/PCCXNQwar/kkyhjRiqdMuFOCqq8Hwa+9fuehi+b1mQDxUEztzeSWL?= =?us-ascii?Q?xt/hwennPVdA+8uHK2NCYywd/ECWzozlCQtjsuF0sb84FRgoUeJWLC4tNyaG?= =?us-ascii?Q?j4rqVjZ74oydmdtYQVus9aULx42tjgU71HyvWXIoMdDxBPCFrSsyKqmT+MWj?= =?us-ascii?Q?odaQozeM2C+kyak7IQszMs0h1J61dXsWovtKL1DA5KbHt8o0JTUQ1D2tQPPZ?= =?us-ascii?Q?YQ4TZZYeQrW8zIyfB2cjuwoI0LIoWuIuCkuEJViEfoJbxsORLQsJLwzkX+J3?= =?us-ascii?Q?RLlVvKm3UxBV+XLyqo9R0iGc451XyXQPfxBVq9oOXw=3D=3D?= X-Forefront-PRVS: 0308EE423E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB0901; 23:wbFHJIao7ui3D5v0n9EOWt+A/SUuU+G78f+ls8p?= =?us-ascii?Q?TOuLj7niHFUG5eoCd7grEOSV3tf26S5fDgatXwpyIRrKf8gUCX4sMTd0hYOx?= =?us-ascii?Q?ZckqhfbKYTpgrnyyuXmo5ustMYjB6u0Yk5wQ+YfCN1mOVeNKqvmrmt7VcFnY?= =?us-ascii?Q?t8hRV+7Y9oANUChTcOkSITzH8v+SM84Qf0LHBno9NMpmUIY9NUmKTs6ClDGw?= =?us-ascii?Q?32Mf0ZPYheVx2rWT/cE0glVeoFTjBjsL0TB3fCl7V7yG3wvdpSxTzjBpoWaQ?= =?us-ascii?Q?suJbqR+7lRnMRbhg2faqacMokbntmZ4K2o/26WhERmKBO5GhTBN0aYqrsEv8?= =?us-ascii?Q?ADJj0rEvHeo9QhyxkbvvE80uUpTCoPn9Ihr/Tvccsymgj0O+DpRIth9z2T2k?= =?us-ascii?Q?iVdI9GLkRGmoAJOw4YsQgVkAzA4omlq5dJS1gENPBCwd7PaenojwtoZaT/1J?= =?us-ascii?Q?1FMg1x9RS3Y2Ucqt2sGWLyXhvRO+0u+MXbicBWsWcMrlANuI7kVyMTpOFiYC?= =?us-ascii?Q?Y5FOn2tdTpkF3Si4dUPy+N7OqhE/2S6lGf6S7ijk+bK9rcGmdRJg/9xFLOyi?= =?us-ascii?Q?qy0BSNLlyQKLevy6yzc+hbGOHJPTifrtvKIh43LMNylnerSNLgx54kLz3Q49?= =?us-ascii?Q?AzQiE8RUbw/xh/NTS+uAs6J4YARvGbIRW+PpiQ61NOfQRtkook0YzHOrRvlA?= =?us-ascii?Q?2hkLYc2tQO2wQavbn/uB0BDpGze1lisfVkOxbg1uk8ravxeMOtUSbifT52k6?= =?us-ascii?Q?AzPH5fxzkX1W1J4ZqXFSOA1jBZa1OGphFhfYkrAktmxjbAGy2XUp4tZoY8vT?= =?us-ascii?Q?X2vijJPEKBixPHnXALCxLl3MClz3sZzzUsLAECzn4NL9f3NzPLrEOJm0ZrNV?= =?us-ascii?Q?UWg5RGSp/k9BmCVg6LL5whi/F9DQ8Ix33PPcQd1mhhf626Iinh+YdHdrZJJi?= =?us-ascii?Q?cdgvT3+HD4NwvIuUfQXLZyWxv8BC7rXDm4y/zMc2HVXWLneBDL5MTLQFSONw?= =?us-ascii?Q?7j7U4Ur3Ak1gRy+Y3/rFarLsbQK3oWxL7G/cl6qnGs3R2bqMceAGV2Rpac19?= =?us-ascii?Q?SMh0I4UsPlFkOurJO/7ch+zzXTF9Ipnx0F8eenI7TajCMun7C+KEvY4FTv5m?= =?us-ascii?Q?xN7EKrXPTWVk186ZXEKi2oTTAF3BfH4fk4OvefEav9T67HFOX2iQBkI+oAKL?= =?us-ascii?Q?ZPJ7NPc7CMz4b1BRq0DK0DvFpjyIWJW2/NuM1b7I11iU/vHuP00eMx/FUqXL?= =?us-ascii?Q?bAs0Sma6YnjA7gfLPS8pnZyJHYOUohumkwpYTWcjbBicF85ziOCvfsizyE9M?= =?us-ascii?Q?AHQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB0901; 6:49RIrdPwa66qh3Bd5voXn1LLYgTIXU2kY4NmnciL/xdChH3TyikpC/lZxvPXCGyCpD1aHH6I2LuVJb6CyRV/7um8lwOnBn0+eXafr8xn6l32TqTMEPfyB5moEWOM/ItZP86Ee6K01CujaFDg1myxfagpsq4RdNm5MtkvwfPMPFgjnb8H0q5IKblXvq/471OO46MwGT3OY5aNudKOMC7zukGaQ51aGWx+NQyF8zj/83dUxiK2o0GLt5IEfbNMIrVYAPkGgcp8kFWF/uAWbHkL1l6zd7kvoDEN3/dopG6w9gA9l5v7UYTcfblAfN645PIes+VpsHFVs5hr+hiWE0sl2gRCXo9RXX3SPLThmPNEfABnw8LUAJouyhXRfwyqkE0PNCR0e6Lpoi9WVxIyEgHwbz4uLqAbqsQn7u86ixCr7fZiVrnWBCjLI2Vb/2Oizcfb8/X/iIFji2G3nMtqTL8zR3Ks6ftl3CfFImhGEGwN9SGsclMi85fgzSPmvu7tLixy2eojO1khaieIsc/6uRWgrA==; 5:5vrATXoAaFdoHB/7iy4y7DH4QEUwRkwtFu1ELfKijptBBNfbWH6wE1uAHijRI34dxu5PdVoLETqfa91Oauu8pGrWZAdf6Qfc/TQSr7x8P/gKX1cOrltcqGDHlmblplyqGTJn7jSUaqCOsm0FNkHqerH28M4UhAFllRMea2dMgV79xqYeJy3QFMsAWcOzPdID; 24:ZFM5nMAwMxhww3ZDsmOYNsZ5L5IlI9GT1K9X3RMDPd8Z2P2pNGk204FI+FR9L2OS+cGEBLkLp3DITvTwpgRjxoyxibUbIdB+CT8i+mMQeVM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB0901; 7:6WUoQ69JvtC9n4TQxl0K9pQ3+iZmt0dMR02wf3CChbJeSa0zaEqRlRJblwvb/QHVruCNUmoTjfkC1a8DQIbw3jcC4W9QPpMU0yMbn3Qum3G42qZJc1JGHuoChF88zhaqmXw7sKEAulXvSqkcRqZ9867MkgVUM70xh7dO2TO1a5P2azJvdAj0x58e4yF3h3jvARG4pW2ndwB45qRYcDiJqseVGGMr0QGyF7JnVjsJn5BBOs5YyIgQyP9h31CS7P804qNCsXL1mX2Qq7gAeur0EMErbSEgh8sLzEMlCvF23AnOTc+lFJ/8Xydbvq6XHlbv8/OrpNDTbfNKp9kwfrlSXw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2017 13:59:44.3723 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB0901 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As the commit 2893c379461a ("clk: make strings in parent name arrays const"), let's make the parent strings const, otherwise we may meet the following warning when compiling: drivers/clk/imx/clk-imx7ulp.c: In function 'imx7ulp_clocks_init': drivers/clk/imx/clk-imx7ulp.c:73:35: warning: passing argument 5 of 'imx_clk_mux_flags' discards 'const' qualifier from pointer target type clks[IMX7ULP_CLK_APLL_PRE_SEL] = imx_clk_mux_flags("apll_pre_sel", base + 0x508, 0, 1, pll_pre_sels, ARRAY_SIZE(pll_pre_sels), CLK_SET_PARENT_GATE); ^ In file included from drivers/clk/imx/clk-imx7ulp.c:23:0: drivers/clk/imx/clk.h:200:27: note: expected 'const char **' but argument is of type 'const char * const*' ... Cc: Stephen Boyd Cc: Michael Turquette Cc: Shawn Guo Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-busy.c | 2 +- drivers/clk/imx/clk-fixup-mux.c | 2 +- drivers/clk/imx/clk.h | 18 +++++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/clk/imx/clk-busy.c b/drivers/clk/imx/clk-busy.c index 5cc9959..097625c 100644 --- a/drivers/clk/imx/clk-busy.c +++ b/drivers/clk/imx/clk-busy.c @@ -154,7 +154,7 @@ static struct clk_ops clk_busy_mux_ops = { struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, u8 width, void __iomem *busy_reg, u8 busy_shift, - const char **parent_names, int num_parents) + const char * const *parent_names, int num_parents) { struct clk_busy_mux *busy; struct clk *clk; diff --git a/drivers/clk/imx/clk-fixup-mux.c b/drivers/clk/imx/clk-fixup-mux.c index c9b327e..44817c1 100644 --- a/drivers/clk/imx/clk-fixup-mux.c +++ b/drivers/clk/imx/clk-fixup-mux.c @@ -70,7 +70,7 @@ static const struct clk_ops clk_fixup_mux_ops = { }; struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, + u8 shift, u8 width, const char * const *parents, int num_parents, void (*fixup)(u32 *val)) { struct clk_fixup_mux *fixup_mux; diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 665777e..d09fa0c 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -67,7 +67,7 @@ struct clk *imx_clk_busy_divider(const char *name, const char *parent_name, struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, u8 width, void __iomem *busy_reg, u8 busy_shift, - const char **parent_names, int num_parents); + const char * const *parent_names, int num_parents); struct clk *imx_clk_composite(const char *name, const char * const *parent_names, @@ -80,7 +80,7 @@ struct clk *imx_clk_fixup_divider(const char *name, const char *parent, void (*fixup)(u32 *val)); struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, + u8 shift, u8 width, const char * const *parents, int num_parents, void (*fixup)(u32 *val)); static inline struct clk *imx_clk_fixed(const char *name, int rate) @@ -89,7 +89,8 @@ static inline struct clk *imx_clk_fixed(const char *name, int rate) } static inline struct clk *imx_clk_mux_ldb(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, int num_parents) + u8 shift, u8 width, const char * const *parents, + int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, reg, @@ -188,7 +189,8 @@ static inline struct clk *imx_clk_gate4(const char *name, const char *parent, } static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, int num_parents) + u8 shift, u8 width, const char * const *parents, + int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT, reg, shift, @@ -196,7 +198,8 @@ static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, } static inline struct clk *imx_clk_mux2(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, int num_parents) + u8 shift, u8 width, const char * const *parents, + int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE, @@ -204,8 +207,9 @@ static inline struct clk *imx_clk_mux2(const char *name, void __iomem *reg, } static inline struct clk *imx_clk_mux_flags(const char *name, - void __iomem *reg, u8 shift, u8 width, const char **parents, - int num_parents, unsigned long flags) + void __iomem *reg, u8 shift, u8 width, + const char * const *parents, int num_parents, + unsigned long flags) { return clk_register_mux(NULL, name, parents, num_parents, flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0,