Separate i.MX23 clock handling to simplify the addition of the upcoming i.MX28. Signed-off-by: Juergen Beisert <jbe@xxxxxxxxxxxxxx> --- arch/arm/mach-stm/include/mach/clock-imx23.h | 36 ++++++++++++++++++++++++++ arch/arm/mach-stm/include/mach/clock.h | 23 ++++------------ 2 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 arch/arm/mach-stm/include/mach/clock-imx23.h diff --git a/arch/arm/mach-stm/include/mach/clock-imx23.h b/arch/arm/mach-stm/include/mach/clock-imx23.h new file mode 100644 index 0000000..99b0d99 --- /dev/null +++ b/arch/arm/mach-stm/include/mach/clock-imx23.h @@ -0,0 +1,36 @@ +/* + * (C) Copyright 2010 Juergen Beisert - Pengutronix + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef ASM_ARCH_CLOCK_IMX23_H +#define ASM_ARCH_CLOCK_IMX23_H + +unsigned imx_get_mpllclk(void); +unsigned imx_get_emiclk(void); +unsigned imx_get_ioclk(void); +unsigned imx_get_armclk(void); +unsigned imx_get_hclk(void); +unsigned imx_get_xclk(void); +unsigned imx_get_sspclk(unsigned); +unsigned imx_set_sspclk(unsigned, unsigned, int); +unsigned imx_set_ioclk(unsigned); +unsigned imx_set_lcdifclk(unsigned); +unsigned imx_get_lcdifclk(void); + +#endif /* ASM_ARCH_CLOCK_IMX23_H */ + diff --git a/arch/arm/mach-stm/include/mach/clock.h b/arch/arm/mach-stm/include/mach/clock.h index 99b0d99..4d74e74 100644 --- a/arch/arm/mach-stm/include/mach/clock.h +++ b/arch/arm/mach-stm/include/mach/clock.h @@ -1,6 +1,4 @@ /* - * (C) Copyright 2010 Juergen Beisert - Pengutronix - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of @@ -17,20 +15,11 @@ * MA 02111-1307 USA */ -#ifndef ASM_ARCH_CLOCK_IMX23_H -#define ASM_ARCH_CLOCK_IMX23_H - -unsigned imx_get_mpllclk(void); -unsigned imx_get_emiclk(void); -unsigned imx_get_ioclk(void); -unsigned imx_get_armclk(void); -unsigned imx_get_hclk(void); -unsigned imx_get_xclk(void); -unsigned imx_get_sspclk(unsigned); -unsigned imx_set_sspclk(unsigned, unsigned, int); -unsigned imx_set_ioclk(unsigned); -unsigned imx_set_lcdifclk(unsigned); -unsigned imx_get_lcdifclk(void); +#ifndef __ASM_MACH_CLOCK_H +#define __ASM_MACH_CLOCK_H -#endif /* ASM_ARCH_CLOCK_IMX23_H */ +#if defined CONFIG_ARCH_IMX23 +# include <mach/clock-imx23.h> +#endif +#endif /* __ASM_MACH_CLOCK_H */ -- 1.7.2.3 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox