linux-mips
[Top] [All Lists]

[PATCH] MIPS: BCM63XX: select HAVE_CLK

To: linux-kernel@vger.kernel.org
Subject: [PATCH] MIPS: BCM63XX: select HAVE_CLK
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Fri, 13 Jul 2012 09:58:35 +0200
Cc: Andrew Morton <akpm@linux-foundation.org>, Viresh Kumar <viresh.kumar@st.com>, Russell King <linux@arm.linux.org.uk>, linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>, Florian Fainelli <florian@openwrt.org>, Maxime Bizon <mbizon@freebox.fr>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=OBy3lEWbECer/IAkfViMyphRAJJDD3ncB3OQGMe3A6g=; b=bBZ8rcV2h5dPn+6uxBlHNDXU0p2AhmB5sdI2tbgOXKsb9kfsZoXcEvKcwF99qZU/rC SJRRCvkGlTo/VJVIIcn56I8zohbgzStHNKVwAfrIIRDcNuEVLmr+obSOYG1v8WXPfBty 1IkiXMN55DM/hBMaa1y7SIs0/wIkL5sgJ16xIAmBEezZkq9QGDcfIpOR3CTvS3Y3URQ4 7mLM92OlaDduWplxQfFD4fPu0WQMppiEo9e0KPi9Xacb2WTJDJVdHEgBg94wi5vIi9LT myMsL9CnsyZqE8SRjPJCEXP549tosJdpNno/lM8aVHB+bG8lTPd070GWnLs6OUjMHbfB N/0g==
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Sender: linux-mips-bounce@linux-mips.org
BCM63XX implements the clk interface, but does not advertise it.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---

This fixes a build failure in linux-next caused by
5afae362dc79cb8b6b3965422d13d118c63d4ee4 ("clk: Add non CONFIG_HAVE_CLK
routines"):

  CC      arch/mips/bcm63xx/clk.o
arch/mips/bcm63xx/clk.c:285:5: error: redefinition of 'clk_enable'
include/linux/clk.h:294:19: note: previous definition of 'clk_enable' was here

and so on (I think you have already seen one of these).

@Andrew: This patch should apply cleanly to any tree, so maybe you
could add it to your patch series in front of the mentioned
patch, to keep bisectability for bcm63xx.

@Ralf: I hope it is okay for you that this goes through a different
tree.

 arch/mips/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 09ab87e..80d9199 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -122,6 +122,7 @@ config BCM63XX
        select SYS_HAS_EARLY_PRINTK
        select SWAP_IO_SPACE
        select ARCH_REQUIRE_GPIOLIB
+       select HAVE_CLK
        help
         Support for BCM63XX based boards
 
-- 
1.7.2.5


<Prev in Thread] Current Thread [Next in Thread>