From patchwork Wed Apr 19 17:44:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9688439 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 743DD602DC for ; Wed, 19 Apr 2017 17:45:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A2AA2815E for ; Wed, 19 Apr 2017 17:45:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EFA128387; Wed, 19 Apr 2017 17:45:35 +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=ham 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 0ECB72815E for ; Wed, 19 Apr 2017 17:45:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968693AbdDSRpc (ORCPT ); Wed, 19 Apr 2017 13:45:32 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60875 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934520AbdDSRpU (ORCPT ); Wed, 19 Apr 2017 13:45:20 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0LeAyi-1cFSUV14iC-00pwc7; Wed, 19 Apr 2017 19:45:11 +0200 From: Arnd Bergmann To: Tero Kristo , Michael Turquette , Stephen Boyd Cc: Arnd Bergmann , Tony Lindgren , linux-omap@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] clk: ti: fix building without legacy omap3 Date: Wed, 19 Apr 2017 19:44:56 +0200 Message-Id: <20170419174507.4055014-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170419174507.4055014-1-arnd@arndb.de> References: <20170419174507.4055014-1-arnd@arndb.de> X-Provags-ID: V03:K0:2BtCUIU2+fJumcV+kK44gk1ycaNdcQPrScyVq278j5BHl1m3TJs +idtQUc0JTGilgkj1eyOjsm9L+RgLDozLNBW0uyXzJGiSVrTC7iHaj+B5wz8uwg9rHVWdha VnYEs8CYq62l66ielC4yNRnkK4mL8dg913A9P3kxic2bB+E9WO3X8/o9RErqoOresvuvUw9 4iCdWSOuK/pSSmNhqXlBQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:xBa0BqYFc48=:8q/Hl26US+WGaL69+gcCz3 sVpIuQcRW+f1k1gAVPc0DyVQDyiZzF9bPPMQw01/fc+UU2eZ4Iu5rDrv1u1kE2NTAxZhcbMp6 BBMRBFIDkpyCN3xPBDPQJ0iiYL7tW69K/RAIqsK5cAa8P5WS5LMi7tP2KwRepOg9ms2D+/Kbv HNd/Ti64SPZnMDvIhwIFMmrn8cPJfGKuSEEsp4ZwA0NJ46GFFjNocs+0vQslcxNvvOAdzJjU4 ETxyrk/yqFgQsRmFTW8KkTSgbi+i/6zx9TnOeuOxKkcY0RHIDNr4ERDjsQzCK0LhnVx5XwtM8 qkXi5kfh4aEM8uiJ/2gSMXB8DH2TEZtevTvVXRKEX+KqvGZQyoN6NOQc5h7rjnARm3bYxSV2N Dnir4NlmtcdNJ9A1qtHRmTsHheK/1RhZpV5h8M5A5UygYXXgetnHn1O88cG2PMocVx+JcbfTS Y1Bn5aHyBIOwp+AvxEi+M0nVyMCe5/kOEjTioaswQSpEU3qc3D+6R1X8ewgZUHF0VOLAb7G0Z Zfh+pDdp8Dh1fzvq/pvd6jWtQRYhMDuGn1/s3rWO3ytRr+FHxT/1JL2nDnAuJrR56myRmLgQU mW8eciG5ubpII/5UhmE87g4CxuovDHM9BfaJYitdD9pkd3lSvjTJcTBqVMvZF8ssMOTjgUVPo cIUACgPaUcpu9pgsNBL3jQzMmU0WMypBYbYInAYijNcQ8hU0u91JoE8vUVIO19pzH/Ao= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_ATAGS or CONFIG_OMAP3 is disabled, we get a build error: In file included from include/linux/clk-provider.h:15:0, from drivers/clk/ti/clk.c:19: drivers/clk/ti/clk.c: In function 'ti_clk_add_aliases': drivers/clk/ti/clk.c:438:29: error: 'simple_clk_match_table' undeclared (first use in this function); did you mean 'simple_attr_write'? Moving the match table down fixes it. Fixes: c17435c56bb1 ("clk: ti: add API for creating aliases automatically for simple clock types") Signed-off-by: Arnd Bergmann Acked-by: Tero Kristo --- drivers/clk/ti/clk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index ddbad7e8d7c9..e5a1c8297a1d 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -371,12 +371,6 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup) return clk; } -static const struct of_device_id simple_clk_match_table[] __initconst = { - { .compatible = "fixed-clock" }, - { .compatible = "fixed-factor-clock" }, - { } -}; - int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) { struct clk *clk; @@ -425,6 +419,12 @@ int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) } #endif +static const struct of_device_id simple_clk_match_table[] __initconst = { + { .compatible = "fixed-clock" }, + { .compatible = "fixed-factor-clock" }, + { } +}; + /** * ti_clk_add_aliases - setup clock aliases *