From patchwork Fri Oct 21 15:47:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9389549 X-Patchwork-Delegate: sboyd@codeaurora.org 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 91EB2607F0 for ; Fri, 21 Oct 2016 15:48:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8380329FAD for ; Fri, 21 Oct 2016 15:48:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77C4A2A05C; Fri, 21 Oct 2016 15:48:12 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 01ACA29FAD for ; Fri, 21 Oct 2016 15:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935604AbcJUPr7 (ORCPT ); Fri, 21 Oct 2016 11:47:59 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56670 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934263AbcJUPr4 (ORCPT ); Fri, 21 Oct 2016 11:47:56 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0LvNjj-1cx6nV2lPf-010dKy; Fri, 21 Oct 2016 17:47:42 +0200 From: Arnd Bergmann To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Arnd Bergmann , Laurent Pinchart , Magnus Damm , Simon Horman , Sergei Shtylyov , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: fix link error for rcar-gen2 Date: Fri, 21 Oct 2016 17:47:06 +0200 Message-Id: <20161021154737.3803065-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:G5iSXMrqb4oXdA7T3JReSmJd85SJxgsvtOlGwBV6EEaiaptMTBb FwnxFnXRuleb5c7cA3BUIFaOUBC4IFbebrWrr85nl4DEIv6TukoNio8k3K95eg0/lMcHKht 5Bn7L5XLMUvuFwXVJHI5LsQRzYBrfAeyl2pHVsy0Km2iCptLL9AvWv4JhKg08mUpOMJ3GsY 4yxflGfgxWMUn0wQDbLJA== X-UI-Out-Filterresults: notjunk:1; V01:K0:8cqi0JFMy0o=:JGsE4ejk1fDsvTFMjj13CU jNtg+tkmZ4KJ3zXbKB4rUWXC+rl1EQwdeYU9bRct7be3U6CWCXTzdj7I26dqng0+d2vksHCo4 YaJ7xRBW5XvCfcQPa22T7zRE7ofLo3O2yo/S3ti/N/SJFlcRaWqvglgLpZKA1w8d82NG1YEuH w+m+21X8FFCQNAUYdu/+GDq5L2bK7uAduOOyzoW1uFs+TASB38v7FRdhGWkKs0XiZWzM9/8QP qvU5J5QVdCOZKmoRl7ywRlS4/6rLaKv0xxCHJD11C7h1KkmffDhK/9Rm00fsITSzWjFPR0jAD ReyBm10KvLrD9xubpcyGu0SFPXtfqEPh2xCAdI6X6ajE73m2FpzlmxP39gSV3DLmovN8aiBUC Qc7MpRRgyOs9gORn4fYNnqHLggRDQNDz10R9DJ/Qozd7F3WGpaRsSXpAWegUzq8JMUlklqAqS aBZab2FqHGHThxdv3V5I7xFGCOfkuZqhyN3ZEEXqQSqOjC0bbJJBifSxrNWC6vZbJ7p52RzhT 0fc0Bb9LRNsTr0W5AJiewoz2ViKvi3ZKpfRj7w0mR0C93hYTJ+7WPFuFfBeCnaBfjLeTb7gfh VB39AdS4xHrK9vRiNUyAMiRHNUC02T68gAXeU+HqWJou9p9wWtZHAa6VVGgcvq8yXH8fg8NKZ 3ZphW7gWCe/sBZbyeLWWpOF9l9yMy8sAxmA5URtV3/kCgavuhfOurlNq+76BaUPdwfW0= 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 The addition of one more rcar-gen2 based SoC caused a build error (again) in my randconfig builds: arch/arm/mach-shmobile/setup-rcar-gen2.o: In function `rcar_gen2_timer_init': setup-rcar-gen2.c:(.init.text+0x200): undefined reference to `rcar_gen2_clocks_init' I think this has happened twice in the past. Instead of adding each SoC one at a time, this changes the existing list to always build the rcar-gen2 related clk files whenever the generic symbol is selected. Fixes: 1254f607fc3d ("ARM: shmobile: r8a7743: basic SoC support") Signed-off-by: Arnd Bergmann --- drivers/clk/renesas/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile index 90dd0db7d9c6..762d122eddec 100644 --- a/drivers/clk/renesas/Makefile +++ b/drivers/clk/renesas/Makefile @@ -4,11 +4,7 @@ obj-$(CONFIG_ARCH_R8A73A4) += clk-r8a73a4.o clk-div6.o obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o clk-div6.o obj-$(CONFIG_ARCH_R8A7778) += clk-r8a7778.o obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o -obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o clk-div6.o -obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o clk-div6.o -obj-$(CONFIG_ARCH_R8A7792) += clk-rcar-gen2.o clk-div6.o -obj-$(CONFIG_ARCH_R8A7793) += clk-rcar-gen2.o clk-div6.o -obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o clk-div6.o +obj-$(CONFIG_ARCH_RCAR_GEN2) += clk-rcar-gen2.o clk-div6.o obj-$(CONFIG_ARCH_R8A7795) += r8a7795-cpg-mssr.o rcar-gen3-cpg.o obj-$(CONFIG_ARCH_R8A7796) += r8a7796-cpg-mssr.o rcar-gen3-cpg.o obj-$(CONFIG_ARCH_SH73A0) += clk-sh73a0.o clk-div6.o