MIPS: Loongson 1: more clk support and add select HAVE_CLK
authorYoichi Yuasa <yuasa@linux-mips.org>
Wed, 1 Aug 2012 06:42:16 +0000 (15:42 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 1 Aug 2012 15:59:23 +0000 (17:59 +0200)
This fixes a redefinition of clk_*:

arch/mips/loongson1/common/clock.c:23:13: error: redefinition of 'clk_get'
include/linux/clk.h:281:27: note: previous definition of 'clk_get' was here
arch/mips/loongson1/common/clock.c:41:15: error: redefinition of 'clk_get_rate'
include/linux/clk.h:302:29: note: previous definition of 'clk_get_rate' was here
make[3]: *** [arch/mips/loongson1/common/clock.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips@linux-mips.org
Reviewed-by: John Crispin <blogic@openwrt.org>
Acked-by: Kelvin Cheung <keguang.zhang@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/4143/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/loongson1/Kconfig
arch/mips/loongson1/common/clock.c

index 237fa214de9f64bc09211a6797a3065bd3f87b85..a9a14d6e81af6c38b9d4510d11b2030d586fa286 100644 (file)
@@ -15,6 +15,7 @@ config LOONGSON1_LS1B
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_HIGHMEM
        select SYS_HAS_EARLY_PRINTK
+       select HAVE_CLK
 
 endchoice
 
index 2d98fb030596dd1bc091cb54c91b1073c0cdc3fb..1bbbbec12085eb5c4264e6cf70d4dc6fbf11437b 100644 (file)
@@ -38,12 +38,28 @@ struct clk *clk_get(struct device *dev, const char *name)
 }
 EXPORT_SYMBOL(clk_get);
 
+int clk_enable(struct clk *clk)
+{
+       return 0;
+}
+EXPORT_SYMBOL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_disable);
+
 unsigned long clk_get_rate(struct clk *clk)
 {
        return clk->rate;
 }
 EXPORT_SYMBOL(clk_get_rate);
 
+void clk_put(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_put);
+
 static void pll_clk_init(struct clk *clk)
 {
        u32 pll;