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

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

ARM: Merge next-samsung-s3c244x-merge 

Merge branch 'next-samsung-s3c244x-merge' into next-samsung
parents 28db4ed5 84c9b727

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -794,7 +794,6 @@ source "arch/arm/mach-s3c2400/Kconfig" 
source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2412/Kconfig"

source "arch/arm/mach-s3c2440/Kconfig"

source "arch/arm/mach-s3c2442/Kconfig"

source "arch/arm/mach-s3c2443/Kconfig"

endif

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

arch/arm/mach-s3c2440/Kconfig

+71 −3
Original line number Diff line number Diff line
@@ -15,14 +15,67 @@ config CPU_S3C2440 
	help

	  Support for S3C2440 Samsung Mobile CPU based systems.



config CPU_S3C2442

	bool

	depends on ARCH_S3C2410

	select CPU_ARM920T

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select S3C2410_PM if PM

	select CPU_S3C244X

	select CPU_LLSERIAL_S3C2440

	help

	  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

	bool

	depends on ARCH_S3C2410 && CPU_S3C24405B

	help

	  Support for S3C2440 specific DMA code5A





menu "S3C2440 Machines"

menu "S3C2440 and S3C2442 Machines"



config MACH_ANUBIS

	bool "Simtec Electronics ANUBIS"
@@ -37,6 +90,18 @@ config MACH_ANUBIS 
	  Say Y here if you are using the Simtec Electronics ANUBIS

	  development system



config MACH_NEO1973_GTA02

	bool "Openmoko GTA02 / Freerunner phone"

	select CPU_S3C2442

	select MFD_PCF50633

	select PCF50633_GPIO

	select I2C

	select POWER_SUPPLY

	select MACH_NEO1973

	select S3C2410_PWM

	help

	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone



config MACH_OSIRIS

	bool "Simtec IM2440D20 (OSIRIS) module"

	select CPU_S3C2440
@@ -94,11 +159,14 @@ config MACH_NEXCODER_2440 


config SMDK2440_CPU2440

	bool "SMDK2440 with S3C2440 CPU module"

	depends on ARCH_S3C2440

	default y if ARCH_S3C2440

	select S3C2440_XTAL_16934400

	select CPU_S3C2440



config SMDK2440_CPU2442

	bool "SMDM2440 with S3C2442 CPU module"

	select CPU_S3C2442



config MACH_AT2440EVB

	bool "Avantech AT2440EVB development board"

	select CPU_S3C2440

arch/arm/mach-s3c2440/Makefile

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



obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o dsc.o

obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o



obj-$(CONFIG_CPU_S3C2440)	+= irq.o

obj-$(CONFIG_CPU_S3C2440)	+= clock.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



obj-$(CONFIG_MACH_ANUBIS)	+= mach-anubis.o
@@ -23,6 +33,7 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o 
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o

obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o

obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o

obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o



# extra machine support

arch/arm/mach-s3c2440/dsc.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <mach/regs-dsc.h>



#include <plat/cpu.h>

#include <plat/s3c2440.h>

#include <plat/s3c244x.h>



int s3c2440_set_dsc(unsigned int pin, unsigned int value)

{