* [PATCH] ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move map-base " Ben Dooks
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move common headers from plat-s3c's include/plat directory into plat-samsung.
No need to fix any files, these are still included via <plat/>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
.../include/plat/audio.h | 2 +-
.../include/plat/cpu-freq.h | 2 +-
.../{plat-s3c => plat-samsung}/include/plat/cpu.h | 2 +-
.../include/plat/debug-macro.S | 2 +-
.../{plat-s3c => plat-samsung}/include/plat/devs.h | 2 +-
.../{plat-s3c => plat-samsung}/include/plat/fb.h | 2 +-
.../{plat-s3c => plat-samsung}/include/plat/pm.h | 2 +-
.../include/plat/regs-fb-v4.h | 2 +-
.../include/plat/regs-fb.h | 2 +-
.../include/plat/regs-serial.h | 2 +-
.../include/plat/uncompress.h | 2 +-
.../include/plat/usb-control.h | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/audio.h (91%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu-freq.h (98%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu.h (97%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/debug-macro.S (96%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/devs.h (98%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/fb.h (98%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/pm.h (99%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb-v4.h (99%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb.h (99%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-serial.h (99%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/uncompress.h (98%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/usb-control.h (95%)
diff --git a/arch/arm/plat-s3c/include/plat/audio.h b/arch/arm/plat-samsung/include/plat/audio.h
similarity index 91%
rename from arch/arm/plat-s3c/include/plat/audio.h
rename to arch/arm/plat-samsung/include/plat/audio.h
index f22d23b..da561da 100644
--- a/arch/arm/plat-s3c/include/plat/audio.h
+++ b/arch/arm/plat-samsung/include/plat/audio.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/audio.h
+/* arch/arm/plat-samsung/include/plat/audio.h
*
* Copyright (c) 2009 Samsung Electronics Co. Ltd
* Author: Jaswinder Singh <jassi.brar@samsung.com>
diff --git a/arch/arm/plat-s3c/include/plat/cpu-freq.h b/arch/arm/plat-samsung/include/plat/cpu-freq.h
similarity index 98%
rename from arch/arm/plat-s3c/include/plat/cpu-freq.h
rename to arch/arm/plat-samsung/include/plat/cpu-freq.h
index 94eb06a..80c4a80 100644
--- a/arch/arm/plat-s3c/include/plat/cpu-freq.h
+++ b/arch/arm/plat-samsung/include/plat/cpu-freq.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/cpu-freq.h
+/* arch/arm/plat-samsung/include/plat/cpu-freq.h
*
* Copyright (c) 2006-2007 Simtec Electronics
* http://armlinux.simtec.co.uk/
diff --git a/arch/arm/plat-s3c/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
similarity index 97%
rename from arch/arm/plat-s3c/include/plat/cpu.h
rename to arch/arm/plat-samsung/include/plat/cpu.h
index 676db94..d316b4a 100644
--- a/arch/arm/plat-s3c/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c/include/plat/cpu.h
+/* linux/arch/arm/plat-samsung/include/plat/cpu.h
*
* Copyright (c) 2004-2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
diff --git a/arch/arm/plat-s3c/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S
similarity index 96%
rename from arch/arm/plat-s3c/include/plat/debug-macro.S
rename to arch/arm/plat-samsung/include/plat/debug-macro.S
index 3634d4e..43ed0ec 100644
--- a/arch/arm/plat-s3c/include/plat/debug-macro.S
+++ b/arch/arm/plat-samsung/include/plat/debug-macro.S
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/plat-s3c/debug-macro.S
+/* arch/arm/plat-samsung/include/plat/debug-macro.S
*
* Copyright 2005, 2007 Simtec Electronics
* http://armlinux.simtec.co.uk/
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
similarity index 98%
rename from arch/arm/plat-s3c/include/plat/devs.h
rename to arch/arm/plat-samsung/include/plat/devs.h
index c6f9b73..0597ffa 100644
--- a/arch/arm/plat-s3c/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/plat-s3c24xx/devs.h
+/* arch/arm/plat-samsung/include/plat/devs.h
*
* Copyright (c) 2004 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
diff --git a/arch/arm/plat-s3c/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h
similarity index 98%
rename from arch/arm/plat-s3c/include/plat/fb.h
rename to arch/arm/plat-samsung/include/plat/fb.h
index f8db879..ffc01a7 100644
--- a/arch/arm/plat-s3c/include/plat/fb.h
+++ b/arch/arm/plat-samsung/include/plat/fb.h
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c/include/plat/fb.h
+/* arch/arm/plat-samsung/include/plat/fb.h
*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
diff --git a/arch/arm/plat-s3c/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h
similarity index 99%
rename from arch/arm/plat-s3c/include/plat/pm.h
rename to arch/arm/plat-samsung/include/plat/pm.h
index 2543bd2..245836d 100644
--- a/arch/arm/plat-s3c/include/plat/pm.h
+++ b/arch/arm/plat-samsung/include/plat/pm.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/plat-s3c24xx/pm.h
+/* arch/arm/plat-samsung/include/plat/pm.h
*
* Copyright (c) 2004 Simtec Electronics
* http://armlinux.simtec.co.uk/
diff --git a/arch/arm/plat-s3c/include/plat/regs-fb-v4.h b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
similarity index 99%
rename from arch/arm/plat-s3c/include/plat/regs-fb-v4.h
rename to arch/arm/plat-samsung/include/plat/regs-fb-v4.h
index a60ed0d..0f43599 100644
--- a/arch/arm/plat-s3c/include/plat/regs-fb-v4.h
+++ b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/regs-fb-v4.h
+/* arch/arm/plat-samsung/include/plat/regs-fb-v4.h
*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
diff --git a/arch/arm/plat-s3c/include/plat/regs-fb.h b/arch/arm/plat-samsung/include/plat/regs-fb.h
similarity index 99%
rename from arch/arm/plat-s3c/include/plat/regs-fb.h
rename to arch/arm/plat-samsung/include/plat/regs-fb.h
index e9ee599..0ef806e 100644
--- a/arch/arm/plat-s3c/include/plat/regs-fb.h
+++ b/arch/arm/plat-samsung/include/plat/regs-fb.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/regs-fb.h
+/* arch/arm/plat-samsung/include/plat/regs-fb.h
*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
diff --git a/arch/arm/plat-s3c/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h
similarity index 99%
rename from arch/arm/plat-s3c/include/plat/regs-serial.h
rename to arch/arm/plat-samsung/include/plat/regs-serial.h
index 60d6604..a6eba84 100644
--- a/arch/arm/plat-s3c/include/plat/regs-serial.h
+++ b/arch/arm/plat-samsung/include/plat/regs-serial.h
@@ -1,4 +1,4 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-serial.h
+/* arch/arm/plat-samsung/include/plat/regs-serial.h
*
* From linux/include/asm-arm/hardware/serial_s3c2410.h
*
diff --git a/arch/arm/plat-s3c/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
similarity index 98%
rename from arch/arm/plat-s3c/include/plat/uncompress.h
rename to arch/arm/plat-samsung/include/plat/uncompress.h
index dc66a47..e87ce8f 100644
--- a/arch/arm/plat-s3c/include/plat/uncompress.h
+++ b/arch/arm/plat-samsung/include/plat/uncompress.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/plat-s3c/uncompress.h
+/* arch/arm/plat-samsung/include/plat/uncompress.h
*
* Copyright 2003, 2007 Simtec Electronics
* http://armlinux.simtec.co.uk/
diff --git a/arch/arm/plat-s3c/include/plat/usb-control.h b/arch/arm/plat-samsung/include/plat/usb-control.h
similarity index 95%
rename from arch/arm/plat-s3c/include/plat/usb-control.h
rename to arch/arm/plat-samsung/include/plat/usb-control.h
index a6a57bf..7fa1fbe 100644
--- a/arch/arm/plat-s3c/include/plat/usb-control.h
+++ b/arch/arm/plat-samsung/include/plat/usb-control.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/usb-control.h
+/* arch/arm/plat-samsung/include/plat/usb-control.h
*
* Copyright (c) 2004 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Move map-base to plat-samsung
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move pm.c " Ben Dooks
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move the map-base file to plat-samsung. To make the move easier, we do not
change the S3C_ prefix on many of the items as this would involve going
through altering all the dependencies.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
.../include/plat/map-base.h | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/map-base.h (100%)
diff --git a/arch/arm/plat-s3c/include/plat/map-base.h b/arch/arm/plat-samsung/include/plat/map-base.h
similarity index 100%
rename from arch/arm/plat-s3c/include/plat/map-base.h
rename to arch/arm/plat-samsung/include/plat/map-base.h
--
1.6.0.4
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Move pm.c to plat-samsung
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move map-base " Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move DMA support " Ben Dooks
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move pm.c to plat-samsung, it should be usable by all Samsung systems
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/plat-s3c/Makefile | 4 ----
arch/arm/plat-samsung/Makefile | 1 +
arch/arm/{plat-s3c => plat-samsung}/pm.c | 0
3 files changed, 1 insertions(+), 4 deletions(-)
rename arch/arm/{plat-s3c => plat-samsung}/pm.c (100%)
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index 89dbdb0..197b9bd 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -17,7 +17,3 @@ obj-y += time.o
# DMA support
obj-$(CONFIG_S3C_DMA) += dma.o
-
-# PM support
-
-obj-$(CONFIG_PM) += pm.o
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index c8c8cae..629fd9f 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
# PM support
+obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_PM) += pm-gpio.o
obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-samsung/pm.c
similarity index 100%
rename from arch/arm/plat-s3c/pm.c
rename to arch/arm/plat-samsung/pm.c
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Move DMA support to plat-samsung
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (2 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move pm.c " Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move the last build from plat-s3c " Ben Dooks
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move the core of the DMA support to plat-samsung for everyone to use.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/plat-s3c/Makefile | 4 ----
arch/arm/plat-samsung/Makefile | 4 ++++
arch/arm/{plat-s3c => plat-samsung}/dma.c | 0
.../{plat-s3c => plat-samsung}/include/plat/dma.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename arch/arm/{plat-s3c => plat-samsung}/dma.c (100%)
rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma.h (98%)
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index 197b9bd..2a3c4a4 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -13,7 +13,3 @@ obj- :=
obj-y += init.o
obj-y += time.o
-
-# DMA support
-
-obj-$(CONFIG_S3C_DMA) += dma.o
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 629fd9f..facc7e3 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -39,6 +39,10 @@ obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
+# DMA support
+
+obj-$(CONFIG_S3C_DMA) += dma.o
+
# PM support
obj-$(CONFIG_PM) += pm.o
diff --git a/arch/arm/plat-s3c/dma.c b/arch/arm/plat-samsung/dma.c
similarity index 100%
rename from arch/arm/plat-s3c/dma.c
rename to arch/arm/plat-samsung/dma.c
diff --git a/arch/arm/plat-s3c/include/plat/dma.h b/arch/arm/plat-samsung/include/plat/dma.h
similarity index 98%
rename from arch/arm/plat-s3c/include/plat/dma.h
rename to arch/arm/plat-samsung/include/plat/dma.h
index e429d10..7584d75 100644
--- a/arch/arm/plat-s3c/include/plat/dma.h
+++ b/arch/arm/plat-samsung/include/plat/dma.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/dma.h
+/* arch/arm/plat-samsung/include/plat/dma.h
*
* Copyright (C) 2003-2006 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (3 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move DMA support " Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx Ben Dooks
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move the init.c and time.c files to plat-samsung from plat-s3c, thus
clearing the last files that are being built in here.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/plat-s3c/Makefile | 4 +---
arch/arm/plat-samsung/Makefile | 2 ++
arch/arm/plat-samsung/dma.c | 2 +-
arch/arm/{plat-s3c => plat-samsung}/init.c | 0
arch/arm/{plat-s3c => plat-samsung}/time.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename arch/arm/{plat-s3c => plat-samsung}/init.c (100%)
rename arch/arm/{plat-s3c => plat-samsung}/time.c (99%)
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index 2a3c4a4..867c9cf 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -6,10 +6,8 @@
obj-y :=
obj-m :=
-obj-n :=
+obj-n := dummy.o
obj- :=
# Core support for all Samsung SoCs
-obj-y += init.o
-obj-y += time.o
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index facc7e3..22c89d0 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -11,6 +11,8 @@ obj- :=
# Objects we always build independent of SoC choice
+obj-y += init.o
+obj-y += time.o
obj-y += clock.o
obj-y += pwm-clock.o
obj-y += gpio.o
diff --git a/arch/arm/plat-samsung/dma.c b/arch/arm/plat-samsung/dma.c
index a995850..f82c68d 100644
--- a/arch/arm/plat-samsung/dma.c
+++ b/arch/arm/plat-samsung/dma.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c/dma.c
+/* linux/arch/arm/plat-samsung/dma.c
*
* Copyright (c) 2003-2009 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
diff --git a/arch/arm/plat-s3c/init.c b/arch/arm/plat-samsung/init.c
similarity index 100%
rename from arch/arm/plat-s3c/init.c
rename to arch/arm/plat-samsung/init.c
diff --git a/arch/arm/plat-s3c/time.c b/arch/arm/plat-samsung/time.c
similarity index 99%
rename from arch/arm/plat-s3c/time.c
rename to arch/arm/plat-samsung/time.c
index 3b27b29..2231d80 100644
--- a/arch/arm/plat-s3c/time.c
+++ b/arch/arm/plat-samsung/time.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c24xx/time.c
+/* linux/arch/arm/plat-samsung/time.c
*
* Copyright (C) 2003-2005 Simtec Electronics
* Ben Dooks, <ben@simtec.co.uk>
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (4 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move the last build from plat-s3c " Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx Ben Dooks
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx
as necessary. The S3C_BOOT entries and the DMA configuration can go to
plat-samsung. The low-level UART configurations are currently S3C2XX
specific and can go to plat-s3c24xx.
Eliminating plat-s3c from the build process will be submitted seperately.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/plat-s3c/Kconfig | 85 -----------------------------------------
arch/arm/plat-s3c24xx/Kconfig | 22 +++++++++++
arch/arm/plat-samsung/Kconfig | 59 ++++++++++++++++++++++++++++
3 files changed, 81 insertions(+), 85 deletions(-)
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 2367908..6108ba9 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -9,88 +9,3 @@ config PLAT_S3C
select NO_IOPORT
help
Base platform code for any Samsung S3C device
-
-# low-level serial option nodes
-
-if PLAT_S3C
-
-config CPU_LLSERIAL_S3C2410_ONLY
- bool
- default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
-
-config CPU_LLSERIAL_S3C2440_ONLY
- bool
- default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
-
-config CPU_LLSERIAL_S3C2410
- bool
- help
- Selected if there is an S3C2410 (or register compatible) serial
- low-level implementation needed
-
-config CPU_LLSERIAL_S3C2440
- bool
- help
- Selected if there is an S3C2440 (or register compatible) serial
- low-level implementation needed
-
-# boot configurations
-
-comment "Boot options"
-
-config S3C_BOOT_WATCHDOG
- bool "S3C Initialisation watchdog"
- depends on S3C2410_WATCHDOG
- help
- Say y to enable the watchdog during the kernel decompression
- stage. If the kernel fails to uncompress, then the watchdog
- will trigger a reset and the system should restart.
-
-config S3C_BOOT_ERROR_RESET
- bool "S3C Reboot on decompression error"
- help
- Say y here to use the watchdog to reset the system if the
- kernel decompressor detects an error during decompression.
-
-config S3C_BOOT_UART_FORCE_FIFO
- bool "Force UART FIFO on during boot process"
- default y
- help
- Say Y here to force the UART FIFOs on during the kernel
- uncompressor
-
-
-config S3C_LOWLEVEL_UART_PORT
- int "S3C UART to use for low-level messages"
- default 0
- help
- Choice of which UART port to use for the low-level messages,
- such as the `Uncompressing...` at start time. The value of
- this configuration should be between zero and two. The port
- must have been initialised by the boot-loader before use.
-
-# options for gpiolib support
-
-config S3C_GPIO_SPACE
- int "Space between gpio banks"
- default 0
- help
- Add a number of spare GPIO entries between each bank for debugging
- purposes. This allows any problems where an counter overflows from
- one bank to another to be caught, at the expense of using a little
- more memory.
-
-config S3C_GPIO_TRACK
- bool
- help
- Internal configuration option to enable the s3c specific gpio
- chip tracking if the platform requires it.
-
-# DMA
-
-config S3C_DMA
- bool
- help
- Internal configuration for S3C DMA core
-
-endif
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index a806f35..d725739 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -14,6 +14,28 @@ config PLAT_S3C24XX
if PLAT_S3C24XX
+# low-level serial option nodes
+
+config CPU_LLSERIAL_S3C2410_ONLY
+ bool
+ default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
+
+config CPU_LLSERIAL_S3C2440_ONLY
+ bool
+ default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
+
+config CPU_LLSERIAL_S3C2410
+ bool
+ help
+ Selected if there is an S3C2410 (or register compatible) serial
+ low-level implementation needed
+
+config CPU_LLSERIAL_S3C2440
+ bool
+ help
+ Selected if there is an S3C2440 (or register compatible) serial
+ low-level implementation needed
+
# code that is shared between a number of the s3c24xx implementations
config S3C2410_CLOCK
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 72da646..93bd893 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -13,6 +13,43 @@ config PLAT_SAMSUNG
if PLAT_SAMSUNG
+# boot configurations
+
+comment "Boot options"
+
+config S3C_BOOT_WATCHDOG
+ bool "S3C Initialisation watchdog"
+ depends on S3C2410_WATCHDOG
+ help
+ Say y to enable the watchdog during the kernel decompression
+ stage. If the kernel fails to uncompress, then the watchdog
+ will trigger a reset and the system should restart.
+
+config S3C_BOOT_ERROR_RESET
+ bool "S3C Reboot on decompression error"
+ help
+ Say y here to use the watchdog to reset the system if the
+ kernel decompressor detects an error during decompression.
+
+config S3C_BOOT_UART_FORCE_FIFO
+ bool "Force UART FIFO on during boot process"
+ default y
+ help
+ Say Y here to force the UART FIFOs on during the kernel
+ uncompressor
+
+
+config S3C_LOWLEVEL_UART_PORT
+ int "S3C UART to use for low-level messages"
+ default 0
+ help
+ Choice of which UART port to use for the low-level messages,
+ such as the `Uncompressing...` at start time. The value of
+ this configuration should be between zero and two. The port
+ must have been initialised by the boot-loader before use.
+
+# clock options
+
config SAMSUNG_CLKSRC
bool
help
@@ -81,6 +118,21 @@ config SAMSUNG_GPIO_EXTRA
provides. This allows expanding the GPIO space for use with
GPIO expanders.
+config S3C_GPIO_SPACE
+ int "Space between gpio banks"
+ default 0
+ help
+ Add a number of spare GPIO entries between each bank for debugging
+ purposes. This allows any problems where an counter overflows from
+ one bank to another to be caught, at the expense of using a little
+ more memory.
+
+config S3C_GPIO_TRACK
+ bool
+ help
+ Internal configuration option to enable the s3c specific gpio
+ chip tracking if the platform requires it.
+
# ADC driver
config S3C_ADC
@@ -138,6 +190,13 @@ config S3C64XX_DEV_SPI
Compile in platform device definitions for S3C64XX's type
SPI controllers.
+# DMA
+
+config S3C_DMA
+ bool
+ help
+ Internal configuration for S3C DMA core
+
comment "Power management"
config SAMSUNG_PM_DEBUG
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (5 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Select NO_IOPORT for plat-samsung Ben Dooks
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Continue the clearout of plat-s3c by moving audio-simtec.h to plat-s3c24xx
as there are no current implementations outside of this platform.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
.../include/plat/audio-simtec.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename arch/arm/{plat-s3c => plat-s3c24xx}/include/plat/audio-simtec.h (95%)
diff --git a/arch/arm/plat-s3c/include/plat/audio-simtec.h b/arch/arm/plat-s3c24xx/include/plat/audio-simtec.h
similarity index 95%
rename from arch/arm/plat-s3c/include/plat/audio-simtec.h
rename to arch/arm/plat-s3c24xx/include/plat/audio-simtec.h
index 53a9365..de5e88f 100644
--- a/arch/arm/plat-s3c/include/plat/audio-simtec.h
+++ b/arch/arm/plat-s3c24xx/include/plat/audio-simtec.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/audio-simtec.h
+/* arch/arm/plat-s3c24xx/include/plat/audio-simtec.h
*
* Copyright 2008 Simtec Electronics
* http://armlinux.simtec.co.uk/
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Select NO_IOPORT for plat-samsung
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (6 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move include/mach files out of plat-s3c Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: S3C: Remove old plat-s3c directory and unused contents Ben Dooks
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
All these platforms select NO_IOPORT, so move it to plat-samsung Kconfig
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/plat-samsung/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 93bd893..d552c65 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -7,6 +7,7 @@
config PLAT_SAMSUNG
bool
depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX || ARCH_S5PC1XX
+ select NO_IOPORT
default y
help
Base platform code for all Samsung SoC based systems
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: SAMSUNG: Move include/mach files out of plat-s3c
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (7 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Select NO_IOPORT for plat-samsung Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
2010-01-29 9:02 ` [PATCH] ARM: S3C: Remove old plat-s3c directory and unused contents Ben Dooks
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Move the include/mach files out of plat-s3c and into the relevant
machine files. This does mean copying the files, but there is nowhere
else to put them.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/mach-s3c2410/include/mach/timex.h | 24 ++++++++++++++++++++++++
arch/arm/mach-s3c2410/include/mach/vmalloc.h | 20 ++++++++++++++++++++
arch/arm/mach-s3c24a0/include/mach/io.h | 18 ++++++++++++++++++
arch/arm/mach-s3c6400/include/mach/io.h | 18 ++++++++++++++++++
arch/arm/mach-s3c6400/include/mach/timex.h | 24 ++++++++++++++++++++++++
arch/arm/mach-s3c6400/include/mach/vmalloc.h | 20 ++++++++++++++++++++
6 files changed, 124 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-s3c2410/include/mach/timex.h
create mode 100644 arch/arm/mach-s3c2410/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-s3c24a0/include/mach/io.h
create mode 100644 arch/arm/mach-s3c6400/include/mach/io.h
create mode 100644 arch/arm/mach-s3c6400/include/mach/timex.h
create mode 100644 arch/arm/mach-s3c6400/include/mach/vmalloc.h
diff --git a/arch/arm/mach-s3c2410/include/mach/timex.h b/arch/arm/mach-s3c2410/include/mach/timex.h
new file mode 100644
index 0000000..fe9ca1f
--- /dev/null
+++ b/arch/arm/mach-s3c2410/include/mach/timex.h
@@ -0,0 +1,24 @@
+/* arch/arm/mach-s3c2410/include/mach/timex.h
+ *
+ * Copyright (c) 2003-2005 Simtec Electronics
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C2410 - time parameters
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_TIMEX_H
+#define __ASM_ARCH_TIMEX_H
+
+/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
+ * a variable is useless. It seems as long as we make our timers an
+ * exact multiple of HZ, any value that makes a 1->1 correspondence
+ * for the time conversion functions to/from jiffies is acceptable.
+*/
+
+#define CLOCK_TICK_RATE 12000000
+
+#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-s3c2410/include/mach/vmalloc.h b/arch/arm/mach-s3c2410/include/mach/vmalloc.h
new file mode 100644
index 0000000..315b007
--- /dev/null
+++ b/arch/arm/mach-s3c2410/include/mach/vmalloc.h
@@ -0,0 +1,20 @@
+/* arch/arm/mach-s3c2410/include/mach/vmalloc.h
+ *
+ * from arch/arm/mach-iop3xx/include/mach/vmalloc.h
+ *
+ * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
+ * http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * S3C2410 vmalloc definition
+*/
+
+#ifndef __ASM_ARCH_VMALLOC_H
+#define __ASM_ARCH_VMALLOC_H
+
+#define VMALLOC_END (0xE0000000)
+
+#endif /* __ASM_ARCH_VMALLOC_H */
diff --git a/arch/arm/mach-s3c24a0/include/mach/io.h b/arch/arm/mach-s3c24a0/include/mach/io.h
new file mode 100644
index 0000000..4326c30
--- /dev/null
+++ b/arch/arm/mach-s3c24a0/include/mach/io.h
@@ -0,0 +1,18 @@
+/* arch/arm/mach-s3c24a0/include/mach/io.h
+ *
+ * Copyright 2008 Simtec Electronics
+ * Ben Dooks <ben-linux@fluff.org>
+ *
+ * Default IO routines for S3C24A0
+ */
+
+#ifndef __ASM_ARM_ARCH_IO_H
+#define __ASM_ARM_ARCH_IO_H
+
+/* No current ISA/PCI bus support. */
+#define __io(a) __typesafe_io(a)
+#define __mem_pci(a) (a)
+
+#define IO_SPACE_LIMIT (0xFFFFFFFF)
+
+#endif
diff --git a/arch/arm/mach-s3c6400/include/mach/io.h b/arch/arm/mach-s3c6400/include/mach/io.h
new file mode 100644
index 0000000..c02cc0a
--- /dev/null
+++ b/arch/arm/mach-s3c6400/include/mach/io.h
@@ -0,0 +1,18 @@
+/* arch/arm/mach-s3c6400/include/mach/io.h
+ *
+ * Copyright 2008 Simtec Electronics
+ * Ben Dooks <ben-linux@fluff.org>
+ *
+ * Default IO routines for S3C64XX based
+ */
+
+#ifndef __ASM_ARM_ARCH_IO_H
+#define __ASM_ARM_ARCH_IO_H
+
+/* No current ISA/PCI bus support. */
+#define __io(a) __typesafe_io(a)
+#define __mem_pci(a) (a)
+
+#define IO_SPACE_LIMIT (0xFFFFFFFF)
+
+#endif
diff --git a/arch/arm/mach-s3c6400/include/mach/timex.h b/arch/arm/mach-s3c6400/include/mach/timex.h
new file mode 100644
index 0000000..cf34deb
--- /dev/null
+++ b/arch/arm/mach-s3c6400/include/mach/timex.h
@@ -0,0 +1,24 @@
+/* arch/arm/mach-s3c6400/include/mach/timex.h
+ *
+ * Copyright (c) 2003-2005 Simtec Electronics
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C6400 - time parameters
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_TIMEX_H
+#define __ASM_ARCH_TIMEX_H
+
+/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
+ * a variable is useless. It seems as long as we make our timers an
+ * exact multiple of HZ, any value that makes a 1->1 correspondence
+ * for the time conversion functions to/from jiffies is acceptable.
+*/
+
+#define CLOCK_TICK_RATE 12000000
+
+#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-s3c6400/include/mach/vmalloc.h b/arch/arm/mach-s3c6400/include/mach/vmalloc.h
new file mode 100644
index 0000000..fe54c7e
--- /dev/null
+++ b/arch/arm/mach-s3c6400/include/mach/vmalloc.h
@@ -0,0 +1,20 @@
+/* arch/arm/mach-s3c6400/include/mach/vmalloc.h
+ *
+ * from arch/arm/mach-iop3xx/include/mach/vmalloc.h
+ *
+ * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
+ * http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * S3C6400 vmalloc definition
+*/
+
+#ifndef __ASM_ARCH_VMALLOC_H
+#define __ASM_ARCH_VMALLOC_H
+
+#define VMALLOC_END (0xE0000000)
+
+#endif /* __ASM_ARCH_VMALLOC_H */
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] ARM: S3C: Remove old plat-s3c directory and unused contents
2010-01-29 9:02 Eliminate plat-s3c Ben Dooks
` (8 preceding siblings ...)
2010-01-29 9:02 ` [PATCH] ARM: SAMSUNG: Move include/mach files out of plat-s3c Ben Dooks
@ 2010-01-29 9:02 ` Ben Dooks
9 siblings, 0 replies; 11+ messages in thread
From: Ben Dooks @ 2010-01-29 9:02 UTC (permalink / raw)
To: linux-arm-kernel
Remove the plat-s3c directory, as it isn't being used anymore and then
remove it from the ARM build.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/Kconfig | 1 -
arch/arm/Makefile | 8 ++++----
arch/arm/plat-s3c/Kconfig | 11 -----------
arch/arm/plat-s3c/Makefile | 13 -------------
arch/arm/plat-s3c/include/mach/io.h | 18 ------------------
arch/arm/plat-s3c/include/mach/timex.h | 26 --------------------------
arch/arm/plat-s3c/include/mach/vmalloc.h | 20 --------------------
7 files changed, 4 insertions(+), 93 deletions(-)
delete mode 100644 arch/arm/plat-s3c/Kconfig
delete mode 100644 arch/arm/plat-s3c/Makefile
delete mode 100644 arch/arm/plat-s3c/include/mach/io.h
delete mode 100644 arch/arm/plat-s3c/include/mach/timex.h
delete mode 100644 arch/arm/plat-s3c/include/mach/vmalloc.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3bc5169..20844fc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -785,7 +785,6 @@ source "arch/arm/mach-dove/Kconfig"
source "arch/arm/plat-samsung/Kconfig"
source "arch/arm/plat-s3c24xx/Kconfig"
source "arch/arm/plat-s3c64xx/Kconfig"
-source "arch/arm/plat-s3c/Kconfig"
source "arch/arm/plat-s5p/Kconfig"
source "arch/arm/plat-s5pc1xx/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index bbcd512..774f66a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -182,10 +182,10 @@ plat-$(CONFIG_PLAT_IOP) := iop
plat-$(CONFIG_PLAT_NOMADIK) := nomadik
plat-$(CONFIG_PLAT_ORION) := orion
plat-$(CONFIG_PLAT_PXA) := pxa
-plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung
-plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung
-plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
-plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c
+plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung
+plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx samsung
+plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx samsung
+plat-$(CONFIG_PLAT_S5P) := s5p samsung
plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
ifeq ($(CONFIG_ARCH_EBSA110),y)
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
deleted file mode 100644
index 6108ba9..0000000
--- a/arch/arm/plat-s3c/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2007 Simtec Electronics
-#
-# Licensed under GPLv2
-
-config PLAT_S3C
- bool
- depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX
- default y
- select NO_IOPORT
- help
- Base platform code for any Samsung S3C device
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
deleted file mode 100644
index 867c9cf..0000000
--- a/arch/arm/plat-s3c/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# arch/arm/plat-s3c/Makefile
-#
-# Copyright 2008 Simtec Electronics
-#
-# Licensed under GPLv2
-
-obj-y :=
-obj-m :=
-obj-n := dummy.o
-obj- :=
-
-# Core support for all Samsung SoCs
-
diff --git a/arch/arm/plat-s3c/include/mach/io.h b/arch/arm/plat-s3c/include/mach/io.h
deleted file mode 100644
index f6a5363..0000000
--- a/arch/arm/plat-s3c/include/mach/io.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* arch/arm/plat-s3c/include/mach/io.h
- *
- * Copyright 2008 Simtec Electronics
- * Ben Dooks <ben-linux@fluff.org>
- *
- * Default IO routines for plat-s3c based systems, such as S3C24A0
- */
-
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-/* No current ISA/PCI bus support. */
-#define __io(a) __typesafe_io(a)
-#define __mem_pci(a) (a)
-
-#define IO_SPACE_LIMIT (0xFFFFFFFF)
-
-#endif
diff --git a/arch/arm/plat-s3c/include/mach/timex.h b/arch/arm/plat-s3c/include/mach/timex.h
deleted file mode 100644
index 2a425ed..0000000
--- a/arch/arm/plat-s3c/include/mach/timex.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/timex.h
- *
- * Copyright (c) 2003-2005 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2410 - time parameters
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_TIMEX_H
-#define __ASM_ARCH_TIMEX_H
-
-/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
- * a variable is useless. It seems as long as we make our timers an
- * exact multiple of HZ, any value that makes a 1->1 correspondence
- * for the time conversion functions to/from jiffies is acceptable.
-*/
-
-
-#define CLOCK_TICK_RATE 12000000
-
-
-#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/plat-s3c/include/mach/vmalloc.h b/arch/arm/plat-s3c/include/mach/vmalloc.h
deleted file mode 100644
index bfd2ca6..0000000
--- a/arch/arm/plat-s3c/include/mach/vmalloc.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* arch/arm/plat-s3c/include/mach/vmalloc.h
- *
- * from arch/arm/mach-iop3xx/include/mach/vmalloc.h
- *
- * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
- * http://www.simtec.co.uk/products/SWLINUX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * S3C2410 vmalloc definition
-*/
-
-#ifndef __ASM_ARCH_VMALLOC_H
-#define __ASM_ARCH_VMALLOC_H
-
-#define VMALLOC_END (0xE0000000)
-
-#endif /* __ASM_ARCH_VMALLOC_H */
--
1.6.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread