From patchwork Fri Jul 21 15:22:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108484 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp921953qge; Fri, 21 Jul 2017 08:23:47 -0700 (PDT) X-Received: by 10.84.143.1 with SMTP id 1mr8769173ply.103.1500650627747; Fri, 21 Jul 2017 08:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500650627; cv=none; d=google.com; s=arc-20160816; b=UuW9dpDjljCN+diaFwKoJdDCklPmqfjm4lOsccT9jmb3/QtzMtCqYV4XePpKnYlaGv S37lMMJ8etTDI6wj8k2RmTElXEBDZxcWvkj8d6t922501eRIiDPWpyOxmzJT0SIZhIP7 PFn6FVyV51sb5GY1lf1kJ2LXXKqLbZemDXKj2yGMOhjEje95MzPIGZvwIEC6LCRvsM45 H98zVoNSHlj5nV5ZbcAqRgMHBwXxzBclQ824jZHZbhgHrzoXXcivahLjKjJ2WwL4VXEZ tq9f2IyqDmjEzCe5t8FH/oTJDLAf3LdM2DHz+6KITqjWs/lgqItF5UnlO32d96BfVjm/ Lv2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=RTM5EAmsmxWIxwIha8x65H3bGHQY7kgXLFQdy89EJp0=; b=bCPinmi+TeyFdA8LCCeZK+rxBKhmiQFsYfzaOTArX4tshCEkFW7uoN2ECE79yBfNnL WdAGGX/+fjD8n8yNqdaFQMGxtxkZ268HcUQP20BbSKp+buuwEo2Kl73J/2sNi3mmjNjZ WdBXR3J4Fld0QTUvW9xYG6if21p3lU/LCNwWfRKvCAHU1hoxxbM82wrRX2Mq8GzRW7z7 drbCAf3htUBUG3Nh2KuT2EsUyLL8fDNGTdjiK9Z8bA/UQsIRcqbm5AWi/4uhRj03QduD R5G8uEnWSA+UxPn4/OOz5rU+BOFphrq0YK47ZnJrkgQhkNtagombEpSjdgdkd4Wnkq+Z +NCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si3266042ply.181.2017.07.21.08.23.47; Fri, 21 Jul 2017 08:23:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754654AbdGUPXp (ORCPT + 25 others); Fri, 21 Jul 2017 11:23:45 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:50956 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754375AbdGUPXn (ORCPT ); Fri, 21 Jul 2017 11:23:43 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MdH3n-1dGm2905wZ-00IXG8; Fri, 21 Jul 2017 17:23:02 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Sekhar Nori , Kevin Hilman , Russell King Cc: Arnd Bergmann , linux-clk@vger.kernel.org, Stephen Boyd , Michael Turquette , Hartley Sweeten , Alexander Sverdlin , Eric Miao , Haojian Zhuang , Alexandre Bailon , Masahiro Yamada , Dmitry Eremin-Solenikov , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] ARM: davinci: normalize clk API Date: Fri, 21 Jul 2017 17:22:46 +0200 Message-Id: <20170721152250.3310552-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170721152250.3310552-1-arnd@arndb.de> References: <20170721152250.3310552-1-arnd@arndb.de> X-Provags-ID: V03:K0:scemOVYwWz5KcZt0JDOxXsOFOgcN3s8/pghtL+v4UkdtsB8i+qy MwGVJA2la0sHFukYogauUcG9ALo2VCfLUKDdRMHZtWAOvoyorUPGvXgeKAUI/ETEfFOactW geybQ+YIzpoZPgdw7IJtBaP1GmaQtVgXb1k/0jTuyjF9Bhbum5bNtE451KzcwymCx4pB8wi MiI3QoJdrRds9dcAa1seA== X-UI-Out-Filterresults: notjunk:1; V01:K0:1WZvlWfmAs0=:pdAkAGPLuXMNSFVoHoKhgO nAZNeNZLbu+axnJLMCpyNJ9DwAhiFRRGJ38XVwucl0Ef5S/JBF3Yj5dyDNRHXB9wFN3QtmRM/ daXz4JJzBgKRJU14HAx/52DNkkvyGvURePlvIW9jvy/gb2ibTwMiACFgBR9+G+0jz1LPnQxLJ VXfh940drhaZTcs4VItk0XZztDmMIoJdzyMB2rBc8BYjxXEsNCd3e9Wcfi9c7yaFXjkLIZxnO lrqJqFC9h/GhDDpUl8IR+oZX/vVQqKFbmQ5uOjmtPOM50d0C91qq+bfI1miLHJdOsgZsHviwf MfsKfjGL2RSheic7kyjmfrcDrM39gw6NK7LCxkQsdm1Yh5InQGuzjBzlhrPl7aDbKpaDmAfXm t45XmJYAhMDJxqToDqkV5Mcl64Z2rA/MaPWGABd94NHmhOzJZJReCE/E681FC7HZ9uaRLhZQF Yb2I21Ua69yFu5aenr4KJPdCmYEfGMTJ1PDVWfOlLRPJUw5IoR4SPQE5KRTwcog/qtZd1Vk5H WuHCXXvREkCEjz7UAeq0v7ztBuQzpF6my58T4ETi4s83Qq3V6CV9QImnnUiiBCkGwRjsj+VcC 9PCJB1HgGgqLbEWwllnv895Wc9T+4Jayzrq7VpNHBGMvFVcvEch4XxmHOSFffH8a+H80GvTGX tRsxZ4JkQYv1M1/VnE8pHWKwapKAYAZkxUWMbs+/BEljS3+rQC8+K8pKaeI0t0weU2QM2EZGL /r9rfIRsAJCTWOeNNnICxmjCYBlyF2eIU7q9TQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org davinci still has its own clk implementation, but lacks a clk_get_parent() helper, which can lead to link errors in randconfig builds. This adds the usual implementation. Acked-by: Sekhar Nori Signed-off-by: Arnd Bergmann --- arch/arm/mach-davinci/clock.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.9.0 diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c index f5dce9b4e617..f77a4f766050 100644 --- a/arch/arm/mach-davinci/clock.c +++ b/arch/arm/mach-davinci/clock.c @@ -218,6 +218,15 @@ int clk_set_parent(struct clk *clk, struct clk *parent) } EXPORT_SYMBOL(clk_set_parent); +struct clk *clk_get_parent(struct clk *clk) +{ + if (!clk) + return NULL; + + return clk->parent; +} +EXPORT_SYMBOL(clk_get_parent); + int clk_register(struct clk *clk) { if (clk == NULL || IS_ERR(clk)) From patchwork Fri Jul 21 15:22:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108485 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp926211qge; Fri, 21 Jul 2017 08:27:41 -0700 (PDT) X-Received: by 10.84.143.36 with SMTP id 33mr8699101ply.171.1500650861061; Fri, 21 Jul 2017 08:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500650861; cv=none; d=google.com; s=arc-20160816; b=DpfFrzS2UTzS+2c+sX06SaejCSIeBoK0bMSN3/oNBW/43pt9dmpF+kL9PdjN/n/2De Fegf1htUsW/PdG06y/tALU2ONh6tevyAmxeEats/RU3gF8QFC5eJZZ1jZtPmb3wxysS+ 7AIxxB73g/dXR8Y+mOU8vXPm2BJ8pxdzZKtW6NBb8JHa+PmORAV3aRf7C3Z5/EvEWPwH Lzt48NVjfvaF87rTyeoH7KFtQgslVV0Vs20pD4xzToF+Jl6cYCN19pXFUAGgjsDDBWwX lOJD67Go2nCw/90pMQqG7/JUwVHHfYJhRdmnTJtIggaU2KP227laNeHVHuzjk3mrhBqp wkdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=PVyDABGepWuGHiebwVW5MhOMKvvEhBmnuoVaUSh0GaU=; b=Isa6N9ZiAwFCY2G7MZE487rq9uj5palp8bSHYpO3uE3VG/78B4zbMPnEh5N/6zXozp oHU4tF0wHn/i/66SjnolEd+hfarpaGFFyY1VW5E2KhcJ47wVLWuZf2cDGlGVKCGK9CzC LLKMwlLG0NKKcCYI/KDXhOwDy7BmVrF0iC6ycOcsBwnithtNLHxWK2Upjce+9tGYdVWW Te7qB28VEB507TqpgCEn9GPDdeePe4Or1t+DqW0vERgWypO8bomIlm9tlJk3wFUgiaff yccL1VjyCYnIibnrM7GsumjKVgnc9MxJyX405CfPNbLtv4OoTB5WfEr19vsR7BDYALjn Z7jA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y11si1381009plg.980.2017.07.21.08.27.40; Fri, 21 Jul 2017 08:27:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932091AbdGUP0A (ORCPT + 25 others); Fri, 21 Jul 2017 11:26:00 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:54095 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754620AbdGUPYa (ORCPT ); Fri, 21 Jul 2017 11:24:30 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MMJjd-1dXipE3W73-008230; Fri, 21 Jul 2017 17:23:41 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Dmitry Eremin-Solenikov Cc: Arnd Bergmann , linux-clk@vger.kernel.org, Stephen Boyd , Michael Turquette , Sekhar Nori , Kevin Hilman , Hartley Sweeten , Alexander Sverdlin , Eric Miao , Haojian Zhuang , Russell King , Alexandre Bailon , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] ARM: sa1100: normalize clk API Date: Fri, 21 Jul 2017 17:22:47 +0200 Message-Id: <20170721152250.3310552-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170721152250.3310552-1-arnd@arndb.de> References: <20170721152250.3310552-1-arnd@arndb.de> X-Provags-ID: V03:K0:ufcoOrO34awk4t1kZwuZ8OZ585e9gieDzq2LNQL6QwEFy3Evft1 U17Nhpp6SWovZudaoly3/htzWApDMsf0YWiL4qbJqz2eHGG0aB6rWa40T8jjcVnESx3wd5Y +jfOPg8aOlaM/iVzLHi1fHH+ihWRpO0agdjE9CAHUNG9V43ELEWUB9YM3EA2uyT/U53fpmf A8hW5MZVNtuB9qg2zzEMA== X-UI-Out-Filterresults: notjunk:1; V01:K0:dl19JW89UqM=:cKXeHiCbxZmEOQrBhFOOoO Ujg8/0BZMIKIRbu1hTjCd491RBK3a9mi9HnHDVXi8k3ozKqh8QqzyUZD75DtPljYvYD9N3PJs kXAIPYZLEY1IrgyXvRBKNEaUmpnP490xv0LxhpsgKL/EMLdM+4PbgPJe4th9TsxXIRSdl08++ EwidDPryNd38TqY/1PT9VRCRM03jkE0i0xPZ9gB+hP4iKS1Pn2x3Wiumce4X4AImHBFeQP2/j jqnGlo8gdT2wCnlpyGazQsVL1GQNfxMXRFoYnPFPbH8sVRvC0MhaWadnQZpBIrWDnLvU30UdO awGjoSuqLCd0SgeAsamIUVWCSTlBgpUjk+EOcGLBIXtzkwM89MLtPMNywhuK75XLX29mnVBng GrTX0p1Rp3r6FH5455j+yCDkjm14xXmG3q2igotoTTtiVXkhzxLvBD7/LCLIgfswJb3P94928 hPYidpLnRS0LIqNRYY6SHq0FG/JXYbNwef8FgZKdOBlvj9mkcHboTqtNQ1h2X8Ee1SiTz1rwE j7LmkertcuDTknEgj66pwMdaycpFwAQuMgCXILbQZSmt7KmMprfNEzfm9m6nX9hrDtqZvM9jr DsLRf99gdI6VbJ6IkUN7ss0GBboJU1B1RhxlxH55QrK2Ht2cd9+b4MHiCx9raCWnJkx/T0Rvh e7vTsguP7tmQL5WAdQK9k0EChXdgWKVdPEOyo3uwQ1N/sa/4j/jlo8wuFDJ6oTsjscOAZEqOD FAdLprixkzQ5SHue94ra9XuVeWj5Lrtb73F7Jw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sa1100 provides its own variant of the clk API rather than using the generic COMMON_CLK API. This generally works, but it causes some link errors with drivers using the clk_set_rate, clk_get_parent, clk_set_parent or clk_round_rate functions when a platform lacks those interfaces. This adds trivial stub implementations for each of them, based on the behavior of the COMMON_CLK implementation: - set_rate() and set_parent() report success without doing anything - round_rate() returns the clk rate - get_parent() returns NULL. This adds the minimal bloat and should do the right thing for the simple clock hardware in this SoC. Signed-off-by: Arnd Bergmann --- arch/arm/mach-sa1100/clock.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.9.0 diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c index 0db46895c82a..7d52cd97d96e 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c @@ -35,6 +35,31 @@ struct clk clk_##_name = { \ static DEFINE_SPINLOCK(clocks_lock); +/* Dummy clk routine to build generic kernel parts that may be using them */ +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + return clk_get_rate(clk); +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + return 0; +} +EXPORT_SYMBOL(clk_set_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + return 0; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + return NULL; +} +EXPORT_SYMBOL(clk_get_parent); + static void clk_gpio27_enable(struct clk *clk) { /* From patchwork Fri Jul 21 15:22:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108486 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp927116qge; Fri, 21 Jul 2017 08:28:28 -0700 (PDT) X-Received: by 10.84.211.44 with SMTP id b41mr3599348pli.444.1500650908411; Fri, 21 Jul 2017 08:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500650908; cv=none; d=google.com; s=arc-20160816; b=jlBQLt4zna/JH6LRHKdaH6QMSPxRWshHOdHpiDDlpbg9FVK4t8JSmW1b+1eb/5LocE cVEewI1VvvwO+2WGYAAfNkow+gQFFwStGGyzdkSAi1DknFtqHHjZw/Jg4Nn38YrffXor 4iJUIn7H9eLCr+fRY1Jd+sgqSe9H1guAW/CXk6AHhoIVHzONuywC+lsprvr5DJp8LO1o nG1YOV1VJ2yxhEfkJjyd0Bvm1GqnOpIiXxx7+rbqbH5rTrNaojLcxjXeycGn7Xv1sQ2J eNhEBXUuJnjkaYYAHeFHr8g7CGcw63ANP9q6quji0HGF3AyRhpyfwqn5YQ7KomR6Yg/j wSvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=SoNcmUgjXGMil8x9JdnUHueTu4SisuIM1MEVApQDbWA=; b=XFaAyumQk0FjGPo4K0a8umffzcD++7aI92V6RXXANc7mPwqLa7iy+Bkqv482QEcdj6 I44knDgYmB4vRz1ur8WpBFu/lcBF43Fz63uoHaroz2VwzqXbL94rVC0SRxHD3PkKfpd0 EEZU7BSCX2bklLgrtXJrBUawuKlnLdAIt01rXKg3YHZqV7vVMigx10lqkfNUPZTwW9Tw wMhLgK3pfTjxoNf/EQtKG+qC5abJA9RSI+XUnwvYaNfjdNl8Ycg43i4XZ+f2ka6ZyvLa DzhiTkk17oY+MRiPZ5LV5kVwTWLRdXPH4scBtNzRy7PXaW6BsXCPYq7fWXBtftqtC9GL cvTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 95si3305990plc.40.2017.07.21.08.28.28; Fri, 21 Jul 2017 08:28:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754568AbdGUPZ7 (ORCPT + 25 others); Fri, 21 Jul 2017 11:25:59 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59102 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754609AbdGUPYe (ORCPT ); Fri, 21 Jul 2017 11:24:34 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MN95A-1dWLnR3Vyi-006ebX; Fri, 21 Jul 2017 17:23:50 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Wan ZongShun Cc: Arnd Bergmann , linux-clk@vger.kernel.org, Stephen Boyd , Michael Turquette , Sekhar Nori , Kevin Hilman , Hartley Sweeten , Alexander Sverdlin , Eric Miao , Haojian Zhuang , Russell King , Alexandre Bailon , Masahiro Yamada , Dmitry Eremin-Solenikov , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] ARM: w90x900: normalize clk API Date: Fri, 21 Jul 2017 17:22:48 +0200 Message-Id: <20170721152250.3310552-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170721152250.3310552-1-arnd@arndb.de> References: <20170721152250.3310552-1-arnd@arndb.de> X-Provags-ID: V03:K0:mkEmuIVvhGeWLAtmpo+W9KlkV352JHN56aTdaDHFdYPueN3uWoi LTRHPJqOy4ANDhXm7GgxAmyz8nrsNtUKLsURRyVEKNrjTShcDswJ+jg3n8qYMmrBzW7Ojvv zKlupR04HMlDDpa9+dEnc4tOVy2PAiUJ0iopgaIdfLXOlGnnR10ZNEnQJSv739L1KDSK3X/ VBrzY1jWF3So4NRWGbHCg== X-UI-Out-Filterresults: notjunk:1; V01:K0:pAJ/R6OMiZA=:wZvBKHY3oeqStbHSidyjch GxeUVjGvVR/5It9p7NVEBTXSDpj4/ridx1XrPntBiQotETB+jKVfBpBVWSUcuv/AcGIeDwQ0c R2K84zuIKoB8YVPrK8Odd7nopo/hKYgaX1WG3HZA8vOuaPcOcUq5WKUKpsijA0+P3x/CJe7Ms PiTQzHwQHOGGyhpJPm+T5zk06x4lsXoiUTvAQd2LzUj7JkzLpBIQ2tzGEANZFGan9sbDxOSDQ YERkfvjY+baRnUzIcDvcvp6ieGCKiU9rjqJ35/2eWLVQgaT7I3Ad5dBsJRAsauaxO4NOiB6LL rsgNtn7mIo94HTk1oeQCqfn3eLZtM7I7tPiTnSpF1xT75P0/IivvV8UVZoi/bIhhHElojyfik ZTwXsl/BXFj0xJxhX3p1Wfv+QFVhBvy2Wb8JefWCsKYuRTPgJvIFj6rgzpKtYxaCtHVBz48Ie /773H7WPTzdWNzNgmM+vSQGk+U0Bj7YUWdDT36wVQyfp+UO55bdlVw0dLj/K7QbRGd4tn8KrV clG0cSdvm8cj2CFp/l1IcfJp0rAsmY02/kdW/L5nCJPQYACGvJjAqT6z1YejRsam5Zs0oYLhj EP7CKZ5MiDz67ZFdMpGGuPQA/C8RaCb7dk4h7nGiAxRNgqnj5j3y/7wdKOYwYvxIW4kojOtUG p4q330Bj59lJBEsQlY00VcXnueWC1V0QY/hrE8Yhhy0uZx5zKqmxwHy7xL24nLAeka1KGIXBb LGcZqcNg+WhVnjBgoiMe9xCgJmbU5ET+QGiiVg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org w90x900 still provides its own variant of the clk API rather than using the generic COMMON_CLK API. This generally works, but it causes some link errors with drivers using the clk_set_rate, clk_get_parent, clk_set_parent or clk_round_rate functions when a platform lacks those interfaces. This adds empty stub implementations for each of them, and I don't even try to do something useful here but instead just print a WARN() message to make it obvious what is going on if they ever end up being called. The drivers that call these won't be used on these platforms (otherwise we'd get a link error today), so the added code is harmless bloat and will warn about accidental use. A while ago there was a proposal to change w90x900 to use the common-clk implementation, which would be the way it should be handled properly. Signed-off-by: Arnd Bergmann --- arch/arm/mach-w90x900/clock.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 2.9.0 diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c index ac6fd1a2cb59..3f93fac98d97 100644 --- a/arch/arm/mach-w90x900/clock.c +++ b/arch/arm/mach-w90x900/clock.c @@ -93,3 +93,32 @@ void nuc900_subclk_enable(struct clk *clk, int enable) __raw_writel(clken, W90X900_VA_CLKPWR + SUBCLK); } + +/* dummy functions, should not be called */ +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + WARN_ON(clk); + return NULL; +} +EXPORT_SYMBOL(clk_get_parent);