Skip to content

Commit

Permalink
ARM: Consolidate the clkdev header files
Browse files Browse the repository at this point in the history
Now most of ARM machines has the alsmot same __clk_get/put() macro

So place it at the arch/arm/include/asm/clkdev.h and remove the reduntant header files

But some machines don't have the same form as above. It can use the machince specific clkdev file by HAVE_MACH_CLKDEV config

Now there are only 3 caese.

1) define the clk structure with clkdev macro => Need to move clk structure to proper header file

arch/arm/mach-versatile/include/mach/clkdev.h
arch/arm/mach-realview/include/mach/clkdev.h
arch/arm/mach-vexpress/include/mach/clkdev.h
arch/arm/mach-integrator/include/mach/clkdev.h

2) export the __clk_get/put function at clock.c

arch/arm/mach-shmobile/include/mach/clkdev.h

3) demuxing the clk source
arch/arm/mach-u300/include/mach/clkdev.h

Acked-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
  • Loading branch information
kyungmin-park authored and arndb committed Jul 19, 2011
1 parent fe0d422 commit aa3831c
Show file tree
Hide file tree
Showing 26 changed files with 14 additions and 269 deletions.
6 changes: 6 additions & 0 deletions arch/arm/Kconfig
Expand Up @@ -239,6 +239,7 @@ config ARCH_INTEGRATOR
select ARM_AMBA
select ARCH_HAS_CPUFREQ
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select ICST
select GENERIC_CLOCKEVENTS
select PLAT_VERSATILE
Expand All @@ -250,6 +251,7 @@ config ARCH_REALVIEW
bool "ARM Ltd. RealView family"
select ARM_AMBA
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select ICST
select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB
Expand All @@ -265,6 +267,7 @@ config ARCH_VERSATILE
select ARM_AMBA
select ARM_VIC
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select ICST
select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB
Expand All @@ -281,6 +284,7 @@ config ARCH_VEXPRESS
select ARM_AMBA
select ARM_TIMER_SP804
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select GENERIC_CLOCKEVENTS
select HAVE_CLK
select HAVE_PATA_PLATFORM
Expand Down Expand Up @@ -638,6 +642,7 @@ config ARCH_SHMOBILE
bool "Renesas SH-Mobile / R-Mobile"
select HAVE_CLK
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select GENERIC_CLOCKEVENTS
select NO_IOPORT
select SPARSE_IRQ
Expand Down Expand Up @@ -808,6 +813,7 @@ config ARCH_U300
select ARM_VIC
select GENERIC_CLOCKEVENTS
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select GENERIC_GPIO
help
Support for ST-Ericsson U300 series mobile platforms.
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/include/asm/clkdev.h
Expand Up @@ -14,7 +14,12 @@

#include <linux/slab.h>

#ifdef CONFIG_HAVE_MACH_CLKDEV
#include <mach/clkdev.h>
#else
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
#endif

static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
{
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/mach-at91/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-bcmring/include/mach/clkdev.h

This file was deleted.

15 changes: 0 additions & 15 deletions arch/arm/mach-davinci/include/mach/clkdev.h

This file was deleted.

11 changes: 0 additions & 11 deletions arch/arm/mach-ep93xx/include/mach/clkdev.h

This file was deleted.

25 changes: 0 additions & 25 deletions arch/arm/mach-lpc32xx/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-mmp/include/mach/clkdev.h

This file was deleted.

19 changes: 0 additions & 19 deletions arch/arm/mach-msm/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-mxs/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-nomadik/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-nuc93x/include/mach/clkdev.h

This file was deleted.

5 changes: 0 additions & 5 deletions arch/arm/mach-omap1/include/mach/clkdev.h

This file was deleted.

5 changes: 0 additions & 5 deletions arch/arm/mach-omap2/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-pnx4008/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-pxa/include/mach/clkdev.h

This file was deleted.

19 changes: 0 additions & 19 deletions arch/arm/mach-spear3xx/include/mach/clkdev.h

This file was deleted.

19 changes: 0 additions & 19 deletions arch/arm/mach-spear6xx/include/mach/clkdev.h

This file was deleted.

34 changes: 0 additions & 34 deletions arch/arm/mach-tegra/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-ux500/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-w90x900/include/mach/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/plat-mxc/include/mach/clkdev.h

This file was deleted.

13 changes: 0 additions & 13 deletions arch/arm/plat-omap/include/plat/clkdev.h

This file was deleted.

20 changes: 0 additions & 20 deletions arch/arm/plat-spear/include/plat/clkdev.h

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/plat-tcc/include/mach/clkdev.h

This file was deleted.

3 changes: 3 additions & 0 deletions drivers/clk/Kconfig
Expand Up @@ -2,3 +2,6 @@
config CLKDEV_LOOKUP
bool
select HAVE_CLK

config HAVE_MACH_CLKDEV
bool

0 comments on commit aa3831c

Please sign in to comment.