Skip to content

Commit

Permalink
ARM: 7246/1: S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]
Browse files Browse the repository at this point in the history
This patch introduces common.[ch] which are used only in the
arch/arm/mach-s5p64x0/ directory. The common.c file merges
the cpu.c, init.c and irq-eint.c files which are used commonly
on S5P64X0 SoCs and the common.h local header file replaces
with plat/s5p6440.h and plat/s5p6450.h files.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Kukjin Kim authored and Russell King committed Dec 23, 2011
1 parent b024043 commit 95af214
Show file tree
Hide file tree
Showing 14 changed files with 532 additions and 546 deletions.
9 changes: 6 additions & 3 deletions arch/arm/mach-s5p64x0/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ obj-m :=
obj-n :=
obj- :=

# Core support for S5P64X0 system
# Core

obj-$(CONFIG_ARCH_S5P64X0) += cpu.o init.o clock.o dma.o
obj-$(CONFIG_ARCH_S5P64X0) += setup-i2c0.o irq-eint.o
obj-y += common.o clock.o
obj-$(CONFIG_CPU_S5P6440) += clock-s5p6440.o
obj-$(CONFIG_CPU_S5P6450) += clock-s5p6450.o

obj-$(CONFIG_PM) += pm.o irq-pm.o

obj-y += dma.o

# machine support

obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o
Expand All @@ -28,5 +30,6 @@ obj-$(CONFIG_MACH_SMDK6450) += mach-smdk6450.o
obj-y += dev-audio.o
obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o

obj-y += setup-i2c0.o
obj-$(CONFIG_S5P64X0_SETUP_I2C1) += setup-i2c1.o
obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP) += setup-fb-24bpp.o
3 changes: 2 additions & 1 deletion arch/arm/mach-s5p64x0/clock-s5p6440.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
#include <plat/pll.h>
#include <plat/s5p-clock.h>
#include <plat/clock-clksrc.h>
#include <plat/s5p6440.h>

#include "common.h"

static u32 epll_div[][5] = {
{ 36000000, 0, 48, 1, 4 },
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-s5p64x0/clock-s5p6450.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
#include <plat/pll.h>
#include <plat/s5p-clock.h>
#include <plat/clock-clksrc.h>
#include <plat/s5p6450.h>

#include "common.h"

static struct clksrc_clk clk_mout_dpll = {
.clk = {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-s5p64x0/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include <plat/pll.h>
#include <plat/s5p-clock.h>
#include <plat/clock-clksrc.h>
#include <plat/s5p6440.h>
#include <plat/s5p6450.h>

#include "common.h"

struct clksrc_clk clk_mout_apll = {
.clk = {
Expand Down
Loading

0 comments on commit 95af214

Please sign in to comment.