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

Commit ec2cc753 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Consolidate Simtec extensions 



The Simtec extension didn't follow a specific naming scheme for files
and config options until now. This distributed the files throughout
the whole mach-s3c24xx directory.

This patch fixes the naming of files and option names and also creates
a simtec.h header instead of using many one-liners.

As the plat/audio-simtec.h only contains the platform-data struct now,
it can also move to include/sound in a later patch.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 9072dc98

arch/arm/mach-s3c24xx/Kconfig

+10 −3
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ config S3C24XX_SIMTEC_PM 
	  Common power management code for systems that are

	  compatible with the Simtec style of power management



config S3C24XX_SIMTEC_USB

	bool

	help

	  USB management code for common Simtec S3C24XX boards



# cpu-specific sections



if CPU_S3C2410
@@ -117,7 +122,7 @@ config S3C2410_PM 
	help

	  Power Management code common to S3C2410 and better



config SIMTEC_NOR

config S3C24XX_SIMTEC_NOR

	bool

	help

	  Internal node to specify machine has simtec NOR mapping
@@ -148,7 +153,8 @@ config ARCH_BAST 
	bool "Simtec Electronics BAST (EB2410ITX)"

	select S3C2410_IOTIMING if S3C2410_CPUFREQ

	select S3C24XX_SIMTEC_PM if PM

	select SIMTEC_NOR

	select S3C24XX_SIMTEC_NOR

	select S3C24XX_SIMTEC_USB

	select MACH_BAST_IDE

	select S3C24XX_DCLK

	select ISA
@@ -230,9 +236,10 @@ config MACH_VR1000 
	bool "Thorcom VR1000"

	select S3C24XX_SIMTEC_PM if PM

	select S3C24XX_DCLK

	select SIMTEC_NOR

	select S3C24XX_SIMTEC_NOR

	select MACH_BAST_IDE

	select S3C_DEV_USB_HOST

	select S3C24XX_SIMTEC_USB

	help

	  Say Y here if you are using the Thorcom VR1000 board.

arch/arm/mach-s3c24xx/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o 
#



obj-$(CONFIG_MACH_AML_M5900)		+= mach-amlm5900.o

obj-$(CONFIG_ARCH_BAST)			+= mach-bast.o usb-simtec.o

obj-$(CONFIG_ARCH_BAST)			+= mach-bast.o

obj-$(CONFIG_BAST_PC104_IRQ)		+= bast-irq.o

obj-$(CONFIG_ARCH_H1940)		+= mach-h1940.o

obj-$(CONFIG_H1940BT)			+= h1940-bluetooth.o
@@ -54,7 +54,7 @@ obj-$(CONFIG_MACH_OTOM) += mach-otom.o 
obj-$(CONFIG_MACH_QT2410)		+= mach-qt2410.o

obj-$(CONFIG_ARCH_SMDK2410)		+= mach-smdk2410.o

obj-$(CONFIG_MACH_TCT_HAMMER)		+= mach-tct_hammer.o

obj-$(CONFIG_MACH_VR1000)		+= mach-vr1000.o usb-simtec.o

obj-$(CONFIG_MACH_VR1000)		+= mach-vr1000.o



obj-$(CONFIG_MACH_JIVE)			+= mach-jive.o

obj-$(CONFIG_MACH_SMDK2413)		+= mach-smdk2413.o
@@ -78,9 +78,10 @@ obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o 
# common bits of machine support



obj-$(CONFIG_S3C24XX_SMDK)		+= common-smdk.o

obj-$(CONFIG_SIMTEC_NOR)		+= nor-simtec.o

obj-$(CONFIG_S3C24XX_SIMTEC_AUDIO)	+= simtec-audio.o

obj-$(CONFIG_S3C24XX_SIMTEC_NOR)	+= simtec-nor.o

obj-$(CONFIG_S3C24XX_SIMTEC_PM)		+= simtec-pm.o

obj-$(CONFIG_S3C24XX_SIMTEC_USB)	+= simtec-usb.o



# machine additions

arch/arm/mach-s3c24xx/mach-anubis.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include <plat/cpu.h>

#include <plat/audio-simtec.h>



#include "simtec.h"

#include "common.h"



#define COPYRIGHT ", Copyright 2005-2009 Simtec Electronics"

arch/arm/mach-s3c24xx/mach-bast.c

+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ 
#include <plat/gpio-cfg.h>

#include <plat/audio-simtec.h>



#include "usb-simtec.h"

#include "nor-simtec.h"

#include "simtec.h"

#include "common.h"



#define COPYRIGHT ", Copyright 2004-2008 Simtec Electronics"

arch/arm/mach-s3c24xx/mach-vr1000.c

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ 
#include <plat/iic.h>

#include <plat/audio-simtec.h>



#include "usb-simtec.h"

#include "nor-simtec.h"

#include "simtec.h"

#include "common.h"



/* macros for virtual address mods for the io space entries */