S3C24XX: Another move of code to the new mach directory

PATCH New Heiko Stübner 2 participants 6 messages Mar 6, 2012 – Mar 7, 2012

Subsystems (3)

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

lore

Share & tools

lore

Heiko Stübner

author

2012-03-06 09:57 UTC #0 lore raw

cover S3C24XX: Another move of code to the new mach directory

This series contains the easy moves of common code for the SMDKs, Simtec boards and device setup from plat-s3c24xx to mach-s3c24xx.

It also contains an extra patch to keep the Simtec code more together.

Changes to the Kconfig and Makefile will probably conflict with the S3C2416-SPI series posted sunday, but this is ok, as the SPI series will probably have to wait for 3.5 anyway and can be redone then.

Heiko Stuebner (4):
ARM: S3C24XX: Move common-smdk code to mach directory
ARM: S3C24XX: move simtec-specific code to mach directory
ARM: S3C24XX: Consolidate Simtec extensions
ARM: S3C24XX: Move device setup files to mach directory

 arch/arm/mach-s3c24xx/Kconfig                      |   62 +++++++++++++++-----
 arch/arm/mach-s3c24xx/Makefile                     |   12 +++-
 .../{plat-s3c24xx => mach-s3c24xx}/common-smdk.c   |    0
 arch/arm/mach-s3c24xx/mach-anubis.c                |    1 +
 arch/arm/mach-s3c24xx/mach-bast.c                  |    3 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    3 +-
 .../arm/{plat-s3c24xx => mach-s3c24xx}/setup-i2c.c |    0
 arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-ts.c |    0
 .../{plat-s3c24xx => mach-s3c24xx}/simtec-audio.c  |    2 +
 .../mach-s3c24xx/{nor-simtec.c => simtec-nor.c}    |    2 +-
 .../pm-simtec.c => mach-s3c24xx/simtec-pm.c}       |    0
 .../mach-s3c24xx/{usb-simtec.c => simtec-usb.c}    |    2 +-
 arch/arm/mach-s3c24xx/{nor-simtec.h => simtec.h}   |    9 +++-
 arch/arm/mach-s3c24xx/usb-simtec.h                 |   16 -----
 arch/arm/plat-s3c24xx/Kconfig                      |   23 -------
 arch/arm/plat-s3c24xx/Makefile                     |   10 ---
 arch/arm/plat-samsung/include/plat/audio-simtec.h  |    3 -
 17 files changed, 72 insertions(+), 76 deletions(-)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/common-smdk.c (100%)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-i2c.c (100%)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-ts.c (100%)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/simtec-audio.c (98%)
 rename arch/arm/mach-s3c24xx/{nor-simtec.c => simtec-nor.c} (98%)
 rename arch/arm/{plat-s3c24xx/pm-simtec.c => mach-s3c24xx/simtec-pm.c} (100%)
 rename arch/arm/mach-s3c24xx/{usb-simtec.c => simtec-usb.c} (99%)
 rename arch/arm/mach-s3c24xx/{nor-simtec.h => simtec.h} (63%)
 delete mode 100644 arch/arm/mach-s3c24xx/usb-simtec.h

Signature · 1 line

1.7.5.4

Heiko Stübner

author

2012-03-06 09:58 UTC #1 lore raw

PATCH 1/4 ARM: S3C24XX: Move common-smdk code to mach directory

This code is used by boards based on the S3C2410/S3C2440/S3C2416. The patch includes also a rename of the option, as the smdk code is not a mach itself, but only an extension with common code.

Signed-off-by Heiko Stuebner <[email protected]>

---
 arch/arm/mach-s3c24xx/Kconfig                      |   19 ++++++++++++++-----
 arch/arm/mach-s3c24xx/Makefile                     |    1 +
 .../{plat-s3c24xx => mach-s3c24xx}/common-smdk.c   |    0
 arch/arm/plat-s3c24xx/Kconfig                      |    5 -----
 arch/arm/plat-s3c24xx/Makefile                     |    1 -
 5 files changed, 15 insertions(+), 11 deletions(-)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/common-smdk.c (100%)

arch/arm/mach-s3c24xx/Kconfig +14 -5

index 48af6fc..7dede07 100644
@@ -81,6 +81,15 @@ config CPU_S3C2443
 	help
 	  Support for the S3C2443 SoC from the S3C24XX line
 
+# common code
+
+config S3C24XX_SMDK
+	bool
+	help
+	  Common machine code for SMDK2410 and SMDK2440
+
+# cpu-specific sections
+
 if CPU_S3C2410
 
 config S3C2410_DMA

@@ -192,7 +201,7 @@ config MACH_QT2410
 
 config ARCH_SMDK2410
 	bool "SMDK2410/A9M2410"
-	select MACH_SMDK
+	select S3C24XX_SMDK
 	help
 	  Say Y here if you are using the SMDK2410 or the derived module A9M2410
 	  <http://www.fsforth.de>

@@ -279,7 +288,7 @@ config MACH_SMDK2412
 config MACH_SMDK2413
 	bool "SMDK2413"
 	select MACH_S3C2413
-	select MACH_SMDK
+	select S3C24XX_SMDK
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_NAND
 	help

@@ -317,7 +326,7 @@ comment "S3C2416 Boards"
 
 config MACH_SMDK2416
 	bool "SMDK2416"
-	select MACH_SMDK
+	select S3C24XX_SMDK
 	select S3C_DEV_FB
 	select S3C_DEV_HSMMC
 	select S3C_DEV_HSMMC1

@@ -420,7 +429,7 @@ config MACH_RX3715
 config ARCH_S3C2440
 	bool "SMDK2440"
 	select S3C2440_XTAL_16934400
-	select MACH_SMDK
+	select S3C24XX_SMDK
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_NAND
 	help

@@ -492,7 +501,7 @@ comment "S3C2443 Boards"
 
 config MACH_SMDK2443
 	bool "SMDK2443"
-	select MACH_SMDK
+	select S3C24XX_SMDK
 	select S3C_DEV_HSMMC1
 	help
 	  Say Y here if you are using an SMDK2443

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

index 876e5e5..b1c3c6f 100644
@@ -77,6 +77,7 @@ 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
 
 # machine additions

arch/arm/mach-s3c24xx/common-smdk.c renamed from arch/arm/plat-s3c24xx/common-smdk.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/common-smdk.c
rename to arch/arm/mach-s3c24xx/common-smdk.c

arch/arm/plat-s3c24xx/Kconfig +0 -5

index 74f76e0..73ebc40 100644
@@ -119,11 +119,6 @@ config S3C2412_IOTIMING
 	  Intel node to select io timing code that is common to the s3c2412
 	  and the s3c2443.
 
-config MACH_SMDK
-	bool
-	help
-	  Common machine code for SMDK2410 and SMDK2440
-
 config S3C24XX_SIMTEC_AUDIO
 	bool
 	depends on (ARCH_BAST || MACH_VR1000 || MACH_OSIRIS || MACH_ANUBIS)

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

index a7e8843..8dca10a 100644
@@ -39,5 +39,4 @@ obj-$(CONFIG_S3C2410_SETUP_TS)	+= setup-ts.o
 
 # machine common support
 
-obj-$(CONFIG_MACH_SMDK)		+= common-smdk.o
 obj-$(CONFIG_S3C24XX_SIMTEC_AUDIO)	+= simtec-audio.o

Signature · 1 line

1.7.5.4

Heiko Stübner

author

2012-03-06 09:59 UTC #2 lore raw

PATCH 2/4 ARM: S3C24XX: move simtec-specific code to mach directory

In reply to Heiko Stübner

This includes a rename of the pm-simtec.c to keep the simtec extensions together a bit and also better naming of the Kconfig options.

Signed-off-by Heiko Stuebner <[email protected]>

---
 arch/arm/mach-s3c24xx/Kconfig                      |   23 +++++++++++++++----
 arch/arm/mach-s3c24xx/Makefile                     |    2 +
 .../{plat-s3c24xx => mach-s3c24xx}/simtec-audio.c  |    0
 .../pm-simtec.c => mach-s3c24xx/simtec-pm.c}       |    0
 arch/arm/plat-s3c24xx/Kconfig                      |   13 -----------
 arch/arm/plat-s3c24xx/Makefile                     |    5 ----
 6 files changed, 20 insertions(+), 23 deletions(-)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/simtec-audio.c (100%)
 rename arch/arm/{plat-s3c24xx/pm-simtec.c => mach-s3c24xx/simtec-pm.c} (100%)

arch/arm/mach-s3c24xx/Kconfig +18 -5

index 7dede07..115cc50 100644
@@ -88,6 +88,19 @@ config S3C24XX_SMDK
 	help
 	  Common machine code for SMDK2410 and SMDK2440
 
+config S3C24XX_SIMTEC_AUDIO
+	bool
+	depends on (ARCH_BAST || MACH_VR1000 || MACH_OSIRIS || MACH_ANUBIS)
+	default y
+	help
+	  Add audio devices for common Simtec S3C24XX boards
+
+config S3C24XX_SIMTEC_PM
+	bool
+	help
+	  Common power management code for systems that are
+	  compatible with the Simtec style of power management
+
 # cpu-specific sections
 
 if CPU_S3C2410

@@ -125,7 +138,7 @@ comment "S3C2410 Boards"
 
 config MACH_AML_M5900
 	bool "AML M5900 Series"
-	select PM_SIMTEC if PM
+	select S3C24XX_SIMTEC_PM if PM
 	select S3C_DEV_USB_HOST
 	help
 	  Say Y here if you are using the American Microsystems M5900 Series

@@ -134,7 +147,7 @@ config MACH_AML_M5900
 config ARCH_BAST
 	bool "Simtec Electronics BAST (EB2410ITX)"
 	select S3C2410_IOTIMING if S3C2410_CPUFREQ
-	select PM_SIMTEC if PM
+	select S3C24XX_SIMTEC_PM if PM
 	select SIMTEC_NOR
 	select MACH_BAST_IDE
 	select S3C24XX_DCLK

@@ -215,7 +228,7 @@ config MACH_TCT_HAMMER
 
 config MACH_VR1000
 	bool "Thorcom VR1000"
-	select PM_SIMTEC if PM
+	select S3C24XX_SIMTEC_PM if PM
 	select S3C24XX_DCLK
 	select SIMTEC_NOR
 	select MACH_BAST_IDE

@@ -355,7 +368,7 @@ comment "S3C2440 Boards"
 config MACH_ANUBIS
 	bool "Simtec Electronics ANUBIS"
 	select S3C24XX_DCLK
-	select PM_SIMTEC if PM
+	select S3C24XX_SIMTEC_PM if PM
 	select HAVE_PATA_PLATFORM
 	select S3C24XX_GPIO_EXTRA64
 	select S3C2440_XTAL_12000000

@@ -395,7 +408,7 @@ config MACH_NEXCODER_2440
 config MACH_OSIRIS
 	bool "Simtec IM2440D20 (OSIRIS) module"
 	select S3C24XX_DCLK
-	select PM_SIMTEC if PM
+	select S3C24XX_SIMTEC_PM if PM
 	select S3C24XX_GPIO_EXTRA128
 	select S3C2440_XTAL_12000000
 	select S3C2410_IOTIMING if S3C2440_CPUFREQ

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

index b1c3c6f..fedbdb8 100644
@@ -79,6 +79,8 @@ obj-$(CONFIG_MACH_SMDK2443)		+= mach-smdk2443.o
 
 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_PM)		+= simtec-pm.o
 
 # machine additions

arch/arm/mach-s3c24xx/simtec-audio.c renamed from arch/arm/plat-s3c24xx/simtec-audio.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/simtec-audio.c
rename to arch/arm/mach-s3c24xx/simtec-audio.c

arch/arm/mach-s3c24xx/simtec-pm.c renamed from arch/arm/plat-s3c24xx/pm-simtec.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/pm-simtec.c
rename to arch/arm/mach-s3c24xx/simtec-pm.c

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

index 73ebc40..0338d20 100644
@@ -70,12 +70,6 @@ config S3C24XX_GPIO_EXTRA128
 	  Add an extra 128 gpio numbers to the available GPIO pool. This is
 	  available for boards that need extra gpios for external devices.
 
-config PM_SIMTEC
-	bool
-	help
-	  Common power management code for systems that are
-	  compatible with the Simtec style of power management
-
 config S3C24XX_DMA
 	bool "S3C2410 DMA support"
 	depends on ARCH_S3C24XX

@@ -119,13 +113,6 @@ config S3C2412_IOTIMING
 	  Intel node to select io timing code that is common to the s3c2412
 	  and the s3c2443.
 
-config S3C24XX_SIMTEC_AUDIO
-	bool
-	depends on (ARCH_BAST || MACH_VR1000 || MACH_OSIRIS || MACH_ANUBIS)
-	default y
-	help
-	  Add audio devices for common Simtec S3C24XX boards
-
 config S3C2410_SETUP_TS
 	bool
 	help

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

index 8dca10a..27dd9c5 100644
@@ -23,7 +23,6 @@ obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpu-freq-debugfs.o
 
 # Architecture dependent builds
 
-obj-$(CONFIG_PM_SIMTEC)		+= pm-simtec.o
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PM)		+= irq-pm.o
 obj-$(CONFIG_PM)		+= sleep.o

@@ -36,7 +35,3 @@ obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o
 # device specific setup and/or initialisation
 obj-$(CONFIG_ARCH_S3C24XX)	+= setup-i2c.o
 obj-$(CONFIG_S3C2410_SETUP_TS)	+= setup-ts.o
-
-# machine common support
-
-obj-$(CONFIG_S3C24XX_SIMTEC_AUDIO)	+= simtec-audio.o

Signature · 1 line

1.7.5.4

Heiko Stübner

author

2012-03-06 09:59 UTC #3 lore raw

PATCH 3/4 ARM: S3C24XX: Consolidate Simtec extensions

In reply to Heiko Stübner

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 Heiko Stuebner <[email protected]>

---
 arch/arm/mach-s3c24xx/Kconfig                      |   13 ++++++++++---
 arch/arm/mach-s3c24xx/Makefile                     |    7 ++++---
 arch/arm/mach-s3c24xx/mach-anubis.c                |    1 +
 arch/arm/mach-s3c24xx/mach-bast.c                  |    3 +--
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    3 +--
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 ++
 .../mach-s3c24xx/{nor-simtec.c => simtec-nor.c}    |    2 +-
 .../mach-s3c24xx/{usb-simtec.c => simtec-usb.c}    |    2 +-
 arch/arm/mach-s3c24xx/{nor-simtec.h => simtec.h}   |    9 ++++++++-
 arch/arm/mach-s3c24xx/usb-simtec.h                 |   16 ----------------
 arch/arm/plat-samsung/include/plat/audio-simtec.h  |    3 ---
 11 files changed, 29 insertions(+), 32 deletions(-)
 rename arch/arm/mach-s3c24xx/{nor-simtec.c => simtec-nor.c} (98%)
 rename arch/arm/mach-s3c24xx/{usb-simtec.c => simtec-usb.c} (99%)
 rename arch/arm/mach-s3c24xx/{nor-simtec.h => simtec.h} (63%)
 delete mode 100644 arch/arm/mach-s3c24xx/usb-simtec.h

arch/arm/mach-s3c24xx/Kconfig +10 -3

index 115cc50..df6f419 100644
@@ -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

index fedbdb8..2843c81 100644
@@ -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

index 2456955..9e0f745 100644
@@ -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

index feeaf73..53219c0 100644
@@ -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

index dbe668a..87608d4 100644
@@ -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 */

arch/arm/mach-s3c24xx/simtec-audio.c +2 -0

index 6bc832e..11881c9 100644
@@ -27,6 +27,8 @@
 #include <plat/audio-simtec.h>
 #include <plat/devs.h>
 
+#include "simtec.h"
+
 /* platform ops for audio */
 
 static void simtec_audio_startup_lrroute(void)

arch/arm/mach-s3c24xx/simtec-nor.c renamed from arch/arm/mach-s3c24xx/nor-simtec.c +1 -1

similarity index 98%
rename from arch/arm/mach-s3c24xx/nor-simtec.c
rename to arch/arm/mach-s3c24xx/simtec-nor.c
index ad9f750..2119ca6 100644
@@ -30,7 +30,7 @@
 #include <mach/bast-map.h>
 #include <mach/bast-cpld.h>
 
-#include "nor-simtec.h"
+#include "simtec.h"
 
 static void simtec_nor_vpp(struct platform_device *pdev, int vpp)
 {

arch/arm/mach-s3c24xx/simtec-usb.c renamed from arch/arm/mach-s3c24xx/usb-simtec.c +1 -1

similarity index 99%
rename from arch/arm/mach-s3c24xx/usb-simtec.c
rename to arch/arm/mach-s3c24xx/simtec-usb.c
index 29bd3d9..d91c1a7 100644
@@ -37,7 +37,7 @@
 #include <plat/usb-control.h>
 #include <plat/devs.h>
 
-#include "usb-simtec.h"
+#include "simtec.h"
 
 /* control power and monitor over-current events on various Simtec
  * designed boards.

arch/arm/mach-s3c24xx/simtec.h renamed from arch/arm/mach-s3c24xx/nor-simtec.h +8 -1

similarity index 63%
rename from arch/arm/mach-s3c24xx/nor-simtec.h
rename to arch/arm/mach-s3c24xx/simtec.h
index f619c1e..ae8f4f9 100644
@@ -4,11 +4,18 @@
  *	http://armlinux.simtec.co.uk/
  *	Ben Dooks <[email protected]>
  *
- * Simtec NOR mapping
+ * Simtec common functions
  *
  * 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.
 */
 
+struct s3c24xx_audio_simtec_pdata;
+
 extern void nor_simtec_init(void);
+
+extern int usb_simtec_init(void);
+
+extern int simtec_audio_add(const char *codec_name, bool has_lr_routing,
+			    struct s3c24xx_audio_simtec_pdata *pdata);

arch/arm/mach-s3c24xx/usb-simtec.h deleted +0 ~~-16~~

deleted file mode 100644
index 03842ed..0000000
@@ -1,16 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/usb-simtec.h
- *
- * Copyright (c) 2004 Simtec Electronics
- *   Ben Dooks <[email protected]>
- *
- * http://www.simtec.co.uk/products/EB2410ITX/
- *
- * Simtec BAST and Thorcom VR1000 USB port support functions
- *
- * 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.
-*/
-
-extern int usb_simtec_init(void);
-

arch/arm/plat-samsung/include/plat/audio-simtec.h +0 -3

index 5345364..376af52 100644
@@ -32,6 +32,3 @@ struct s3c24xx_audio_simtec_pdata {
 
 	void	(*startup)(void);
 };
-
-extern int simtec_audio_add(const char *codec_name, bool has_lr_routing,
-			    struct s3c24xx_audio_simtec_pdata *pdata);

Signature · 1 line

1.7.5.4

Heiko Stübner

author

2012-03-06 10:00 UTC #4 lore raw

PATCH 4/4 ARM: S3C24XX: Move device setup files to mach directory

In reply to Heiko Stübner

Includes a small rename of the SETUP_TS option to a S3C24XX prefix.

Signed-off-by Heiko Stuebner <[email protected]>

---
 arch/arm/mach-s3c24xx/Kconfig                      |    7 ++++++-
 arch/arm/mach-s3c24xx/Makefile                     |    2 ++
 .../arm/{plat-s3c24xx => mach-s3c24xx}/setup-i2c.c |    0
 arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-ts.c |    0
 arch/arm/plat-s3c24xx/Kconfig                      |    5 -----
 arch/arm/plat-s3c24xx/Makefile                     |    4 ----
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-i2c.c (100%)
 rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-ts.c (100%)

arch/arm/mach-s3c24xx/Kconfig +6 -1

index df6f419..b399021 100644
@@ -106,6 +106,11 @@ config S3C24XX_SIMTEC_USB
 	help
 	  USB management code for common Simtec S3C24XX boards
 
+config S3C24XX_SETUP_TS
+	bool
+	help
+	  Compile in platform device definition for Samsung TouchScreen.
+
 # cpu-specific sections
 
 if CPU_S3C2410

@@ -178,7 +183,7 @@ config ARCH_H1940
 	select PM_H1940 if PM
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_NAND
-	select S3C2410_SETUP_TS
+	select S3C24XX_SETUP_TS
 	help
 	  Say Y here if you are using the HP IPAQ H1940

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

index 2843c81..3f39e6f 100644
@@ -91,3 +91,5 @@ obj-$(CONFIG_MACH_OSIRIS_DVS)		+= mach-osiris-dvs.o
 # device setup
 
 obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
+obj-$(CONFIG_ARCH_S3C24XX)		+= setup-i2c.o
+obj-$(CONFIG_S3C24XX_SETUP_TS)		+= setup-ts.o

arch/arm/mach-s3c24xx/setup-i2c.c renamed from arch/arm/plat-s3c24xx/setup-i2c.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/setup-i2c.c
rename to arch/arm/mach-s3c24xx/setup-i2c.c

arch/arm/mach-s3c24xx/setup-ts.c renamed from arch/arm/plat-s3c24xx/setup-ts.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c24xx/setup-ts.c
rename to arch/arm/mach-s3c24xx/setup-ts.c

arch/arm/plat-s3c24xx/Kconfig +0 -5

index 0338d20..21bf6ad 100644
@@ -113,9 +113,4 @@ config S3C2412_IOTIMING
 	  Intel node to select io timing code that is common to the s3c2412
 	  and the s3c2443.
 
-config S3C2410_SETUP_TS
-	bool
-	help
-	  Compile in platform device definition for Samsung TouchScreen.
-
 endif

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

index 27dd9c5..2467b80 100644
@@ -31,7 +31,3 @@ obj-$(CONFIG_S3C24XX_DMA)	+= dma.o
 obj-$(CONFIG_S3C2410_IOTIMING)	+= s3c2410-iotiming.o
 obj-$(CONFIG_S3C2412_IOTIMING)	+= s3c2412-iotiming.o
 obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o
-
-# device specific setup and/or initialisation
-obj-$(CONFIG_ARCH_S3C24XX)	+= setup-i2c.o
-obj-$(CONFIG_S3C2410_SETUP_TS)	+= setup-ts.o

Signature · 1 line

1.7.5.4

Kukjin Kim

2012-03-07 11:18 UTC #5 lore raw

cover S3C24XX: Another move of code to the new mach directory

In reply to Heiko Stübner

Quoted 9 lines · Heiko St?bner

This series contains the easy moves of common code for the SMDKs, Simtec boards and device setup from plat-s3c24xx to mach-s3c24xx.
It also contains an extra patch to keep the Simtec code more together.
Changes to the Kconfig and Makefile will probably conflict with the S3C2416-SPI series posted sunday, but this is ok, as the SPI series will probably have to wait for 3.5 anyway and can be redone then.

OK, I agree so applied this whole series.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.