From ce9c00eea187f0c54971caec477f721c2dc5cd3d Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 9 Mar 2012 13:51:24 -0800 Subject: ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs This patch changes the name of clock.c to clock-exynos4.c for other EXYNOS series such as EXYNOS5. And since the header file of clock is used only in arch/arm/mach-exynos, moves it in the local directory. Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/clock-exynos4.h | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 arch/arm/mach-exynos/clock-exynos4.h (limited to 'arch/arm/mach-exynos/clock-exynos4.h') diff --git a/arch/arm/mach-exynos/clock-exynos4.h b/arch/arm/mach-exynos/clock-exynos4.h new file mode 100644 index 000000000000..f64e9f784a31 --- /dev/null +++ b/arch/arm/mach-exynos/clock-exynos4.h @@ -0,0 +1,42 @@ +/* + * + * Copyright (c) 2011 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * Header file for exynos4 clock support + * + * 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 __ASM_ARCH_CLOCK_H +#define __ASM_ARCH_CLOCK_H __FILE__ + +#include + +extern struct clk clk_sclk_hdmi27m; +extern struct clk clk_sclk_usbphy0; +extern struct clk clk_sclk_usbphy1; +extern struct clk clk_sclk_hdmiphy; + +extern struct clksrc_clk clk_sclk_apll; +extern struct clksrc_clk clk_mout_mpll; +extern struct clksrc_clk clk_aclk_133; +extern struct clksrc_clk clk_mout_epll; +extern struct clksrc_clk clk_sclk_vpll; + +extern struct clk *clkset_corebus_list[]; +extern struct clksrc_sources clkset_mout_corebus; + +extern struct clk *clkset_aclk_top_list[]; +extern struct clksrc_sources clkset_aclk; + +extern struct clk *clkset_group_list[]; +extern struct clksrc_sources clkset_group; + +extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable); +extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable); +extern int exynos4_clk_ip_lcd1_ctrl(struct clk *clk, int enable); + +#endif /* __ASM_ARCH_CLOCK_H */ -- cgit v1.2.3 From b1d6c5b26d8e242dce12e3a59710e6acad4f9d06 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 9 Mar 2012 14:06:13 -0800 Subject: ARM: EXYNOS: use static declaration on regarding clock This patch uses static declaration struct which is not used in other file and re-arrange with group in header file. Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/clock-exynos4.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'arch/arm/mach-exynos/clock-exynos4.h') diff --git a/arch/arm/mach-exynos/clock-exynos4.h b/arch/arm/mach-exynos/clock-exynos4.h index f64e9f784a31..d2ef305102dc 100644 --- a/arch/arm/mach-exynos/clock-exynos4.h +++ b/arch/arm/mach-exynos/clock-exynos4.h @@ -15,25 +15,14 @@ #include -extern struct clk clk_sclk_hdmi27m; -extern struct clk clk_sclk_usbphy0; -extern struct clk clk_sclk_usbphy1; -extern struct clk clk_sclk_hdmiphy; - -extern struct clksrc_clk clk_sclk_apll; extern struct clksrc_clk clk_mout_mpll; extern struct clksrc_clk clk_aclk_133; -extern struct clksrc_clk clk_mout_epll; -extern struct clksrc_clk clk_sclk_vpll; -extern struct clk *clkset_corebus_list[]; extern struct clksrc_sources clkset_mout_corebus; +extern struct clksrc_sources clkset_group; extern struct clk *clkset_aclk_top_list[]; -extern struct clksrc_sources clkset_aclk; - extern struct clk *clkset_group_list[]; -extern struct clksrc_sources clkset_group; extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable); extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable); -- cgit v1.2.3 From a855039ee4b814782aebe2448d838944d2d29fcb Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 9 Mar 2012 14:19:10 -0800 Subject: ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock This patch changes prefix of the clk register from S5P_ to EXYNOS4_ for new EXYNOS SoCs such as EXYNOS5 and adds prefix exynos4_ on clk declarations. Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/clock-exynos4.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'arch/arm/mach-exynos/clock-exynos4.h') diff --git a/arch/arm/mach-exynos/clock-exynos4.h b/arch/arm/mach-exynos/clock-exynos4.h index d2ef305102dc..cb71c29c14d1 100644 --- a/arch/arm/mach-exynos/clock-exynos4.h +++ b/arch/arm/mach-exynos/clock-exynos4.h @@ -1,6 +1,5 @@ /* - * - * Copyright (c) 2011 Samsung Electronics Co., Ltd. + * Copyright (c) 2011-2012 Samsung Electronics Co., Ltd. * http://www.samsung.com * * Header file for exynos4 clock support @@ -15,14 +14,14 @@ #include -extern struct clksrc_clk clk_mout_mpll; -extern struct clksrc_clk clk_aclk_133; +extern struct clksrc_clk exynos4_clk_aclk_133; +extern struct clksrc_clk exynos4_clk_mout_mpll; -extern struct clksrc_sources clkset_mout_corebus; -extern struct clksrc_sources clkset_group; +extern struct clksrc_sources exynos4_clkset_mout_corebus; +extern struct clksrc_sources exynos4_clkset_group; -extern struct clk *clkset_aclk_top_list[]; -extern struct clk *clkset_group_list[]; +extern struct clk *exynos4_clkset_aclk_top_list[]; +extern struct clk *exynos4_clkset_group_list[]; extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable); extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable); -- cgit v1.2.3