S3C2440/S3C2442 merge

PATCH New Ben Dooks 1 participant 8 messages Jan 26, 2010

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Ben Dooks

author

2010-01-26 07:57 UTC #0 lore raw

Merge mach-s3c2440 and mach-s3c2442 into one mach-s3c2440 directory

Ben Dooks

author

2010-01-26 07:58 UTC #1 lore raw

PATCH 1/1 ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440

Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440 directory as the S3C2440 and S3C2442 are very close.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/mach-s3c2440/Kconfig                      |   20 ++++++++++++++++-
 arch/arm/mach-s3c2440/Makefile                     |    1 +
 .../include/mach/gta02.h                           |    0
 .../{mach-s3c2442 => mach-s3c2440}/mach-gta02.c    |    0
 arch/arm/mach-s3c2442/Kconfig                      |   22 --------------------
 arch/arm/mach-s3c2442/Makefile                     |    2 -
 6 files changed, 19 insertions(+), 26 deletions(-)
 rename arch/arm/{mach-s3c2442 => mach-s3c2440}/include/mach/gta02.h (100%)
 rename arch/arm/{mach-s3c2442 => mach-s3c2440}/mach-gta02.c (100%)

arch/arm/mach-s3c2440/Kconfig +18 -2

index 8087935..5486929 100644
@@ -21,8 +21,7 @@ config S3C2440_DMA
 	help
 	  Support for S3C2440 specific DMA code5A
 
-
-menu "S3C2440 Machines"
+menu "S3C2440 and S3C2442 Machines"
 
 config MACH_ANUBIS
 	bool "Simtec Electronics ANUBIS"

@@ -37,6 +36,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

@@ -99,6 +110,11 @@ config SMDK2440_CPU2440
 	select S3C2440_XTAL_16934400
 	select CPU_S3C2440
 
+config SMDK2440_CPU2442
+	bool "SMDM2440 with S3C2442 CPU module"
+	depends on ARCH_S3C2440
+	select CPU_S3C2442
+
 config MACH_AT2440EVB
 	bool "Avantech AT2440EVB development board"
 	select CPU_S3C2440

arch/arm/mach-s3c2440/Makefile +1 -0

index 5f32245..e51497c 100644
@@ -23,6 +23,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/include/mach/gta02.h renamed from arch/arm/mach-s3c2442/include/mach/gta02.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c2442/include/mach/gta02.h
rename to arch/arm/mach-s3c2440/include/mach/gta02.h

arch/arm/mach-s3c2440/mach-gta02.c renamed from arch/arm/mach-s3c2442/mach-gta02.c +0 -0

similarity index 100%
rename from arch/arm/mach-s3c2442/mach-gta02.c
rename to arch/arm/mach-s3c2440/mach-gta02.c

arch/arm/mach-s3c2442/Kconfig +0 ~~-22~~

index 8d38118..4832cd6 100644
@@ -13,25 +13,3 @@ config CPU_S3C2442
 	select CPU_LLSERIAL_S3C2440
 	help
 	  Support for S3C2442 Samsung Mobile CPU based systems.
-
-
-menu "S3C2442 Machines"
-
-config SMDK2440_CPU2442
-	bool "SMDM2440 with S3C2442 CPU module"
-	depends on ARCH_S3C2440
-	select CPU_S3C2442
-
-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
-
-endmenu

arch/arm/mach-s3c2442/Makefile +0 -2

index 2a19113..2a909c6 100644
@@ -12,7 +12,5 @@ obj-				:=
 obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
 obj-$(CONFIG_CPU_S3C2442)	+= clock.o
 
-obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-
 # Machine support

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:58 UTC #2 lore raw

PATCH 1/1 ARM: S3C2442: Merge s3c2442.c and clock.c

In reply to Ben Dooks

Merge s3c2442.c and clock.c as the s3c242.c does not contain much and the clock parts are always built for s3c2442 anyway.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/mach-s3c2442/Makefile  |    1 -
 arch/arm/mach-s3c2442/clock.c   |  153 ---------------------------------------
 arch/arm/mach-s3c2442/s3c2442.c |  153 ++++++++++++++++++++++++++++++++++++---
 3 files changed, 142 insertions(+), 165 deletions(-)
 delete mode 100644 arch/arm/mach-s3c2442/clock.c

arch/arm/mach-s3c2442/Makefile +0 -1

index 2a909c6..7e31ccd 100644
@@ -10,7 +10,6 @@ obj-n				:=
 obj-				:=
 
 obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
-obj-$(CONFIG_CPU_S3C2442)	+= clock.o
 
 # Machine support

arch/arm/mach-s3c2442/clock.c deleted +0 ~~-153~~

153 lines not on this page · raw message

arch/arm/mach-s3c2442/s3c2442.c +142 ~~-11~~

169 lines not on this page · raw message

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:58 UTC #3 lore raw

PATCH 1/1 ARM: S3C2440: Fix SMDK2440 SoC selection

In reply to Ben Dooks

Fix the entries for SMDK2440 should have allowed for S3C2440 or S3C2440 SoC selection but this depended on ARCH_S3C2440 which has not been around for a while.

Remove the dependency to allow this to be selected.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/mach-s3c2440/Kconfig |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

arch/arm/mach-s3c2440/Kconfig +0 -2

index 5486929..45cab7a 100644
@@ -105,14 +105,12 @@ 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"
-	depends on ARCH_S3C2440
 	select CPU_S3C2442
 
 config MACH_AT2440EVB

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:58 UTC #4 lore raw

PATCH 1/1 ARM: S3C244X: Move S3C2442 code into S3C2440

In reply to Ben Dooks

Move the remaining S3C2442 code into mach-s3c2440 as there is only one file currently in there and these two SoCs are very similar.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/mach-s3c2440/Kconfig                     |   12 ++++++++++++
 arch/arm/mach-s3c2440/Makefile                    |    2 ++
 arch/arm/{mach-s3c2442 => mach-s3c2440}/s3c2442.c |    0
 arch/arm/mach-s3c2442/Kconfig                     |   11 -----------
 4 files changed, 14 insertions(+), 11 deletions(-)
 rename arch/arm/{mach-s3c2442 => mach-s3c2440}/s3c2442.c (100%)

arch/arm/mach-s3c2440/Kconfig +12 -0

index 45cab7a..f496385 100644
@@ -15,6 +15,18 @@ 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 S3C2440_DMA
 	bool
 	depends on ARCH_S3C2410 && CPU_S3C24405B

arch/arm/mach-s3c2440/Makefile +2 -0

index e51497c..e8412b3 100644
@@ -10,6 +10,8 @@ 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

arch/arm/mach-s3c2440/s3c2442.c renamed from arch/arm/mach-s3c2442/s3c2442.c +0 -0

similarity index 100%
rename from arch/arm/mach-s3c2442/s3c2442.c
rename to arch/arm/mach-s3c2440/s3c2442.c

arch/arm/mach-s3c2442/Kconfig +0 ~~-11~~

index 4832cd6..29ef066 100644
@@ -2,14 +2,3 @@
 #
 # Licensed under GPLv2
 
-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.

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:58 UTC #5 lore raw

PATCH 1/1 ARM: S3C24XX: Remove old mach-s3c2442

In reply to Ben Dooks

Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440 and remove it from the arch/arm build process.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/Kconfig               |    1 -
 arch/arm/Makefile              |    2 +-
 arch/arm/mach-s3c2442/Kconfig  |    4 ----
 arch/arm/mach-s3c2442/Makefile |   15 ---------------
 4 files changed, 1 insertions(+), 21 deletions(-)
 delete mode 100644 arch/arm/mach-s3c2442/Kconfig
 delete mode 100644 arch/arm/mach-s3c2442/Makefile

arch/arm/Kconfig +0 -1

index 3bc5169..63f726f 100644
@@ -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

index bbcd512..893bcfc 100644
@@ -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-s3c2442/Kconfig deleted +0 -4

deleted file mode 100644
index 29ef066..0000000
@@ -1,4 +0,0 @@
-# Copyright 2007 Simtec Electronics
-#
-# Licensed under GPLv2
-

arch/arm/mach-s3c2442/Makefile deleted +0 ~~-15~~

deleted file mode 100644
index 7e31ccd..0000000
@@ -1,15 +0,0 @@
-# arch/arm/mach-s3c2442/Makefile
-#
-# Copyright 2007 Simtec Electronics
-#
-# Licensed under GPLv2
-
-obj-y				:=
-obj-m				:=
-obj-n				:=
-obj-				:=
-
-obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
-
-# Machine support
-

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:58 UTC #6 lore raw

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

In reply to Ben Dooks

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 Ben Dooks <[email protected]>

---
 arch/arm/mach-s3c2440/Kconfig                      |   42 ++++++++++++++++++++
 arch/arm/mach-s3c2440/Makefile                     |    8 ++++
 .../{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c |    0
 .../{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c   |    0
 arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c  |    2 +-
 arch/arm/plat-s3c24xx/Kconfig                      |   41 -------------------
 arch/arm/plat-s3c24xx/Makefile                     |    7 ---
 arch/arm/plat-s3c24xx/cpu.c                        |    2 +-
 arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h |    2 +-
 9 files changed, 53 insertions(+), 51 deletions(-)
 rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c (100%)
 rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c (100%)
 rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c (99%)
 rename arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h (92%)

arch/arm/mach-s3c2440/Kconfig +42 -0

index f496385..7f46526 100644
@@ -27,6 +27,48 @@ config CPU_S3C2442
 	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

arch/arm/mach-s3c2440/Makefile +8 -0

index e8412b3..c85ba32 100644
@@ -16,6 +16,14 @@ 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

arch/arm/mach-s3c2440/s3c244x-clock.c renamed from arch/arm/plat-s3c24xx/s3c244x-clock.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/s3c244x-clock.c
rename to arch/arm/mach-s3c2440/s3c244x-clock.c

arch/arm/mach-s3c2440/s3c244x-irq.c renamed from arch/arm/plat-s3c24xx/s3c244x-irq.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/s3c244x-irq.c
rename to arch/arm/mach-s3c2440/s3c244x-irq.c

arch/arm/mach-s3c2440/s3c244x.c renamed from arch/arm/plat-s3c24xx/s3c244x.c +1 -1

similarity index 99%
rename from arch/arm/plat-s3c24xx/s3c244x.c
rename to arch/arm/mach-s3c2440/s3c244x.c
index 12623a4..46e13db 100644
@@ -39,7 +39,7 @@
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2440.h>
-#include "s3c244x.h"
+#include <plat/s3c244x.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/plat-s3c24xx/Kconfig +0 ~~-41~~

53 lines not on this page · raw message

arch/arm/plat-s3c24xx/Makefile +0 -7

index e010026..c2237c4 100644
@@ -25,13 +25,6 @@ obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpu-freq-debugfs.o
 
 # Architecture dependant builds
 
-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
-
 obj-$(CONFIG_PM_SIMTEC)		+= pm-simtec.o
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PM)		+= irq-pm.o

arch/arm/plat-s3c24xx/cpu.c +1 -1

index 4af9dd9..6ecf87a 100644
@@ -49,7 +49,7 @@
 #include <plat/s3c2400.h>
 #include <plat/s3c2410.h>
 #include <plat/s3c2412.h>
-#include "s3c244x.h"
+#include <plat/s3c244x.h>
 #include <plat/s3c2440.h>
 #include <plat/s3c2442.h>
 #include <plat/s3c2443.h>

arch/arm/plat-s3c24xx/include/plat/s3c244x.h renamed from arch/arm/plat-s3c24xx/s3c244x.h +1 -1

similarity index 92%
rename from arch/arm/plat-s3c24xx/s3c244x.h
rename to arch/arm/plat-s3c24xx/include/plat/s3c244x.h
index 6aab5ea..8da0904 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c24xx/s3c244x.h
+/* linux/arch/arm/plat-s3c24xx/include/plat/s3c244x.h
  *
  * Copyright (c) 2004-2005 Simtec Electronics
  *	Ben Dooks <[email protected]>

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:58 UTC #7 lore raw

PATCH 1/1 ARM: S3C244X: Merge <plat/s3c2440.h> and <plat/s3c2442.h> into <plat/s3c244x.h>

In reply to Ben Dooks

Merge these two headers into one.

Note, correct fault in mach-smdk2443.h including the wrong header.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/mach-s3c2440/dsc.c                  |    2 +-
 arch/arm/mach-s3c2440/mach-nexcoder.c        |    2 +-
 arch/arm/mach-s3c2440/mach-smdk2440.c        |    2 +-
 arch/arm/mach-s3c2440/s3c2440.c              |    2 +-
 arch/arm/mach-s3c2440/s3c244x.c              |    1 -
 arch/arm/mach-s3c2443/mach-smdk2443.c        |    2 +-
 arch/arm/plat-s3c24xx/cpu.c                  |    2 --
 arch/arm/plat-s3c24xx/include/plat/s3c2440.h |   17 -----------------
 arch/arm/plat-s3c24xx/include/plat/s3c2442.h |   17 -----------------
 arch/arm/plat-s3c24xx/include/plat/s3c244x.h |   12 ++++++++++++
 10 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2440.h
 delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2442.h

arch/arm/mach-s3c2440/dsc.c +1 -1

index 5540442..9ea66e3 100644
@@ -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)
 {

arch/arm/mach-s3c2440/mach-nexcoder.c +1 -1

index 86a243b..3420415 100644
@@ -41,7 +41,7 @@
 #include <plat/iic.h>
 
 #include <plat/s3c2410.h>
-#include <plat/s3c2440.h>
+#include <plat/s3c244x.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c2440/mach-smdk2440.c +1 -1

index df3e9a3..3ac3d63 100644
@@ -40,7 +40,7 @@
 #include <plat/iic.h>
 
 #include <plat/s3c2410.h>
-#include <plat/s3c2440.h>
+#include <plat/s3c244x.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c2440/s3c2440.c +1 -1

index ac1f7ea..2b68f7e 100644
@@ -29,9 +29,9 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <plat/s3c2440.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/s3c244x.h>
 
 static struct sys_device s3c2440_sysdev = {
 	.cls		= &s3c2440_sysclass,

arch/arm/mach-s3c2440/s3c244x.c +0 -1

index 46e13db..5e4a97e 100644
@@ -38,7 +38,6 @@
 #include <mach/regs-dsc.h>
 
 #include <plat/s3c2410.h>
-#include <plat/s3c2440.h>
 #include <plat/s3c244x.h>
 #include <plat/clock.h>
 #include <plat/devs.h>

arch/arm/mach-s3c2443/mach-smdk2443.c +1 -1

index 039a462..d65afde 100644
@@ -40,7 +40,7 @@
 #include <plat/iic.h>
 
 #include <plat/s3c2410.h>
-#include <plat/s3c2440.h>
+#include <plat/s3c2443.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/plat-s3c24xx/cpu.c +0 -2

index 6ecf87a..9ca64df 100644
@@ -50,8 +50,6 @@
 #include <plat/s3c2410.h>
 #include <plat/s3c2412.h>
 #include <plat/s3c244x.h>
-#include <plat/s3c2440.h>
-#include <plat/s3c2442.h>
 #include <plat/s3c2443.h>
 
 /* table of supported CPUs */

arch/arm/plat-s3c24xx/include/plat/s3c2440.h deleted +0 ~~-17~~

deleted file mode 100644
index 107853b..0000000
@@ -1,17 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/s3c2440.h
- *
- * Copyright (c) 2004-2005 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *
- * Header file for s3c2440 cpu support
- *
- * 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.
-*/
-
-#ifdef CONFIG_CPU_S3C2440
-extern  int s3c2440_init(void);
-#else
-#define s3c2440_init NULL
-#endif

arch/arm/plat-s3c24xx/include/plat/s3c2442.h deleted +0 ~~-17~~

deleted file mode 100644
index 451a23a..0000000
@@ -1,17 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/s3c2442.h
- *
- * Copyright (c) 2006 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *
- * Header file for s3c2442 cpu support
- *
- * 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.
-*/
-
-#ifdef CONFIG_CPU_S3C2442
-extern  int s3c2442_init(void);
-#else
-#define s3c2442_init NULL
-#endif

arch/arm/plat-s3c24xx/include/plat/s3c244x.h +12 -0

index 8da0904..307248d 100644
@@ -23,3 +23,15 @@ extern void s3c244x_init_clocks(int xtal);
 #define s3c244x_init_uarts NULL
 #define s3c244x_map_io NULL
 #endif
+
+#ifdef CONFIG_CPU_S3C2440
+extern  int s3c2440_init(void);
+#else
+#define s3c2440_init NULL
+#endif
+
+#ifdef CONFIG_CPU_S3C2442
+extern  int s3c2442_init(void);
+#else
+#define s3c2442_init NULL
+#endif

Signature · 1 line

1.6.0.4