aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2410/s3c2410-clock.c4
-rw-r--r--arch/arm/mach-s3c2410/s3c2412-clock.c10
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410-clock.c b/arch/arm/mach-s3c2410/s3c2410-clock.c
index 00abe199a08e..5815aa0f1463 100644
--- a/arch/arm/mach-s3c2410/s3c2410-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2410-clock.c
@@ -31,12 +31,16 @@
31#include <linux/mutex.h> 31#include <linux/mutex.h>
32#include <linux/delay.h> 32#include <linux/delay.h>
33 33
34#include <asm/mach/map.h>
35
34#include <asm/hardware.h> 36#include <asm/hardware.h>
35#include <asm/io.h> 37#include <asm/io.h>
36 38
39#include <asm/arch/regs-serial.h>
37#include <asm/arch/regs-clock.h> 40#include <asm/arch/regs-clock.h>
38#include <asm/arch/regs-gpio.h> 41#include <asm/arch/regs-gpio.h>
39 42
43#include "s3c2410.h"
40#include "clock.h" 44#include "clock.h"
41#include "cpu.h" 45#include "cpu.h"
42 46
diff --git a/arch/arm/mach-s3c2410/s3c2412-clock.c b/arch/arm/mach-s3c2410/s3c2412-clock.c
index c95ed3e18580..63f980cc2eb9 100644
--- a/arch/arm/mach-s3c2410/s3c2412-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2412-clock.c
@@ -31,12 +31,16 @@
31#include <linux/mutex.h> 31#include <linux/mutex.h>
32#include <linux/delay.h> 32#include <linux/delay.h>
33 33
34#include <asm/mach/map.h>
35
34#include <asm/hardware.h> 36#include <asm/hardware.h>
35#include <asm/io.h> 37#include <asm/io.h>
36 38
39#include <asm/arch/regs-serial.h>
37#include <asm/arch/regs-clock.h> 40#include <asm/arch/regs-clock.h>
38#include <asm/arch/regs-gpio.h> 41#include <asm/arch/regs-gpio.h>
39 42
43#include "s3c2412.h"
40#include "clock.h" 44#include "clock.h"
41#include "cpu.h" 45#include "cpu.h"
42 46
@@ -49,7 +53,7 @@
49 * set the correct muxing at initialisation 53 * set the correct muxing at initialisation
50*/ 54*/
51 55
52int s3c2412_clkcon_enable(struct clk *clk, int enable) 56static int s3c2412_clkcon_enable(struct clk *clk, int enable)
53{ 57{
54 unsigned int clocks = clk->ctrlbit; 58 unsigned int clocks = clk->ctrlbit;
55 unsigned long clkcon; 59 unsigned long clkcon;
@@ -556,7 +560,7 @@ struct clk_init {
556 struct clk *src_1; 560 struct clk *src_1;
557}; 561};
558 562
559struct clk_init clks_src[] __initdata = { 563static struct clk_init clks_src[] __initdata = {
560 { 564 {
561 .clk = &clk_usysclk, 565 .clk = &clk_usysclk,
562 .bit = S3C2412_CLKSRC_USBCLK_HCLK, 566 .bit = S3C2412_CLKSRC_USBCLK_HCLK,
@@ -619,7 +623,7 @@ static void __init s3c2412_clk_initparents(void)
619 623
620/* clocks to add straight away */ 624/* clocks to add straight away */
621 625
622struct clk *clks[] __initdata = { 626static struct clk *clks[] __initdata = {
623 &clk_ext, 627 &clk_ext,
624 &clk_usb_bus, 628 &clk_usb_bus,
625 &clk_erefclk, 629 &clk_erefclk,