Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7be9aba authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C64XX: Move core support to mach-s3c64xx 



Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used
outside of this directory. Also move the SoC header files in with it.

This includes the clock, cpu, cpufreq, dma, gpiolib and pll support.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 88fc68a2

arch/arm/mach-s3c64xx/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ config CPU_S3C6410 
	help

	  Enable S3C6410 CPU support



config S3C64XX_DMA

	bool "S3C64XX DMA"

	select S3C_DMA



config S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_SDHCI_GPIO

	bool

arch/arm/mach-s3c64xx/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ obj-m := 
obj-n				:=

obj-				:=



# Core files

obj-y				+= cpu.o

obj-y				+= clock.o

obj-y				+= gpiolib.o



# Core support for S3C6400 system



obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o
@@ -18,6 +23,14 @@ obj-$(CONFIG_CPU_S3C6410) += s3c6410.o 
obj-y				+= irq.o

obj-y				+= irq-eint.o



# CPU frequency scaling



obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o



# DMA support



obj-$(CONFIG_S3C64XX_DMA)	+= dma.o



# Device setup



obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
@@ -28,6 +41,8 @@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o 


# PM



obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= sleep.o

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



# Machine support

arch/arm/plat-s3c64xx/clock.c→arch/arm/mach-s3c64xx/clock.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


#include <mach/regs-sys.h>

#include <mach/regs-clock.h>

#include <mach/pll.h>



#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/clock.h>

arch/arm/plat-s3c64xx/cpu.c→arch/arm/mach-s3c64xx/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#include <plat/devs.h>

#include <plat/clock.h>



#include <plat/s3c6400.h>

#include <plat/s3c6410.h>

#include <mach/s3c6400.h>

#include <mach/s3c6410.h>



/* table of supported CPUs */