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

Commit 58bac7b8 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440



Remove the old common S3C2440 and S3C2442 SoC support from plat-s3c24xx
into mach-s3c2440 now this directory is serving both SoCs.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 70556b14
Loading
Loading
Loading
Loading
+42 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,48 @@ config CPU_S3C2442
	help
	help
	  Support for S3C2442 Samsung Mobile CPU based systems.
	  Support for S3C2442 Samsung Mobile CPU based systems.


config CPU_S3C244X
	bool
	depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
	help
	  Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.



config S3C2440_CPUFREQ
	bool "S3C2440/S3C2442 CPU Frequency scaling support"
	depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
	select S3C2410_CPUFREQ_UTILS
	default y
	help
	  CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.

config S3C2440_XTAL_12000000
	bool
	help
	  Indicate that the build needs to support 12MHz system
	  crystal.

config S3C2440_XTAL_16934400
	bool
	help
	  Indicate that the build needs to support 16.9344MHz system
	  crystal.

config S3C2440_PLL_12000000
	bool
	depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000
	default y if CPU_FREQ_S3C24XX_PLL
	help
	  PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals.

config S3C2440_PLL_16934400
	bool
	depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400
	default y if CPU_FREQ_S3C24XX_PLL
	help
	  PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.

config S3C2440_DMA
config S3C2440_DMA
	bool
	bool
	depends on ARCH_S3C2410 && CPU_S3C24405B
	depends on ARCH_S3C2410 && CPU_S3C24405B
+8 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,14 @@ obj-$(CONFIG_CPU_S3C2440) += irq.o
obj-$(CONFIG_CPU_S3C2440)	+= clock.o
obj-$(CONFIG_CPU_S3C2440)	+= clock.o
obj-$(CONFIG_S3C2440_DMA)	+= dma.o
obj-$(CONFIG_S3C2440_DMA)	+= dma.o


obj-$(CONFIG_CPU_S3C244X)	+= s3c244x.o
obj-$(CONFIG_CPU_S3C244X)	+= s3c244x-irq.o
obj-$(CONFIG_CPU_S3C244X)	+= s3c244x-clock.o
obj-$(CONFIG_S3C2440_CPUFREQ)	+= s3c2440-cpufreq.o

obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o
obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o

# Machine support
# Machine support


obj-$(CONFIG_MACH_ANUBIS)	+= mach-anubis.o
obj-$(CONFIG_MACH_ANUBIS)	+= mach-anubis.o
+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@


#include <plat/s3c2410.h>
#include <plat/s3c2410.h>
#include <plat/s3c2440.h>
#include <plat/s3c2440.h>
#include "s3c244x.h"
#include <plat/s3c244x.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
Loading