[PATCH 1/4] MIPS: AR7: add select HAVE_CLK

[PATCH 1/4] MIPS: AR7: add select HAVE_CLK

[Yoichi Yuasa]

fix redefinition of clk_*

arch/mips/ar7/clock.c:420:5: error: redefinition of 'clk_enable'
include/linux/clk.h:295:19: note: previous definition of 'clk_enable' was here
arch/mips/ar7/clock.c:426:6: error: redefinition of 'clk_disable'
include/linux/clk.h:300:20: note: previous definition of 'clk_disable' was here
arch/mips/ar7/clock.c:431:15: error: redefinition of 'clk_get_rate'
include/linux/clk.h:302:29: note: previous definition of 'clk_get_rate' was here
arch/mips/ar7/clock.c:437:13: error: redefinition of 'clk_get'
include/linux/clk.h:281:27: note: previous definition of 'clk_get' was here
arch/mips/ar7/clock.c:454:6: error: redefinition of 'clk_put'
include/linux/clk.h:291:20: note: previous definition of 'clk_put' was here
make[2]: *** [arch/mips/ar7/clock.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7e78a83..50fc7a1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -78,6 +78,7 @@ config AR7
 	select SYS_SUPPORTS_ZBOOT_UART16550
 	select ARCH_REQUIRE_GPIOLIB
 	select VLYNQ
+	select HAVE_CLK
 	help
 	  Support for the Texas Instruments AR7 System-on-a-Chip
 	  family: TNETD7100, 7200 and 7300.
-- 
1.7.0.4

[PATCH 2/4] MIPS: BCM63xx: add select HAVE_CLK

[Yoichi Yuasa]

fix redefinition of clk_*

arch/mips/bcm63xx/clk.c:249:5: error: redefinition of 'clk_enable'
include/linux/clk.h:295:19: note: previous definition of 'clk_enable' was here
arch/mips/bcm63xx/clk.c:259:6: error: redefinition of 'clk_disable'
include/linux/clk.h:300:20: note: previous definition of 'clk_disable' was here
arch/mips/bcm63xx/clk.c:268:15: error: redefinition of 'clk_get_rate'
include/linux/clk.h:302:29: note: previous definition of 'clk_get_rate' was here
arch/mips/bcm63xx/clk.c:275:13: error: redefinition of 'clk_get'
include/linux/clk.h:281:27: note: previous definition of 'clk_get' was here
arch/mips/bcm63xx/clk.c:302:6: error: redefinition of 'clk_put'
include/linux/clk.h:291:20: note: previous definition of 'clk_put' was here
make[2]: *** [arch/mips/bcm63xx/clk.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 50fc7a1..1778430 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -126,6 +126,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.0.4

[PATCH 3/4] MIPS: txx9: add select HAVE_CLK

[Yoichi Yuasa]

fix redefinition of clk_*

arch/mips/txx9/generic/setup.c:87:13: error: redefinition of 'clk_get'
include/linux/clk.h:281:27: note: previous definition of 'clk_get' was here
arch/mips/txx9/generic/setup.c:97:5: error: redefinition of 'clk_enable'
include/linux/clk.h:295:19: note: previous definition of 'clk_enable' was here
arch/mips/txx9/generic/setup.c:103:6: error: redefinition of 'clk_disable'
include/linux/clk.h:300:20: note: previous definition of 'clk_disable' was here
arch/mips/txx9/generic/setup.c:108:15: error: redefinition of 'clk_get_rate'
include/linux/clk.h:302:29: note: previous definition of 'clk_get_rate' was here
arch/mips/txx9/generic/setup.c:114:6: error: redefinition of 'clk_put'
include/linux/clk.h:291:20: note: previous definition of 'clk_put' was here
make[3]: *** [arch/mips/txx9/generic/setup.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/txx9/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index 852ae4b..6d40bc7 100644
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -20,6 +20,7 @@ config MACH_TXX9
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select HAVE_CLK
 
 config TOSHIBA_JMR3927
 	bool "Toshiba JMR-TX3927 board"
-- 
1.7.0.4

[PATCH 4/4] MIPS: loongson1: more clk support and add select HAVE_CLK

[Yoichi Yuasa]

fix 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>
---
 arch/mips/loongson1/Kconfig        |    1 +
 arch/mips/loongson1/common/clock.c |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/arch/mips/loongson1/Kconfig b/arch/mips/loongson1/Kconfig
index 237fa21..a9a14d6 100644
--- a/arch/mips/loongson1/Kconfig
+++ b/arch/mips/loongson1/Kconfig
@@ -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
 
diff --git a/arch/mips/loongson1/common/clock.c b/arch/mips/loongson1/common/clock.c
index 2d98fb0..1bbbbec 100644
--- a/arch/mips/loongson1/common/clock.c
+++ b/arch/mips/loongson1/common/clock.c
@@ -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;
-- 
1.7.0.4

Re: [PATCH 4/4] MIPS: loongson1: more clk support and add select HAVE_CLK

[Kelvin Cheung]

[-- Attachment #1: Type: text/plain, Size: 2045 bytes --]

Hi Yoichi,

Thanks for fixing this problem.
I kind of regretted that I did not follow Ralf's advice.

Now, I'm tring to use common clock framework in drivers/clk.

2012/8/1 Yoichi Yuasa <yuasa@linux-mips.org>

> fix 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>
> ---
>  arch/mips/loongson1/Kconfig        |    1 +
>  arch/mips/loongson1/common/clock.c |   16 ++++++++++++++++
>  2 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/arch/mips/loongson1/Kconfig b/arch/mips/loongson1/Kconfig
> index 237fa21..a9a14d6 100644
> --- a/arch/mips/loongson1/Kconfig
> +++ b/arch/mips/loongson1/Kconfig
> @@ -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
>
> diff --git a/arch/mips/loongson1/common/clock.c
> b/arch/mips/loongson1/common/clock.c
> index 2d98fb0..1bbbbec 100644
> --- a/arch/mips/loongson1/common/clock.c
> +++ b/arch/mips/loongson1/common/clock.c
> @@ -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;
> --
> 1.7.0.4
>
>
>


-- 
Best Regards!
Kelvin

[-- Attachment #2: Type: text/html, Size: 2770 bytes --]

Re: [PATCH 1/4] MIPS: AR7: add select HAVE_CLK

[John Crispin]

On 01/08/12 08:38, Yoichi Yuasa wrote:
> fix redefinition of clk_*
> 
> arch/mips/ar7/clock.c:420:5: error: redefinition of 'clk_enable'
> include/linux/clk.h:295:19: note: previous definition of 'clk_enable' was here
> arch/mips/ar7/clock.c:426:6: error: redefinition of 'clk_disable'
> include/linux/clk.h:300:20: note: previous definition of 'clk_disable' was here
> arch/mips/ar7/clock.c:431:15: error: redefinition of 'clk_get_rate'
> include/linux/clk.h:302:29: note: previous definition of 'clk_get_rate' was here
> arch/mips/ar7/clock.c:437:13: error: redefinition of 'clk_get'
> include/linux/clk.h:281:27: note: previous definition of 'clk_get' was here
> arch/mips/ar7/clock.c:454:6: error: redefinition of 'clk_put'
> include/linux/clk.h:291:20: note: previous definition of 'clk_put' was here
> make[2]: *** [arch/mips/ar7/clock.o] Error 1
> 
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>

Hi Yoichi,

I had to apply the same fix to mips/lantiq/ to make it work.

for the whole series :
Reviewed-by: John Crispin <blogic@openwrt.org>

John

Re: [PATCH 1/4] MIPS: AR7: add select HAVE_CLK

[Florian Fainelli]

On Wednesday 01 August 2012 15:38:00 Yoichi Yuasa wrote:
> fix redefinition of clk_*
> 
> arch/mips/ar7/clock.c:420:5: error: redefinition of 'clk_enable'
> include/linux/clk.h:295:19: note: previous definition of 'clk_enable' was 
here
> arch/mips/ar7/clock.c:426:6: error: redefinition of 'clk_disable'
> include/linux/clk.h:300:20: note: previous definition of 'clk_disable' was 
here
> arch/mips/ar7/clock.c:431:15: error: redefinition of 'clk_get_rate'
> include/linux/clk.h:302:29: note: previous definition of 'clk_get_rate' was 
here
> arch/mips/ar7/clock.c:437:13: error: redefinition of 'clk_get'
> include/linux/clk.h:281:27: note: previous definition of 'clk_get' was here
> arch/mips/ar7/clock.c:454:6: error: redefinition of 'clk_put'
> include/linux/clk.h:291:20: note: previous definition of 'clk_put' was here
> make[2]: *** [arch/mips/ar7/clock.o] Error 1
> 
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>

Acked-by: Florian Fainelli <florian@openwrt.org>

> ---
>  arch/mips/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 7e78a83..50fc7a1 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -78,6 +78,7 @@ config AR7
>  	select SYS_SUPPORTS_ZBOOT_UART16550
>  	select ARCH_REQUIRE_GPIOLIB
>  	select VLYNQ
> +	select HAVE_CLK
>  	help
>  	  Support for the Texas Instruments AR7 System-on-a-Chip
>  	  family: TNETD7100, 7200 and 7300.
> -- 
> 1.7.0.4
> 
>