diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-29 06:36:05 +0100 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 14:42:20 +0200 |
commit | 3cb7825bdc84d1d6c81ac9a2be201fe5bea5de05 (patch) | |
tree | 0eb9e9ea42caea9f13abda840ec547c789203b96 | |
parent | ARM: mxs: move mxs_get_ocotp() into mach-mxs.c (diff) | |
download | linux-3cb7825bdc84d1d6c81ac9a2be201fe5bea5de05.tar.xz linux-3cb7825bdc84d1d6c81ac9a2be201fe5bea5de05.zip |
ARM: mxs: remove common.h
All three remaining functions declared in common.h are implemented by
clock driver. Create header include/linux/clk/mxs.h to contain them
and remove common.h.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 20 | ||||
-rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 2 | ||||
-rw-r--r-- | include/linux/clk/mxs.h | 16 |
3 files changed, 17 insertions, 21 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h deleted file mode 100644 index aca982c6d43f..000000000000 --- a/arch/arm/mach-mxs/include/mach/common.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. - */ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __MACH_MXS_COMMON_H__ -#define __MACH_MXS_COMMON_H__ - -extern int mxs_saif_clkmux_select(unsigned int clkmux); - -extern int mx23_clocks_init(void); - -extern int mx28_clocks_init(void); - -#endif /* __MACH_MXS_COMMON_H__ */ diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index f346c432cda2..fc762579d30f 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -11,6 +11,7 @@ */ #include <linux/clk.h> +#include <linux/clk/mxs.h> #include <linux/clkdev.h> #include <linux/clocksource.h> #include <linux/can/platform/flexcan.h> @@ -30,7 +31,6 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> #include <asm/system_misc.h> -#include <mach/common.h> #include <mach/digctl.h> #include <mach/mxs.h> diff --git a/include/linux/clk/mxs.h b/include/linux/clk/mxs.h new file mode 100644 index 000000000000..90c30dc3efc7 --- /dev/null +++ b/include/linux/clk/mxs.h @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __LINUX_CLK_MXS_H +#define __LINUX_CLK_MXS_H + +int mx23_clocks_init(void); +int mx28_clocks_init(void); +int mxs_saif_clkmux_select(unsigned int clkmux); + +#endif |