Skip to contentSkip to conversation

Eliminate plat-s3c

PATCH New Ben Dooks 1 participant 11 messages Jan 29, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

This series eliminates plat-s3c from the build, as it can mostly be moved into plat-samsung and plat-s3c24xx.

May end up squashing the series down a bit.

author
#1 lore raw

PATCH 1/1 ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung

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 <[email protected]>
---
 .../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%)
arch/arm/plat-samsung/include/plat/audio.h renamed from arch/arm/plat-s3c/include/plat/audio.h +1 -1
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
@@ -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 <[email protected]>
arch/arm/plat-samsung/include/plat/cpu-freq.h renamed from arch/arm/plat-s3c/include/plat/cpu-freq.h +1 -1
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
@@ -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/
arch/arm/plat-samsung/include/plat/cpu.h renamed from arch/arm/plat-s3c/include/plat/cpu.h +1 -1
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
@@ -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 <[email protected]>
arch/arm/plat-samsung/include/plat/debug-macro.S renamed from arch/arm/plat-s3c/include/plat/debug-macro.S +1 -1
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
@@ -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/
arch/arm/plat-samsung/include/plat/devs.h renamed from arch/arm/plat-s3c/include/plat/devs.h +1 -1
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
@@ -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 <[email protected]>
arch/arm/plat-samsung/include/plat/fb.h renamed from arch/arm/plat-s3c/include/plat/fb.h +1 -1
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
@@ -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
arch/arm/plat-samsung/include/plat/pm.h renamed from arch/arm/plat-s3c/include/plat/pm.h +1 -1
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
@@ -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/
arch/arm/plat-samsung/include/plat/regs-fb-v4.h renamed from arch/arm/plat-s3c/include/plat/regs-fb-v4.h +1 -1
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
@@ -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
arch/arm/plat-samsung/include/plat/regs-fb.h renamed from arch/arm/plat-s3c/include/plat/regs-fb.h +1 -1
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
@@ -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
arch/arm/plat-samsung/include/plat/regs-serial.h renamed from arch/arm/plat-s3c/include/plat/regs-serial.h +1 -1
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
@@ -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
  *
arch/arm/plat-samsung/include/plat/uncompress.h renamed from arch/arm/plat-s3c/include/plat/uncompress.h +1 -1
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
@@ -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/
arch/arm/plat-samsung/include/plat/usb-control.h renamed from arch/arm/plat-s3c/include/plat/usb-control.h +1 -1
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
@@ -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 <[email protected]>
Signature · 1 line
1.6.0.4
author
#2 lore raw

PATCH 1/1 ARM: SAMSUNG: Move map-base to plat-samsung

In reply to Ben Dooks

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 <[email protected]>
---
 .../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%)
arch/arm/plat-samsung/include/plat/map-base.h renamed from arch/arm/plat-s3c/include/plat/map-base.h +0 -0
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
Signature · 1 line
1.6.0.4
author
#3 lore raw

PATCH 1/1 ARM: SAMSUNG: Move pm.c to plat-samsung

In reply to Ben Dooks

Move pm.c to plat-samsung, it should be usable by all Samsung systems

Signed-off-by Ben Dooks <[email protected]>
---
 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%)
arch/arm/plat-s3c/Makefile +0 -4
index 89dbdb0..197b9bd 100644
@@ -17,7 +17,3 @@ obj-y				+= time.o
 # DMA support
 
 obj-$(CONFIG_S3C_DMA)		+= dma.o
-
-# PM support
-
-obj-$(CONFIG_PM)		+= pm.o
arch/arm/plat-samsung/Makefile +1 -0
index c8c8cae..629fd9f 100644
@@ -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
arch/arm/plat-samsung/pm.c renamed from arch/arm/plat-s3c/pm.c +0 -0
similarity index 100%
rename from arch/arm/plat-s3c/pm.c
rename to arch/arm/plat-samsung/pm.c
Signature · 1 line
1.6.0.4
author
#4 lore raw

PATCH 1/1 ARM: SAMSUNG: Move DMA support to plat-samsung

In reply to Ben Dooks

Move the core of the DMA support to plat-samsung for everyone to use.

Signed-off-by Ben Dooks <[email protected]>
---
 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%)
arch/arm/plat-s3c/Makefile +0 -4
index 197b9bd..2a3c4a4 100644
@@ -13,7 +13,3 @@ obj-				:=
 
 obj-y				+= init.o
 obj-y				+= time.o
-
-# DMA support
-
-obj-$(CONFIG_S3C_DMA)		+= dma.o
arch/arm/plat-samsung/Makefile +4 -0
index 629fd9f..facc7e3 100644
@@ -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
arch/arm/plat-samsung/dma.c renamed from arch/arm/plat-s3c/dma.c +0 -0
similarity index 100%
rename from arch/arm/plat-s3c/dma.c
rename to arch/arm/plat-samsung/dma.c
arch/arm/plat-samsung/include/plat/dma.h renamed from arch/arm/plat-s3c/include/plat/dma.h +1 -1
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
@@ -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 <[email protected]>
Signature · 1 line
1.6.0.4
author
#5 lore raw

PATCH 1/1 ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung

In reply to Ben Dooks

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 <[email protected]>
---
 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%)
arch/arm/plat-s3c/Makefile +1 -3
index 2a3c4a4..867c9cf 100644
@@ -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
arch/arm/plat-samsung/Makefile +2 -0
index facc7e3..22c89d0 100644
@@ -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
arch/arm/plat-samsung/dma.c +1 -1
index a995850..f82c68d 100644
@@ -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 <[email protected]>
arch/arm/plat-samsung/init.c renamed from arch/arm/plat-s3c/init.c +0 -0
similarity index 100%
rename from arch/arm/plat-s3c/init.c
rename to arch/arm/plat-samsung/init.c
arch/arm/plat-samsung/time.c renamed from arch/arm/plat-s3c/time.c +1 -1
similarity index 99%
rename from arch/arm/plat-s3c/time.c
rename to arch/arm/plat-samsung/time.c
index 3b27b29..2231d80 100644
@@ -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, <[email protected]>
Signature · 1 line
1.6.0.4
author
#6 lore raw

PATCH 1/1 ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx

In reply to Ben Dooks

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 <[email protected]>
---
 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(-)
arch/arm/plat-s3c/Kconfig +0 -85
index 2367908..6108ba9 100644
@@ -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
arch/arm/plat-s3c24xx/Kconfig +22 -0
index a806f35..d725739 100644
@@ -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
arch/arm/plat-samsung/Kconfig +59 -0

77 lines not on this page · raw message

Signature · 1 line
1.6.0.4
author
#7 lore raw

PATCH 1/1 ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx

In reply to Ben Dooks

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 <[email protected]>
---
 .../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%)
arch/arm/plat-s3c24xx/include/plat/audio-simtec.h renamed from arch/arm/plat-s3c/include/plat/audio-simtec.h +1 -1
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
@@ -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/
Signature · 1 line
1.6.0.4
author
#8 lore raw

PATCH 1/1 ARM: SAMSUNG: Select NO_IOPORT for plat-samsung

In reply to Ben Dooks

All these platforms select NO_IOPORT, so move it to plat-samsung Kconfig

Signed-off-by Ben Dooks <[email protected]>
---
 arch/arm/plat-samsung/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/plat-samsung/Kconfig +1 -0
index 93bd893..d552c65 100644
@@ -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
Signature · 1 line
1.6.0.4
author
#9 lore raw

PATCH 1/1 ARM: SAMSUNG: Move include/mach files out of plat-s3c

In reply to Ben Dooks

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 <[email protected]>
---
 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
arch/arm/mach-s3c2410/include/mach/timex.h new file +24 -0
new file mode 100644
index 0000000..fe9ca1f
@@ -0,0 +1,24 @@
+/* arch/arm/mach-s3c2410/include/mach/timex.h
+ *
+ * Copyright (c) 2003-2005 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *
+ * 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 */
arch/arm/mach-s3c2410/include/mach/vmalloc.h new file +20 -0
new file mode 100644
index 0000000..315b007
@@ -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 <[email protected]>
+ *		      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 */
arch/arm/mach-s3c24a0/include/mach/io.h new file +18 -0
new file mode 100644
index 0000000..4326c30
@@ -0,0 +1,18 @@
+/* arch/arm/mach-s3c24a0/include/mach/io.h
+ *
+ * Copyright 2008 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *
+ * 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
arch/arm/mach-s3c6400/include/mach/io.h new file +18 -0
new file mode 100644
index 0000000..c02cc0a
@@ -0,0 +1,18 @@
+/* arch/arm/mach-s3c6400/include/mach/io.h
+ *
+ * Copyright 2008 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *
+ * 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
arch/arm/mach-s3c6400/include/mach/timex.h new file +24 -0
new file mode 100644
index 0000000..cf34deb
@@ -0,0 +1,24 @@
+/* arch/arm/mach-s3c6400/include/mach/timex.h
+ *
+ * Copyright (c) 2003-2005 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *
+ * 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 */
arch/arm/mach-s3c6400/include/mach/vmalloc.h new file +20 -0
new file mode 100644
index 0000000..fe54c7e
@@ -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 <[email protected]>
+ *		      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 */
Signature · 1 line
1.6.0.4
author
#10 lore raw

PATCH 1/1 ARM: S3C: Remove old plat-s3c directory and unused contents

In reply to Ben Dooks

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 <[email protected]>
---
 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
arch/arm/Kconfig +0 -1
index 3bc5169..20844fc 100644
@@ -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"
arch/arm/Makefile +4 -4
index bbcd512..774f66a 100644
@@ -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)
arch/arm/plat-s3c/Kconfig deleted +0 -11
deleted file mode 100644
index 6108ba9..0000000
@@ -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
arch/arm/plat-s3c/Makefile deleted +0 -13
deleted file mode 100644
index 867c9cf..0000000
@@ -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
-
arch/arm/plat-s3c/include/mach/io.h deleted +0 -18
deleted file mode 100644
index f6a5363..0000000
@@ -1,18 +0,0 @@
-/* arch/arm/plat-s3c/include/mach/io.h
- *
- * Copyright 2008 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *
- * 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
arch/arm/plat-s3c/include/mach/timex.h deleted +0 -26
deleted file mode 100644
index 2a425ed..0000000
@@ -1,26 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/timex.h
- *
- * Copyright (c) 2003-2005 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *
- * 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 */
arch/arm/plat-s3c/include/mach/vmalloc.h deleted +0 -20
deleted file mode 100644
index bfd2ca6..0000000
@@ -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 <[email protected]>
- *		      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 */
Signature · 1 line
1.6.0.4