S3C6410/S3C6400 platform squash

PATCH New Ben Dooks 1 participant 15 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:02 UTC #0 lore raw

Attached is the series to squash mach-s3c6400 and mach-s3c6410 together and then also place plat-sc64xx in there as well (mostly).

The only issue is we are left with two files in plat-s3c64xx which are required from include/plat. Would adding an include/plat directory to arch/arm/mach-s3c64xx be ok for these or do we need to find another solution?

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410

As per discussions with Russell King on linux-arm-kernel, it appears that both mach-s3c6400 and mach-s3c6410 are so close together that they should simply be merged into mach-s3c64xx.

Note, this patch does not eliminate any of the bits that are still common, it is simply a move of the two directories together, any further common code will be eliminated or moved in further patches.

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

---
 arch/arm/Kconfig                                   |    3 +-
 arch/arm/Makefile                                  |    2 +-
 arch/arm/mach-s3c6400/Kconfig                      |   30 --------------------
 arch/arm/mach-s3c6400/Makefile                     |   23 ---------------
 arch/arm/mach-s3c6410/Makefile                     |   26 -----------------
 arch/arm/{mach-s3c6410 => mach-s3c64xx}/Kconfig    |   30 ++++++++++++++++++-
 arch/arm/mach-s3c64xx/Makefile                     |   29 +++++++++++++++++++
 .../{mach-s3c6400 => mach-s3c64xx}/Makefile.boot   |    0
 .../include/mach/debug-macro.S                     |    0
 .../include/mach/dma.h                             |    0
 .../include/mach/entry-macro.S                     |    0
 .../include/mach/gpio.h                            |    0
 .../include/mach/hardware.h                        |    0
 .../include/mach/irqs.h                            |    0
 .../include/mach/map.h                             |    0
 .../include/mach/memory.h                          |    0
 .../include/mach/pwm-clock.h                       |    0
 .../include/mach/regs-clock.h                      |    0
 .../include/mach/regs-fb.h                         |    0
 .../include/mach/regs-irq.h                        |    0
 .../include/mach/system.h                          |    0
 .../include/mach/tick.h                            |    0
 .../include/mach/uncompress.h                      |    0
 .../{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c  |    2 +-
 arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c |    0
 arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c |    2 +-
 .../{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c |    2 +-
 .../{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c |    2 +-
 arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c  |    2 +-
 .../{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} |    2 +-
 .../setup-sdhci-s3c6400.c}                         |    2 +-
 .../setup-sdhci-s3c6410.c}                         |    2 +-
 32 files changed, 67 insertions(+), 92 deletions(-)
 delete mode 100644 arch/arm/mach-s3c6400/Kconfig
 delete mode 100644 arch/arm/mach-s3c6400/Makefile
 delete mode 100644 arch/arm/mach-s3c6410/Makefile
 rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/Kconfig (84%)
 create mode 100644 arch/arm/mach-s3c64xx/Makefile
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/Makefile.boot (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/debug-macro.S (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/dma.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/entry-macro.S (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/gpio.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/hardware.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/irqs.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/map.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/memory.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/pwm-clock.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-clock.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-fb.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-irq.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/system.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/tick.h (100%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/uncompress.h (100%)
 rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c (99%)
 rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c (100%)
 rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c (98%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c (98%)
 rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c (99%)
 rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c (98%)
 rename arch/arm/{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} (98%)
 rename arch/arm/{mach-s3c6400/setup-sdhci.c => mach-s3c64xx/setup-sdhci-s3c6400.c} (97%)
 rename arch/arm/{mach-s3c6410/setup-sdhci.c => mach-s3c64xx/setup-sdhci-s3c6410.c} (97%)

arch/arm/Kconfig +1 -2

index 3bc5169..685ff7e 100644
@@ -799,8 +799,7 @@ source "arch/arm/mach-s3c2443/Kconfig"
 endif
 
 if ARCH_S3C64XX
-source "arch/arm/mach-s3c6400/Kconfig"
-source "arch/arm/mach-s3c6410/Kconfig"
+source "arch/arm/mach-s3c64xx/Kconfig"
 endif
 
 source "arch/arm/mach-s5p6440/Kconfig"

arch/arm/Makefile +1 -1

index bbcd512..ecf963d 100644
@@ -160,7 +160,7 @@ machine-$(CONFIG_ARCH_REALVIEW)		:= realview
 machine-$(CONFIG_ARCH_RPC)		:= rpc
 machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
 machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0
-machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410
+machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx
 machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440
 machine-$(CONFIG_ARCH_S5PC1XX)		:= s5pc100
 machine-$(CONFIG_ARCH_SA1100)		:= sa1100

arch/arm/mach-s3c6400/Kconfig deleted +0 ~~-30~~

deleted file mode 100644
index a250bf6..0000000
@@ -1,30 +0,0 @@
-# Copyright 2008 Openmoko, Inc.
-#	Simtec Electronics, Ben Dooks <[email protected]>
-#
-# Licensed under GPLv2
-
-# Configuration options for the S3C6410 CPU
-
-config CPU_S3C6400
-	bool
-	select CPU_S3C6400_INIT
-	select CPU_S3C6400_CLOCK
-	help
-	  Enable S3C6400 CPU support
-
-config S3C6400_SETUP_SDHCI
-	bool
-	help
-	  Internal configuration for default SDHCI
-	  setup for S3C6400.
-
-# S36400 Macchine support
-
-config MACH_SMDK6400
-       bool "SMDK6400"
-	select CPU_S3C6400
-	select S3C_DEV_HSMMC
-	select S3C_DEV_NAND
-	select S3C6400_SETUP_SDHCI
-	help
-	  Machine support for the Samsung SMDK6400

arch/arm/mach-s3c6400/Makefile deleted +0 ~~-23~~

deleted file mode 100644
index df1ce4a..0000000
@@ -1,23 +0,0 @@
-# arch/arm/mach-s3c6400/Makefile
-#
-# Copyright 2008 Openmoko, Inc.
-# Copyright 2008 Simtec Electronics
-#
-# Licensed under GPLv2
-
-obj-y				:=
-obj-m				:=
-obj-n				:=
-obj-				:=
-
-# Core support for S3C6400 system
-
-obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o
-
-# setup support
-
-obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci.o
-
-# Machine support
-
-obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o

arch/arm/mach-s3c6410/Makefile deleted +0 ~~-26~~

deleted file mode 100644
index 3e48c3d..0000000
@@ -1,26 +0,0 @@
-# arch/arm/plat-s3c6410/Makefile
-#
-# Copyright 2008 Openmoko, Inc.
-# Copyright 2008 Simtec Electronics
-#
-# Licensed under GPLv2
-
-obj-y				:=
-obj-m				:=
-obj-n				:=
-obj-				:=
-
-# Core support for S3C6410 system
-
-obj-$(CONFIG_CPU_S3C6410)	+= cpu.o
-
-# Helper and device support
-
-obj-$(CONFIG_S3C6410_SETUP_SDHCI)	+= setup-sdhci.o
-
-# machine support
-
-obj-$(CONFIG_MACH_ANW6410)	+= mach-anw6410.o
-obj-$(CONFIG_MACH_SMDK6410)	+= mach-smdk6410.o
-obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o
-obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o

arch/arm/mach-s3c64xx/Kconfig renamed from arch/arm/mach-s3c6410/Kconfig +28 -2

similarity index 84%
rename from arch/arm/mach-s3c6410/Kconfig
rename to arch/arm/mach-s3c64xx/Kconfig
index 162f456..551bb3f 100644
@@ -1,10 +1,17 @@
 # Copyright 2008 Openmoko, Inc.
-# Copyright 2008 Simtec Electronics
+#	Simtec Electronics, Ben Dooks <[email protected]>
 #
 # Licensed under GPLv2
 
 # Configuration options for the S3C6410 CPU
 
+config CPU_S3C6400
+	bool
+	select CPU_S3C6400_INIT
+	select CPU_S3C6400_CLOCK
+	help
+	  Enable S3C6400 CPU support
+
 config CPU_S3C6410
 	bool
 	select CPU_S3C6400_INIT

@@ -12,12 +19,31 @@ config CPU_S3C6410
 	help
 	  Enable S3C6410 CPU support
 
+config S3C6400_SETUP_SDHCI
+	bool
+	help
+	  Internal configuration for default SDHCI
+	  setup for S3C6400.
+
 config S3C6410_SETUP_SDHCI
 	bool
 	select S3C64XX_SETUP_SDHCI_GPIO
 	help
 	  Internal helper functions for S3C6410 based SDHCI systems
 
+# S36400 Macchine support
+
+config MACH_SMDK6400
+       bool "SMDK6400"
+	select CPU_S3C6400
+	select S3C_DEV_HSMMC
+	select S3C_DEV_NAND
+	select S3C6400_SETUP_SDHCI
+	help
+	  Machine support for the Samsung SMDK6400
+
+# S3C6410 machine support
+
 config MACH_ANW6410
 	bool "A&W6410"
 	select CPU_S3C6410

@@ -58,7 +84,7 @@ config SMDK6410_SD_CH0
 	  at least some SMDK6410 boards come with the
 	  resistors fitted so that the card detects for
 	  channels 0 and 1 are the same.
-       
+
 config SMDK6410_SD_CH1
 	bool "Use channel 1 only"
 	depends on MACH_SMDK6410

arch/arm/mach-s3c64xx/Makefile new file +29 -0

new file mode 100644
index 0000000..24a3bc3
@@ -0,0 +1,29 @@
+# arch/arm/mach-s3c64xx/Makefile
+#
+# Copyright 2008 Openmoko, Inc.
+# Copyright 2008 Simtec Electronics
+#
+# Licensed under GPLv2
+
+obj-y				:=
+obj-m				:=
+obj-n				:=
+obj-				:=
+
+# Core support for S3C6400 system
+
+obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o
+obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
+
+# setup support
+
+obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci-s3c6400.o
+obj-$(CONFIG_S3C6410_SETUP_SDHCI) += setup-sdhci-s3c6410.o
+
+# Machine support
+
+obj-$(CONFIG_MACH_ANW6410)	+= mach-anw6410.o
+obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o
+obj-$(CONFIG_MACH_SMDK6410)	+= mach-smdk6410.o
+obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o
+obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o

arch/arm/mach-s3c64xx/Makefile.boot renamed from arch/arm/mach-s3c6400/Makefile.boot +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/Makefile.boot
rename to arch/arm/mach-s3c64xx/Makefile.boot

arch/arm/mach-s3c64xx/include/mach/debug-macro.S renamed from arch/arm/mach-s3c6400/include/mach/debug-macro.S +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/debug-macro.S
rename to arch/arm/mach-s3c64xx/include/mach/debug-macro.S

arch/arm/mach-s3c64xx/include/mach/dma.h renamed from arch/arm/mach-s3c6400/include/mach/dma.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/dma.h
rename to arch/arm/mach-s3c64xx/include/mach/dma.h

arch/arm/mach-s3c64xx/include/mach/entry-macro.S renamed from arch/arm/mach-s3c6400/include/mach/entry-macro.S +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/entry-macro.S
rename to arch/arm/mach-s3c64xx/include/mach/entry-macro.S

arch/arm/mach-s3c64xx/include/mach/gpio.h renamed from arch/arm/mach-s3c6400/include/mach/gpio.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/gpio.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio.h

arch/arm/mach-s3c64xx/include/mach/hardware.h renamed from arch/arm/mach-s3c6400/include/mach/hardware.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/hardware.h
rename to arch/arm/mach-s3c64xx/include/mach/hardware.h

arch/arm/mach-s3c64xx/include/mach/irqs.h renamed from arch/arm/mach-s3c6400/include/mach/irqs.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/irqs.h
rename to arch/arm/mach-s3c64xx/include/mach/irqs.h

arch/arm/mach-s3c64xx/include/mach/map.h renamed from arch/arm/mach-s3c6400/include/mach/map.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/map.h
rename to arch/arm/mach-s3c64xx/include/mach/map.h

arch/arm/mach-s3c64xx/include/mach/memory.h renamed from arch/arm/mach-s3c6400/include/mach/memory.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/memory.h
rename to arch/arm/mach-s3c64xx/include/mach/memory.h

arch/arm/mach-s3c64xx/include/mach/pwm-clock.h renamed from arch/arm/mach-s3c6400/include/mach/pwm-clock.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/pwm-clock.h
rename to arch/arm/mach-s3c64xx/include/mach/pwm-clock.h

arch/arm/mach-s3c64xx/include/mach/regs-clock.h renamed from arch/arm/mach-s3c6400/include/mach/regs-clock.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/regs-clock.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-clock.h

arch/arm/mach-s3c64xx/include/mach/regs-fb.h renamed from arch/arm/mach-s3c6400/include/mach/regs-fb.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/regs-fb.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-fb.h

arch/arm/mach-s3c64xx/include/mach/regs-irq.h renamed from arch/arm/mach-s3c6400/include/mach/regs-irq.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/regs-irq.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-irq.h

arch/arm/mach-s3c64xx/include/mach/system.h renamed from arch/arm/mach-s3c6400/include/mach/system.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/system.h
rename to arch/arm/mach-s3c64xx/include/mach/system.h

arch/arm/mach-s3c64xx/include/mach/tick.h renamed from arch/arm/mach-s3c6400/include/mach/tick.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/tick.h
rename to arch/arm/mach-s3c64xx/include/mach/tick.h

arch/arm/mach-s3c64xx/include/mach/uncompress.h renamed from arch/arm/mach-s3c6400/include/mach/uncompress.h +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6400/include/mach/uncompress.h
rename to arch/arm/mach-s3c64xx/include/mach/uncompress.h

arch/arm/mach-s3c64xx/mach-anw6410.c renamed from arch/arm/mach-s3c6410/mach-anw6410.c +1 -1

similarity index 99%
rename from arch/arm/mach-s3c6410/mach-anw6410.c
rename to arch/arm/mach-s3c64xx/mach-anw6410.c
index 661cca6..49032a8 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6410/mach-anw6410.c
+/* linux/arch/arm/mach-s3c64xx/mach-anw6410.c
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/mach-hmt.c renamed from arch/arm/mach-s3c6410/mach-hmt.c +0 -0

similarity index 100%
rename from arch/arm/mach-s3c6410/mach-hmt.c
rename to arch/arm/mach-s3c64xx/mach-hmt.c

arch/arm/mach-s3c64xx/mach-ncp.c renamed from arch/arm/mach-s3c6410/mach-ncp.c +1 -1

similarity index 98%
rename from arch/arm/mach-s3c6410/mach-ncp.c
rename to arch/arm/mach-s3c64xx/mach-ncp.c
index 55e9bbf..9be92dd 100644
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-s3c6410/mach-ncp.c
+ * linux/arch/arm/mach-s3c64xx/mach-ncp.c
  *
  * Copyright (C) 2008-2009 Samsung Electronics
  *

arch/arm/mach-s3c64xx/mach-smdk6400.c renamed from arch/arm/mach-s3c6400/mach-smdk6400.c +1 -1

similarity index 98%
rename from arch/arm/mach-s3c6400/mach-smdk6400.c
rename to arch/arm/mach-s3c64xx/mach-smdk6400.c
index ab19285..ba8a052 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6400/mach-smdk6400.c
+/* linux/arch/arm/mach-s3c64xx/mach-smdk6400.c
  *
  * Copyright 2008 Simtec Electronics
  *	Ben Dooks <[email protected]>

arch/arm/mach-s3c64xx/mach-smdk6410.c renamed from arch/arm/mach-s3c6410/mach-smdk6410.c +1 -1

similarity index 99%
rename from arch/arm/mach-s3c6410/mach-smdk6410.c
rename to arch/arm/mach-s3c64xx/mach-smdk6410.c
index eba345f..6e6ff35 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6410/mach-smdk6410.c
+/* linux/arch/arm/mach-s3c64xx/mach-smdk6410.c
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/s3c6400.c renamed from arch/arm/mach-s3c6400/s3c6400.c +1 -1

similarity index 98%
rename from arch/arm/mach-s3c6400/s3c6400.c
rename to arch/arm/mach-s3c64xx/s3c6400.c
index d876ee5..884858a 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6410/cpu.c
+/* linux/arch/arm/mach-s3c64xx/cpu.c
  *
  * Copyright 2009 Simtec Electronics
  *	Ben Dooks <[email protected]>

arch/arm/mach-s3c64xx/s3c6410.c renamed from arch/arm/mach-s3c6410/cpu.c +1 -1

similarity index 98%
rename from arch/arm/mach-s3c6410/cpu.c
rename to arch/arm/mach-s3c64xx/s3c6410.c
index 522c086..dd55c6a 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6410/cpu.c
+/* linux/arch/arm/mach-s3c64xx/s3c6410.c
  *
  * Copyright 2008 Simtec Electronics
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c renamed from arch/arm/mach-s3c6400/setup-sdhci.c +1 -1

similarity index 97%
rename from arch/arm/mach-s3c6400/setup-sdhci.c
rename to arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c
index 1039937..ec96a58 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6410/setup-sdhci.c
+/* linux/arch/arm/mach-s3c64xx/setup-sdhci.c
  *
  * Copyright 2008 Simtec Electronics
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c renamed from arch/arm/mach-s3c6410/setup-sdhci.c +1 -1

similarity index 97%
rename from arch/arm/mach-s3c6410/setup-sdhci.c
rename to arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c
index 816d2d9..8d714a1 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-s3c6410/setup-sdhci.c
+/* linux/arch/arm/mach-s3c64xx/setup-sdhci.c
  *
  * Copyright 2008 Simtec Electronics
  * Copyright 2008 Simtec Electronics

Signature · 1 line

1.6.0.4

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Remove useless IO descriptor from S3C6410

In reply to Ben Dooks

The iotable in arch/arm/mach-s3c64xx/s3c6410.c is currently empty and therefore can be removed from the build.

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

---
 arch/arm/mach-s3c64xx/s3c6410.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

arch/arm/mach-s3c64xx/s3c6410.c +0 ~~-12~~

index dd55c6a..185f15c 100644
@@ -41,20 +41,8 @@
 #include <plat/s3c6400.h>
 #include <plat/s3c6410.h>
 
-/* Initial IO mappings */
-
-static struct map_desc s3c6410_iodesc[] __initdata = {
-};
-
-/* s3c6410_map_io
- *
- * register the standard cpu IO areas
-*/
-
 void __init s3c6410_map_io(void)
 {
-	iotable_init(s3c6410_iodesc, ARRAY_SIZE(s3c6410_iodesc));
-
 	/* initialise device information early */
 	s3c6410_default_sdhci0();
 	s3c6410_default_sdhci1();

Signature · 1 line

1.6.0.4

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Squash SDHCI setup into one file

In reply to Ben Dooks

Squash the SDHCI setup for both the S3C6400 and S3C6410 into one file and make the S3C6410 case use the S3C6400 code.

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

---
 arch/arm/mach-s3c64xx/Kconfig                      |   17 ++---
 arch/arm/mach-s3c64xx/Makefile                     |    3 +-
 arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c        |   68 --------------------
 .../{setup-sdhci-s3c6400.c => setup-sdhci.c}       |   13 +++-
 arch/arm/plat-samsung/include/plat/sdhci.h         |   43 ++++++-------
 5 files changed, 37 insertions(+), 107 deletions(-)
 delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c
 rename arch/arm/mach-s3c64xx/{setup-sdhci-s3c6400.c => setup-sdhci.c} (81%)

arch/arm/mach-s3c64xx/Kconfig +6 ~~-11~~

index 551bb3f..ce32e49 100644
@@ -19,17 +19,12 @@ config CPU_S3C6410
 	help
 	  Enable S3C6410 CPU support
 
-config S3C6400_SETUP_SDHCI
-	bool
-	help
-	  Internal configuration for default SDHCI
-	  setup for S3C6400.
-
-config S3C6410_SETUP_SDHCI
-	bool
+config S3C64XX_SETUP_SDHCI
 	select S3C64XX_SETUP_SDHCI_GPIO
+	bool
 	help
-	  Internal helper functions for S3C6410 based SDHCI systems
+	  Internal configuration for default SDHCI setup for S3C6400 and
+	  S3C6410 SoCs.
 
 # S36400 Macchine support

@@ -38,7 +33,7 @@ config MACH_SMDK6400
 	select CPU_S3C6400
 	select S3C_DEV_HSMMC
 	select S3C_DEV_NAND
-	select S3C6400_SETUP_SDHCI
+	select S3C64XX_SETUP_SDHCI
 	help
 	  Machine support for the Samsung SMDK6400

@@ -61,7 +56,7 @@ config MACH_SMDK6410
 	select S3C_DEV_FB
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HSOTG
-	select S3C6410_SETUP_SDHCI
+	select S3C64XX_SETUP_SDHCI
 	select S3C64XX_SETUP_I2C1
 	select S3C64XX_SETUP_FB_24BPP
 	help

arch/arm/mach-s3c64xx/Makefile +1 -2

index 24a3bc3..21ddf6b 100644
@@ -17,8 +17,7 @@ obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
 
 # setup support
 
-obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci-s3c6400.o
-obj-$(CONFIG_S3C6410_SETUP_SDHCI) += setup-sdhci-s3c6410.o
+obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o
 
 # Machine support

arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c deleted +0 ~~-68~~

68 lines not on this page · raw message

arch/arm/mach-s3c64xx/setup-sdhci.c renamed from arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c +11 -2

similarity index 81%
rename from arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c
rename to arch/arm/mach-s3c64xx/setup-sdhci.c
index ec96a58..1a94203 100644
@@ -5,7 +5,7 @@
  *	Ben Dooks <[email protected]>
  *	http://armlinux.simtec.co.uk/
  *
- * S3C6410 - Helper functions for settign up SDHCI device(s) (HSMMC)
+ * S3C6400/S3C6410 - Helper functions for settign up SDHCI device(s) (HSMMC)
  *
  * 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

@@ -26,7 +26,7 @@
 
 /* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
 
-char *s3c6400_hsmmc_clksrcs[4] = {
+char *s3c64xx_hsmmc_clksrcs[4] = {
 	[0] = "hsmmc",
 	[1] = "hsmmc",
 	[2] = "mmc_bus",

@@ -61,3 +61,12 @@ void s3c6400_setup_sdhci_cfg_card(struct platform_device *dev,
 	writel(ctrl3, r + S3C_SDHCI_CONTROL3);
 }
 
+void s3c6410_setup_sdhci_cfg_card(struct platform_device *dev,
+				  void __iomem *r,
+				  struct mmc_ios *ios,
+				  struct mmc_card *card)
+{
+	writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA, r + S3C64XX_SDHCI_CONTROL4);
+
+	s3c6400_setup_sdhci_cfg_card(dev, r, ios, card);
+}

arch/arm/plat-samsung/include/plat/sdhci.h +19 ~~-24~~

100 lines not on this page · raw message

Signature · 1 line

1.6.0.4

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Move GPIO bank number includes into machine include directory

In reply to Ben Dooks

Move the GPIO bank numbering to the machine include directory as it is only used by these machines. Fixup the two users in the plat directoy (but do not move them yet)

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

---
 .../include/mach}/gpio-bank-a.h                    |    2 +-
 .../include/mach}/gpio-bank-b.h                    |    2 +-
 .../include/mach}/gpio-bank-c.h                    |    2 +-
 .../include/mach}/gpio-bank-d.h                    |    2 +-
 .../include/mach}/gpio-bank-e.h                    |    2 +-
 .../include/mach}/gpio-bank-f.h                    |    2 +-
 .../include/mach}/gpio-bank-g.h                    |    2 +-
 .../include/mach}/gpio-bank-h.h                    |    2 +-
 .../include/mach}/gpio-bank-i.h                    |    2 +-
 .../include/mach}/gpio-bank-j.h                    |    2 +-
 .../include/mach}/gpio-bank-n.h                    |    2 +-
 .../include/mach}/gpio-bank-o.h                    |    2 +-
 .../include/mach}/gpio-bank-p.h                    |    2 +-
 .../include/mach}/gpio-bank-q.h                    |    2 +-
 arch/arm/plat-s3c64xx/dev-audio.c                  |    9 +++++----
 arch/arm/plat-s3c64xx/dev-spi.c                    |    3 +--
 arch/arm/plat-s3c64xx/pm.c                         |    2 +-
 arch/arm/plat-s3c64xx/setup-i2c0.c                 |    2 +-
 arch/arm/plat-s3c64xx/setup-i2c1.c                 |    2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-a.h (96%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-b.h (97%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-c.h (96%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-d.h (96%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-e.h (96%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-f.h (97%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-g.h (95%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-h.h (97%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-i.h (96%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-j.h (95%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-n.h (96%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-o.h (97%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-p.h (97%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-q.h (96%)

arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h
index 9aa0e42..34212e1 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h +1 -1

similarity index 97%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h
index 3933adb..7232c03 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h
index e22b49f..db189ab 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h
index 6fe4a49..1a01cee 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h
index 7fcf3d8..f057adb 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h +1 -1

similarity index 97%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h
index f3faff9..62ab8f5 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h +1 -1

similarity index 95%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h
index 35bbd23..b94954a 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h +1 -1

similarity index 97%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h
index 2ba1767..5d75aaa 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h
index ce9ebe3..4ceaa60 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h +1 -1

similarity index 95%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h
index 21a9062..6f25cd0 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h
index 569e761..d0aeda1 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h +1 -1

similarity index 97%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h
index b09e129..21868fa 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h +1 -1

similarity index 97%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h
index 92f0051..46bcfb6 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h renamed from arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h +1 -1

similarity index 96%
rename from arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h
rename to arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h
index 565e60a..1712223 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/plat-s3c64xx/dev-audio.c +5 -4

index f6b7bfb..aaffb80 100644
@@ -19,12 +19,13 @@
 
 #include <plat/devs.h>
 #include <plat/audio.h>
-#include <plat/gpio-bank-c.h>
-#include <plat/gpio-bank-d.h>
-#include <plat/gpio-bank-e.h>
-#include <plat/gpio-bank-h.h>
 #include <plat/gpio-cfg.h>
 
+#include <mach/gpio-bank-c.h>
+#include <mach/gpio-bank-d.h>
+#include <mach/gpio-bank-e.h>
+#include <mach/gpio-bank-h.h>
+
 static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)
 {
 	switch (pdev->id) {

arch/arm/plat-s3c64xx/dev-spi.c +1 -2

index ca10388..0c20d27 100644
@@ -16,11 +16,10 @@
 #include <mach/dma.h>
 #include <mach/map.h>
 #include <mach/gpio.h>
+#include <mach/gpio-bank-c.h>
 
 #include <plat/spi-clocks.h>
-
 #include <plat/s3c64xx-spi.h>
-#include <plat/gpio-bank-c.h>
 #include <plat/gpio-cfg.h>
 #include <plat/irqs.h>

arch/arm/plat-s3c64xx/pm.c +1 -1

index 47632fc..8ad9ab1 100644
@@ -27,7 +27,7 @@
 #include <plat/regs-gpio-memport.h>
 
 #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
-#include <plat/gpio-bank-n.h>
+#include <mach/gpio-bank-n.h>
 
 void s3c_pm_debug_smdkled(u32 set, u32 clear)
 {

arch/arm/plat-s3c64xx/setup-i2c0.c +1 -1

index 3644807..d1b11e6 100644
@@ -18,8 +18,8 @@
 struct platform_device; /* don't need the contents */
 
 #include <mach/gpio.h>
+#include <mach/gpio-bank-b.h>
 #include <plat/iic.h>
-#include <plat/gpio-bank-b.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)

arch/arm/plat-s3c64xx/setup-i2c1.c +1 -1

index bbe229b..2dce57d 100644
@@ -18,8 +18,8 @@
 struct platform_device; /* don't need the contents */
 
 #include <mach/gpio.h>
+#include <mach/gpio-bank-b.h>
 #include <plat/iic.h>
-#include <plat/gpio-bank-b.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)

Signature · 1 line

1.6.0.4

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Move register definition headers to machine include directory

In reply to Ben Dooks

Move the register definition files from plat-s3c64xx into the machine include direcotry as they are unlikely to be reused outside mach-s3c64xx.

This move includes removing the empty <mach/regs-clock.h> and replacing it with the <plat/regs-clock.h> implementation.

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

---
 arch/arm/mach-s3c64xx/include/mach/regs-clock.h    |  148 ++++++++++++++++++-
 .../include/mach}/regs-gpio-memport.h              |    0
 .../plat => mach-s3c64xx/include/mach}/regs-gpio.h |    0
 .../include/mach}/regs-modem.h                     |    0
 .../plat => mach-s3c64xx/include/mach}/regs-srom.h |    0
 .../plat => mach-s3c64xx/include/mach}/regs-sys.h  |    0
 .../include/mach}/regs-syscon-power.h              |    0
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    4 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    8 +-
 arch/arm/mach-s3c64xx/s3c6400.c                    |    2 +-
 arch/arm/mach-s3c64xx/s3c6410.c                    |    2 +-
 arch/arm/plat-s3c64xx/clock.c                      |    4 +-
 arch/arm/plat-s3c64xx/dma.c                        |    2 +-
 arch/arm/plat-s3c64xx/gpiolib.c                    |    2 +-
 arch/arm/plat-s3c64xx/include/plat/regs-clock.h    |  156 --------------------
 arch/arm/plat-s3c64xx/irq-eint.c                   |    2 +-
 arch/arm/plat-s3c64xx/irq-pm.c                     |    2 +-
 arch/arm/plat-s3c64xx/pm.c                         |   10 +-
 arch/arm/plat-s3c64xx/s3c6400-clock.c              |    2 +-
 19 files changed, 164 insertions(+), 180 deletions(-)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio-memport.h (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio.h (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-modem.h (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-srom.h (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-sys.h (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-syscon-power.h (100%)
 delete mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-clock.h

arch/arm/mach-s3c64xx/include/mach/regs-clock.h +144 -4

index a6c7f4e..3ef6274 100644
@@ -1,16 +1,156 @@
-/* linux/arch/arm/mach-s3c6400/include/mach/regs-clock.h
+/* arch/arm/plat-s3c64xx/include/plat/regs-clock.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
- *	http://armlinux.simtec.co.uk/
  *	Ben Dooks <[email protected]>
+ *	http://armlinux.simtec.co.uk/
  *
- * S3C64XX - clock register compatibility with s3c24xx
+ * S3C64XX clock register definitions
  *
  * 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.
 */
 
-#include <plat/regs-clock.h>
+#ifndef __PLAT_REGS_CLOCK_H
+#define __PLAT_REGS_CLOCK_H __FILE__
+
+#define S3C_CLKREG(x)		(S3C_VA_SYS + (x))
+
+#define S3C_APLL_LOCK		S3C_CLKREG(0x00)
+#define S3C_MPLL_LOCK		S3C_CLKREG(0x04)
+#define S3C_EPLL_LOCK		S3C_CLKREG(0x08)
+#define S3C_APLL_CON		S3C_CLKREG(0x0C)
+#define S3C_MPLL_CON		S3C_CLKREG(0x10)
+#define S3C_EPLL_CON0		S3C_CLKREG(0x14)
+#define S3C_EPLL_CON1		S3C_CLKREG(0x18)
+#define S3C_CLK_SRC		S3C_CLKREG(0x1C)
+#define S3C_CLK_DIV0		S3C_CLKREG(0x20)
+#define S3C_CLK_DIV1		S3C_CLKREG(0x24)
+#define S3C_CLK_DIV2		S3C_CLKREG(0x28)
+#define S3C_CLK_OUT		S3C_CLKREG(0x2C)
+#define S3C_HCLK_GATE		S3C_CLKREG(0x30)
+#define S3C_PCLK_GATE		S3C_CLKREG(0x34)
+#define S3C_SCLK_GATE		S3C_CLKREG(0x38)
+#define S3C_MEM0_GATE		S3C_CLKREG(0x3C)
+
+/* CLKDIV0 */
+#define S3C6400_CLKDIV0_PCLK_MASK	(0xf << 12)
+#define S3C6400_CLKDIV0_PCLK_SHIFT	(12)
+#define S3C6400_CLKDIV0_HCLK2_MASK	(0x7 << 9)
+#define S3C6400_CLKDIV0_HCLK2_SHIFT	(9)
+#define S3C6400_CLKDIV0_HCLK_MASK	(0x1 << 8)
+#define S3C6400_CLKDIV0_HCLK_SHIFT	(8)
+#define S3C6400_CLKDIV0_MPLL_MASK	(0x1 << 4)
+#define S3C6400_CLKDIV0_MPLL_SHIFT	(4)
+
+#define S3C6400_CLKDIV0_ARM_MASK	(0x7 << 0)
+#define S3C6410_CLKDIV0_ARM_MASK	(0xf << 0)
+#define S3C6400_CLKDIV0_ARM_SHIFT	(0)
+
+/* HCLK GATE Registers */
+#define S3C_CLKCON_HCLK_3DSE	(1<<31)
+#define S3C_CLKCON_HCLK_UHOST	(1<<29)
+#define S3C_CLKCON_HCLK_SECUR	(1<<28)
+#define S3C_CLKCON_HCLK_SDMA1	(1<<27)
+#define S3C_CLKCON_HCLK_SDMA0	(1<<26)
+#define S3C_CLKCON_HCLK_IROM	(1<<25)
+#define S3C_CLKCON_HCLK_DDR1	(1<<24)
+#define S3C_CLKCON_HCLK_DDR0	(1<<23)
+#define S3C_CLKCON_HCLK_MEM1	(1<<22)
+#define S3C_CLKCON_HCLK_MEM0	(1<<21)
+#define S3C_CLKCON_HCLK_USB	(1<<20)
+#define S3C_CLKCON_HCLK_HSMMC2	(1<<19)
+#define S3C_CLKCON_HCLK_HSMMC1	(1<<18)
+#define S3C_CLKCON_HCLK_HSMMC0	(1<<17)
+#define S3C_CLKCON_HCLK_MDP	(1<<16)
+#define S3C_CLKCON_HCLK_DHOST	(1<<15)
+#define S3C_CLKCON_HCLK_IHOST	(1<<14)
+#define S3C_CLKCON_HCLK_DMA1	(1<<13)
+#define S3C_CLKCON_HCLK_DMA0	(1<<12)
+#define S3C_CLKCON_HCLK_JPEG	(1<<11)
+#define S3C_CLKCON_HCLK_CAMIF	(1<<10)
+#define S3C_CLKCON_HCLK_SCALER	(1<<9)
+#define S3C_CLKCON_HCLK_2D	(1<<8)
+#define S3C_CLKCON_HCLK_TV	(1<<7)
+#define S3C_CLKCON_HCLK_POST0	(1<<5)
+#define S3C_CLKCON_HCLK_ROT	(1<<4)
+#define S3C_CLKCON_HCLK_LCD	(1<<3)
+#define S3C_CLKCON_HCLK_TZIC	(1<<2)
+#define S3C_CLKCON_HCLK_INTC	(1<<1)
+#define S3C_CLKCON_HCLK_MFC	(1<<0)
+
+/* PCLK GATE Registers */
+#define S3C6410_CLKCON_PCLK_I2C1	(1<<27)
+#define S3C6410_CLKCON_PCLK_IIS2	(1<<26)
+#define S3C_CLKCON_PCLK_SKEY		(1<<24)
+#define S3C_CLKCON_PCLK_CHIPID		(1<<23)
+#define S3C_CLKCON_PCLK_SPI1		(1<<22)
+#define S3C_CLKCON_PCLK_SPI0		(1<<21)
+#define S3C_CLKCON_PCLK_HSIRX		(1<<20)
+#define S3C_CLKCON_PCLK_HSITX		(1<<19)
+#define S3C_CLKCON_PCLK_GPIO		(1<<18)
+#define S3C_CLKCON_PCLK_IIC		(1<<17)
+#define S3C_CLKCON_PCLK_IIS1		(1<<16)
+#define S3C_CLKCON_PCLK_IIS0		(1<<15)
+#define S3C_CLKCON_PCLK_AC97		(1<<14)
+#define S3C_CLKCON_PCLK_TZPC		(1<<13)
+#define S3C_CLKCON_PCLK_TSADC		(1<<12)
+#define S3C_CLKCON_PCLK_KEYPAD		(1<<11)
+#define S3C_CLKCON_PCLK_IRDA		(1<<10)
+#define S3C_CLKCON_PCLK_PCM1		(1<<9)
+#define S3C_CLKCON_PCLK_PCM0		(1<<8)
+#define S3C_CLKCON_PCLK_PWM		(1<<7)
+#define S3C_CLKCON_PCLK_RTC		(1<<6)
+#define S3C_CLKCON_PCLK_WDT		(1<<5)
+#define S3C_CLKCON_PCLK_UART3		(1<<4)
+#define S3C_CLKCON_PCLK_UART2		(1<<3)
+#define S3C_CLKCON_PCLK_UART1		(1<<2)
+#define S3C_CLKCON_PCLK_UART0		(1<<1)
+#define S3C_CLKCON_PCLK_MFC		(1<<0)
+
+/* SCLK GATE Registers */
+#define S3C_CLKCON_SCLK_UHOST		(1<<30)
+#define S3C_CLKCON_SCLK_MMC2_48		(1<<29)
+#define S3C_CLKCON_SCLK_MMC1_48		(1<<28)
+#define S3C_CLKCON_SCLK_MMC0_48		(1<<27)
+#define S3C_CLKCON_SCLK_MMC2		(1<<26)
+#define S3C_CLKCON_SCLK_MMC1		(1<<25)
+#define S3C_CLKCON_SCLK_MMC0		(1<<24)
+#define S3C_CLKCON_SCLK_SPI1_48 	(1<<23)
+#define S3C_CLKCON_SCLK_SPI0_48 	(1<<22)
+#define S3C_CLKCON_SCLK_SPI1		(1<<21)
+#define S3C_CLKCON_SCLK_SPI0		(1<<20)
+#define S3C_CLKCON_SCLK_DAC27		(1<<19)
+#define S3C_CLKCON_SCLK_TV27		(1<<18)
+#define S3C_CLKCON_SCLK_SCALER27	(1<<17)
+#define S3C_CLKCON_SCLK_SCALER		(1<<16)
+#define S3C_CLKCON_SCLK_LCD27		(1<<15)
+#define S3C_CLKCON_SCLK_LCD		(1<<14)
+#define S3C6400_CLKCON_SCLK_POST1_27	(1<<13)
+#define S3C6410_CLKCON_FIMC		(1<<13)
+#define S3C_CLKCON_SCLK_POST0_27	(1<<12)
+#define S3C6400_CLKCON_SCLK_POST1	(1<<11)
+#define S3C6410_CLKCON_SCLK_AUDIO2	(1<<11)
+#define S3C_CLKCON_SCLK_POST0		(1<<10)
+#define S3C_CLKCON_SCLK_AUDIO1		(1<<9)
+#define S3C_CLKCON_SCLK_AUDIO0		(1<<8)
+#define S3C_CLKCON_SCLK_SECUR		(1<<7)
+#define S3C_CLKCON_SCLK_IRDA		(1<<6)
+#define S3C_CLKCON_SCLK_UART		(1<<5)
+#define S3C_CLKCON_SCLK_ONENAND 	(1<<4)
+#define S3C_CLKCON_SCLK_MFC		(1<<3)
+#define S3C_CLKCON_SCLK_CAM		(1<<2)
+#define S3C_CLKCON_SCLK_JPEG		(1<<1)
+
+/* CLKSRC */
+
+#define S3C6400_CLKSRC_APLL_MOUT	(1 << 0)
+#define S3C6400_CLKSRC_MPLL_MOUT	(1 << 1)
+#define S3C6400_CLKSRC_EPLL_MOUT	(1 << 2)
+#define S3C6400_CLKSRC_APLL_MOUT_SHIFT	(0)
+#define S3C6400_CLKSRC_MPLL_MOUT_SHIFT	(1)
+#define S3C6400_CLKSRC_EPLL_MOUT_SHIFT	(2)
+#define S3C6400_CLKSRC_MFC		(1 << 4)
 
+#endif /* _PLAT_REGS_CLOCK_H */

arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h renamed from arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h

arch/arm/mach-s3c64xx/include/mach/regs-gpio.h renamed from arch/arm/plat-s3c64xx/include/plat/regs-gpio.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/regs-gpio.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-gpio.h

arch/arm/mach-s3c64xx/include/mach/regs-modem.h renamed from arch/arm/plat-s3c64xx/include/plat/regs-modem.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/regs-modem.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-modem.h

arch/arm/mach-s3c64xx/include/mach/regs-srom.h renamed from arch/arm/plat-s3c64xx/include/plat/regs-srom.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/regs-srom.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-srom.h

arch/arm/mach-s3c64xx/include/mach/regs-sys.h renamed from arch/arm/plat-s3c64xx/include/plat/regs-sys.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/regs-sys.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-sys.h

arch/arm/mach-s3c64xx/include/mach/regs-syscon-power.h renamed from arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h
rename to arch/arm/mach-s3c64xx/include/mach/regs-syscon-power.h

arch/arm/mach-s3c64xx/mach-anw6410.c +2 -2

index 49032a8..06d8fe5 100644
@@ -49,8 +49,8 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/regs-gpio.h>
-#include <plat/regs-modem.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-modem.h>
 
 /* DM9000 */
 #define ANW6410_PA_DM9000	(0x18000000)

arch/arm/mach-s3c64xx/mach-smdk6410.c +4 -4

index 6e6ff35..021670e 100644
@@ -46,10 +46,10 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/regs-modem.h>
-#include <plat/regs-gpio.h>
-#include <plat/regs-sys.h>
-#include <plat/regs-srom.h>
+#include <mach/regs-modem.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-sys.h>
+#include <mach/regs-srom.h>
 #include <plat/iic.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>

arch/arm/mach-s3c64xx/s3c6400.c +1 -1

index 884858a..2fba1b2 100644
@@ -30,7 +30,7 @@
 
 #include <plat/cpu-freq.h>
 #include <plat/regs-serial.h>
-#include <plat/regs-clock.h>
+#include <mach/regs-clock.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>

arch/arm/mach-s3c64xx/s3c6410.c +1 -1

index 185f15c..b881d6a 100644
@@ -31,7 +31,7 @@
 
 #include <plat/cpu-freq.h>
 #include <plat/regs-serial.h>
-#include <plat/regs-clock.h>
+#include <mach/regs-clock.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>

arch/arm/plat-s3c64xx/clock.c +2 -2

index 2989c3a..64439de 100644
@@ -21,8 +21,8 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 
-#include <plat/regs-sys.h>
-#include <plat/regs-clock.h>
+#include <mach/regs-sys.h>
+#include <mach/regs-clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/clock.h>

arch/arm/plat-s3c64xx/dma.c +1 -1

index d554b93..0e0edf7 100644
@@ -28,7 +28,7 @@
 #include <mach/irqs.h>
 
 #include <plat/dma-plat.h>
-#include <plat/regs-sys.h>
+#include <mach/regs-sys.h>
 
 #include <asm/hardware/pl080.h>

arch/arm/plat-s3c64xx/gpiolib.c +1 -1

index b6e3f55..66e6794 100644
@@ -22,7 +22,7 @@
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
 #include <plat/gpio-cfg-helpers.h>
-#include <plat/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 /* GPIO bank summary:
  *

arch/arm/plat-s3c64xx/include/plat/regs-clock.h deleted +0 ~~-156~~

156 lines not on this page · raw message

arch/arm/plat-s3c64xx/irq-eint.c +1 -1

index ebdf183..5682d6a 100644
@@ -22,7 +22,7 @@
 #include <asm/hardware/vic.h>
 
 #include <plat/regs-irqtype.h>
-#include <plat/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <plat/gpio-cfg.h>
 
 #include <mach/map.h>

arch/arm/plat-s3c64xx/irq-pm.c +1 -1

index ca523b5..da1bec6 100644
@@ -23,7 +23,7 @@
 
 #include <plat/regs-serial.h>
 #include <plat/regs-timer.h>
-#include <plat/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>

arch/arm/plat-s3c64xx/pm.c +5 -5

index 8ad9ab1..b8ac459 100644
@@ -20,11 +20,11 @@
 #include <mach/map.h>
 
 #include <plat/pm.h>
-#include <plat/regs-sys.h>
-#include <plat/regs-gpio.h>
-#include <plat/regs-clock.h>
-#include <plat/regs-syscon-power.h>
-#include <plat/regs-gpio-memport.h>
+#include <mach/regs-sys.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-syscon-power.h>
+#include <mach/regs-gpio-memport.h>
 
 #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
 #include <mach/gpio-bank-n.h>

arch/arm/plat-s3c64xx/s3c6400-clock.c +1 -1

index cb2bf4b..85f7bb0 100644
@@ -27,7 +27,7 @@
 
 #include <plat/cpu-freq.h>
 
-#include <plat/regs-clock.h>
+#include <mach/regs-clock.h>
 #include <plat/clock.h>
 #include <plat/clock-clksrc.h>
 #include <plat/cpu.h>

Signature · 1 line

1.6.0.4

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Move IRQ support into mach-s3c64xx

In reply to Ben Dooks

Move IRQ support to mach-s3c64xx as it is unlikely to be re-used outside this machine.

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

---
 arch/arm/mach-s3c64xx/Makefile                     |    7 +
 arch/arm/mach-s3c64xx/include/mach/entry-macro.S   |    2 +-
 arch/arm/mach-s3c64xx/include/mach/irqs.h          |  210 +++++++++++++++++++-
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c |    0
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c   |    0
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq.c      |    0
 arch/arm/plat-s3c64xx/Makefile                     |    3 -
 arch/arm/plat-s3c64xx/include/plat/irqs.h          |  214 --------------------
 8 files changed, 212 insertions(+), 224 deletions(-)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq.c (100%)
 delete mode 100644 arch/arm/plat-s3c64xx/include/plat/irqs.h

arch/arm/mach-s3c64xx/Makefile +7 -0

index 21ddf6b..103bed4 100644
@@ -15,10 +15,17 @@ obj-				:=
 obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o
 obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
 
+obj-y				+= irq.o
+obj-y				+= irq-eint.o
+
 # setup support
 
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o
 
+# PM
+
+obj-$(CONFIG_PM)		+= irq-pm.o
+
 # Machine support
 
 obj-$(CONFIG_MACH_ANW6410)	+= mach-anw6410.o

arch/arm/mach-s3c64xx/include/mach/entry-macro.S +1 -1

index 33a8fe2..dd36260 100644
@@ -13,6 +13,6 @@
 */
 
 #include <mach/map.h>
-#include <plat/irqs.h>
+#include <mach/irqs.h>
 
 #include <asm/entry-macro-vic2.S>

arch/arm/mach-s3c64xx/include/mach/irqs.h +204 -6

220 lines not on this page · raw message

arch/arm/mach-s3c64xx/irq-eint.c renamed from arch/arm/plat-s3c64xx/irq-eint.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/irq-eint.c
rename to arch/arm/mach-s3c64xx/irq-eint.c

arch/arm/mach-s3c64xx/irq-pm.c renamed from arch/arm/plat-s3c64xx/irq-pm.c +0 -0

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

arch/arm/mach-s3c64xx/irq.c renamed from arch/arm/plat-s3c64xx/irq.c +0 -0

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

arch/arm/plat-s3c64xx/Makefile +0 -3

index 80255a5..3e52dcd 100644
@@ -15,8 +15,6 @@ obj-				:=
 obj-y				+= dev-uart.o
 obj-y				+= dev-rtc.o
 obj-y				+= cpu.o
-obj-y				+= irq.o
-obj-y				+= irq-eint.o
 obj-y				+= clock.o
 obj-y				+= gpiolib.o

@@ -30,7 +28,6 @@ obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o
 
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PM)		+= sleep.o
-obj-$(CONFIG_PM)		+= irq-pm.o
 
 # DMA support

arch/arm/plat-s3c64xx/include/plat/irqs.h deleted +0 ~~-214~~

214 lines not on this page · raw message

Signature · 1 line

1.6.0.4

Ben Dooks

author

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

PATCH 1/1 ARM: S3C64XX: Move device files into mach-s3c64xx

In reply to Ben Dooks

Move the S3C64XX specific device files into mach-s3c64xx

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

---
 arch/arm/mach-s3c64xx/Makefile                     |    7 +++++++
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-adc.c  |    0
 .../arm/{plat-s3c64xx => mach-s3c64xx}/dev-audio.c |    0
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-rtc.c  |    0
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-spi.c  |    2 +-
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c |    0
 .../include/mach}/spi-clocks.h                     |    2 +-
 arch/arm/plat-s3c64xx/Makefile                     |    9 ---------
 8 files changed, 9 insertions(+), 11 deletions(-)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-adc.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-audio.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-rtc.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-spi.c (99%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/spi-clocks.h (89%)

arch/arm/mach-s3c64xx/Makefile +7 -0

index 103bed4..129f0a8 100644
@@ -33,3 +33,10 @@ obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o
 obj-$(CONFIG_MACH_SMDK6410)	+= mach-smdk6410.o
 obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o
 obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
+
+# device support
+
+obj-y				+= dev-uart.o
+obj-y				+= dev-rtc.o
+obj-$(CONFIG_S3C_ADC)		+= dev-adc.o
+obj-$(CONFIG_SND_S3C24XX_SOC)	+= dev-audio.o

arch/arm/mach-s3c64xx/dev-adc.c renamed from arch/arm/plat-s3c64xx/dev-adc.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/dev-adc.c
rename to arch/arm/mach-s3c64xx/dev-adc.c

arch/arm/mach-s3c64xx/dev-audio.c renamed from arch/arm/plat-s3c64xx/dev-audio.c +0 -0

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

arch/arm/mach-s3c64xx/dev-rtc.c renamed from arch/arm/plat-s3c64xx/dev-rtc.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/dev-rtc.c
rename to arch/arm/mach-s3c64xx/dev-rtc.c

arch/arm/mach-s3c64xx/dev-spi.c renamed from arch/arm/plat-s3c64xx/dev-spi.c +1 -1

similarity index 99%
rename from arch/arm/plat-s3c64xx/dev-spi.c
rename to arch/arm/mach-s3c64xx/dev-spi.c
index 0c20d27..29c32d0 100644
@@ -17,8 +17,8 @@
 #include <mach/map.h>
 #include <mach/gpio.h>
 #include <mach/gpio-bank-c.h>
+#include <mach/spi-clocks.h>
 
-#include <plat/spi-clocks.h>
 #include <plat/s3c64xx-spi.h>
 #include <plat/gpio-cfg.h>
 #include <plat/irqs.h>

arch/arm/mach-s3c64xx/dev-uart.c renamed from arch/arm/plat-s3c64xx/dev-uart.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/dev-uart.c
rename to arch/arm/mach-s3c64xx/dev-uart.c

arch/arm/mach-s3c64xx/include/mach/spi-clocks.h renamed from arch/arm/plat-s3c64xx/include/plat/spi-clocks.h +1 -1

similarity index 89%
rename from arch/arm/plat-s3c64xx/include/plat/spi-clocks.h
rename to arch/arm/mach-s3c64xx/include/mach/spi-clocks.h
index 524bdae..9d0c43b 100644
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/include/plat/spi-clocks.h
+/* linux/arch/arm/mach-s3c64xx/include/mach/spi-clocks.h
  *
  * Copyright (C) 2009 Samsung Electronics Ltd.
  *	Jaswinder Singh <[email protected]>

arch/arm/plat-s3c64xx/Makefile +0 -9

index 3e52dcd..d7852ba 100644
@@ -11,9 +11,6 @@ obj-n				:= dummy.o
 obj-				:=
 
 # Core files
-
-obj-y				+= dev-uart.o
-obj-y				+= dev-rtc.o
 obj-y				+= cpu.o
 obj-y				+= clock.o
 obj-y				+= gpiolib.o

@@ -33,15 +30,9 @@ obj-$(CONFIG_PM)		+= sleep.o
 
 obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
 
-# ADC support
-
-obj-$(CONFIG_S3C_ADC)		+= dev-adc.o
-
 # Device setup
 
 obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
 obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
 obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
-obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
-obj-$(CONFIG_SPI_S3C64XX) += dev-spi.o

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:02 UTC #8 lore raw

PATCH 1/1 ARM: S3C64XX: Move device setup support to mach-s3c64xx

In reply to Ben Dooks

Move device setup support to mach-s3c64xx as it is unlikely to be used outside of this directory

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

---
 arch/arm/mach-s3c64xx/Kconfig                      |   26 ++++++++++++++++++++
 arch/arm/mach-s3c64xx/Makefile                     |    6 ++++-
 .../setup-fb-24bpp.c                               |    0
 .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c    |    0
 .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c    |    0
 .../setup-sdhci-gpio.c                             |    0
 arch/arm/plat-s3c64xx/Kconfig                      |   26 --------------------
 arch/arm/plat-s3c64xx/Makefile                     |    6 ----
 8 files changed, 31 insertions(+), 33 deletions(-)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-fb-24bpp.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-sdhci-gpio.c (100%)

arch/arm/mach-s3c64xx/Kconfig +26 -0

index ce32e49..15e065e 100644
@@ -26,6 +26,32 @@ config S3C64XX_SETUP_SDHCI
 	  Internal configuration for default SDHCI setup for S3C6400 and
 	  S3C6410 SoCs.
 
+# platform specific device setup
+
+config S3C64XX_SETUP_I2C0
+	bool
+	default y
+	help
+	  Common setup code for i2c bus 0.
+
+	  Note, currently since i2c0 is always compiled, this setup helper
+	  is always compiled with it.
+
+config S3C64XX_SETUP_I2C1
+	bool
+	help
+	  Common setup code for i2c bus 1.
+
+config S3C64XX_SETUP_FB_24BPP
+	bool
+	help
+	  Common setup code for S3C64XX with an 24bpp RGB display helper.
+
+config S3C64XX_SETUP_SDHCI_GPIO
+	bool
+	help
+	  Common setup code for S3C64XX SDHCI GPIO configurations
+
 # S36400 Macchine support
 
 config MACH_SMDK6400

arch/arm/mach-s3c64xx/Makefile +5 -1

index 129f0a8..49b71d5 100644
@@ -18,9 +18,13 @@ obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
 obj-y				+= irq.o
 obj-y				+= irq-eint.o
 
-# setup support
+# Device setup
 
+obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
+obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o
+obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
+obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
 
 # PM

arch/arm/mach-s3c64xx/setup-fb-24bpp.c renamed from arch/arm/plat-s3c64xx/setup-fb-24bpp.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/setup-fb-24bpp.c
rename to arch/arm/mach-s3c64xx/setup-fb-24bpp.c

arch/arm/mach-s3c64xx/setup-i2c0.c renamed from arch/arm/plat-s3c64xx/setup-i2c0.c +0 -0

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

arch/arm/mach-s3c64xx/setup-i2c1.c renamed from arch/arm/plat-s3c64xx/setup-i2c1.c +0 -0

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

arch/arm/mach-s3c64xx/setup-sdhci-gpio.c renamed from arch/arm/plat-s3c64xx/setup-sdhci-gpio.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/setup-sdhci-gpio.c
rename to arch/arm/mach-s3c64xx/setup-sdhci-gpio.c

arch/arm/plat-s3c64xx/Kconfig +0 ~~-26~~

index 37b4519..4edb580 100644
@@ -46,30 +46,4 @@ config S3C64XX_DMA
 	bool "S3C64XX DMA"
 	select S3C_DMA
 
-# platform specific device setup
-
-config S3C64XX_SETUP_I2C0
-	bool
-	default y
-	help
-	  Common setup code for i2c bus 0.
-
-	  Note, currently since i2c0 is always compiled, this setup helper
-	  is always compiled with it.
-
-config S3C64XX_SETUP_I2C1
-	bool
-	help
-	  Common setup code for i2c bus 1.
-
-config S3C64XX_SETUP_FB_24BPP
-	bool
-	help
-	  Common setup code for S3C64XX with an 24bpp RGB display helper.
-
-config S3C64XX_SETUP_SDHCI_GPIO
-	bool
-	help
-	  Common setup code for S3C64XX SDHCI GPIO configurations
-
 endif

arch/arm/plat-s3c64xx/Makefile +0 -6

index d7852ba..187b779 100644
@@ -30,9 +30,3 @@ obj-$(CONFIG_PM)		+= sleep.o
 
 obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
 
-# Device setup
-
-obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
-obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
-obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
-obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:03 UTC #9 lore raw

PATCH 1/1 ARM: S3C64XX: Move cpu, clock and gpiolib and PM support to mach-s3c64xx

In reply to Ben Dooks

Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used outside of this directory. Also move the SoC header files in with it.

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

---
 arch/arm/{plat-s3c64xx => mach-s3c6410}/pm.c       |    0
 arch/arm/mach-s3c64xx/Makefile                     |    7 +++++++
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/clock.c    |    2 ++
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c      |    4 ++--
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/gpiolib.c  |    0
 .../plat => mach-s3c64xx/include/mach}/pll.h       |    0
 .../plat => mach-s3c64xx/include/mach}/s3c6400.h   |    3 +--
 .../plat => mach-s3c64xx/include/mach}/s3c6410.h   |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
 arch/arm/mach-s3c64xx/s3c6400.c                    |    2 +-
 arch/arm/mach-s3c64xx/s3c6410.c                    |    4 ++--
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S    |    0
 arch/arm/plat-s3c64xx/Makefile                     |   10 ----------
 arch/arm/plat-s3c64xx/s3c6400-init.c               |    4 ++--
 18 files changed, 23 insertions(+), 25 deletions(-)
 rename arch/arm/{plat-s3c64xx => mach-s3c6410}/pm.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/clock.c (99%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c (98%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/gpiolib.c (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pll.h (100%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6400.h (95%)
 rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6410.h (93%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S (100%)

arch/arm/mach-s3c6410/pm.c renamed from arch/arm/plat-s3c64xx/pm.c +0 -0

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

arch/arm/mach-s3c64xx/Makefile +7 -0

index 49b71d5..ef8bec8 100644
@@ -10,6 +10,11 @@ obj-m				:=
 obj-n				:=
 obj-				:=
 
+# Core files
+obj-y				+= cpu.o
+obj-y				+= clock.o
+obj-y				+= gpiolib.o
+
 # Core support for S3C6400 system
 
 obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o

@@ -28,6 +33,8 @@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
 
 # PM
 
+obj-$(CONFIG_PM)		+= pm.o
+obj-$(CONFIG_PM)		+= sleep.o
 obj-$(CONFIG_PM)		+= irq-pm.o
 
 # Machine support

arch/arm/mach-s3c64xx/clock.c renamed from arch/arm/plat-s3c64xx/clock.c +2 -0

similarity index 99%
rename from arch/arm/plat-s3c64xx/clock.c
rename to arch/arm/mach-s3c64xx/clock.c
index 64439de..229bb3b 100644
@@ -23,6 +23,8 @@
 
 #include <mach/regs-sys.h>
 #include <mach/regs-clock.h>
+#include <mach/pll.h>
+
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/clock.h>

arch/arm/mach-s3c64xx/cpu.c renamed from arch/arm/plat-s3c64xx/cpu.c +2 -2

similarity index 98%
rename from arch/arm/plat-s3c64xx/cpu.c
rename to arch/arm/mach-s3c64xx/cpu.c
index bc7ca18..410d688 100644
@@ -33,8 +33,8 @@
 #include <plat/devs.h>
 #include <plat/clock.h>
 
-#include <plat/s3c6400.h>
-#include <plat/s3c6410.h>
+#include <mach/s3c6400.h>
+#include <mach/s3c6410.h>
 
 /* table of supported CPUs */

arch/arm/mach-s3c64xx/gpiolib.c renamed from arch/arm/plat-s3c64xx/gpiolib.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/gpiolib.c
rename to arch/arm/mach-s3c64xx/gpiolib.c

arch/arm/mach-s3c64xx/include/mach/pll.h renamed from arch/arm/plat-s3c64xx/include/plat/pll.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/include/plat/pll.h
rename to arch/arm/mach-s3c64xx/include/mach/pll.h

arch/arm/mach-s3c64xx/include/mach/s3c6400.h renamed from arch/arm/plat-s3c64xx/include/plat/s3c6400.h +1 -2

similarity index 95%
rename from arch/arm/plat-s3c64xx/include/plat/s3c6400.h
rename to arch/arm/mach-s3c64xx/include/mach/s3c6400.h
index 11f2e1e..2bc7c07 100644
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c64xx/include/plat/s3c6400.h
+/* arch/arm/mach-s3c64xx/include/macht/s3c6400.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics

@@ -33,4 +33,3 @@ extern void s3c6400_init_clocks(int xtal);
 #define s3c6400_map_io NULL
 #define s3c6400_init NULL
 #endif
-

arch/arm/mach-s3c64xx/include/mach/s3c6410.h renamed from arch/arm/plat-s3c64xx/include/plat/s3c6410.h +1 -1

similarity index 93%
rename from arch/arm/plat-s3c64xx/include/plat/s3c6410.h
rename to arch/arm/mach-s3c64xx/include/mach/s3c6410.h
index 50dcdd6..24f1141 100644
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c64xx/include/plat/s3c6410.h
+/* arch/arm/mach-s3c64xx/include/mach/s3c6410.h
  *
  * Copyright 2008 Openmoko,  Inc.
  * Copyright 2008 Simtec Electronics

arch/arm/mach-s3c64xx/mach-anw6410.c +1 -1

index 06d8fe5..4a0bb24 100644
@@ -45,7 +45,7 @@
 #include <plat/iic.h>
 #include <plat/fb.h>
 
-#include <plat/s3c6410.h>
+#include <mach/s3c6410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c64xx/mach-hmt.c +1 -1

index 284886c..a6d91c3 100644
@@ -38,7 +38,7 @@
 #include <plat/fb.h>
 #include <plat/nand.h>
 
-#include <plat/s3c6410.h>
+#include <mach/s3c6410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c64xx/mach-ncp.c +1 -1

index 9be92dd..bf65747 100644
@@ -40,7 +40,7 @@
 #include <plat/iic.h>
 #include <plat/fb.h>
 
-#include <plat/s3c6410.h>
+#include <mach/s3c6410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -1

index ba8a052..f7b1898 100644
@@ -31,7 +31,7 @@
 
 #include <plat/regs-serial.h>
 
-#include <plat/s3c6400.h>
+#include <mach/s3c6400.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1

index 021670e..fdf8f75 100644
@@ -54,7 +54,7 @@
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
 
-#include <plat/s3c6410.h>
+#include <mach/s3c6410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c64xx/s3c6400.c +1 -1

index 2fba1b2..720d0d1 100644
@@ -37,7 +37,7 @@
 #include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
-#include <plat/s3c6400.h>
+#include <mach/s3c6400.h>
 
 void __init s3c6400_map_io(void)
 {

arch/arm/mach-s3c64xx/s3c6410.c +2 -2

index b881d6a..fd457cc 100644
@@ -38,8 +38,8 @@
 #include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
-#include <plat/s3c6400.h>
-#include <plat/s3c6410.h>
+#include <mach/s3c6400.h>
+#include <mach/s3c6410.h>
 
 void __init s3c6410_map_io(void)
 {

arch/arm/mach-s3c64xx/sleep.S renamed from arch/arm/plat-s3c64xx/sleep.S +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/sleep.S
rename to arch/arm/mach-s3c64xx/sleep.S

arch/arm/plat-s3c64xx/Makefile +0 ~~-10~~

index 187b779..60d7990 100644
@@ -10,22 +10,12 @@ obj-m				:=
 obj-n				:= dummy.o
 obj-				:=
 
-# Core files
-obj-y				+= cpu.o
-obj-y				+= clock.o
-obj-y				+= gpiolib.o
-
 # CPU support
 
 obj-$(CONFIG_CPU_S3C6400_INIT)	+= s3c6400-init.o
 obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o
 obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o
 
-# PM support
-
-obj-$(CONFIG_PM)		+= pm.o
-obj-$(CONFIG_PM)		+= sleep.o
-
 # DMA support
 
 obj-$(CONFIG_S3C64XX_DMA)	+= dma.o

arch/arm/plat-s3c64xx/s3c6400-init.c +2 -2

index 6c28f39..e64caa4 100644
@@ -18,8 +18,8 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/s3c6400.h>
-#include <plat/s3c6410.h>
+#include <mach/s3c6400.h>
+#include <mach/s3c6410.h>
 
 /* uart registration process */

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:03 UTC #10 lore raw

PATCH 1/1 ARM: S3C64XX: Merge s3c6400-init.c into cpu.c

In reply to Ben Dooks

Since this file is small, and is compiled for both systems in this architecture merge it into the cpu support file and remove the original instead of moving it.

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

---
 arch/arm/mach-s3c64xx/Kconfig        |    2 --
 arch/arm/mach-s3c64xx/cpu.c          |    6 ++++++
 arch/arm/plat-s3c64xx/Kconfig        |    6 ------
 arch/arm/plat-s3c64xx/Makefile       |    1 -
 arch/arm/plat-s3c64xx/s3c6400-init.c |   29 -----------------------------
 5 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-init.c

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

index 15e065e..495b6e3 100644
@@ -7,14 +7,12 @@
 
 config CPU_S3C6400
 	bool
-	select CPU_S3C6400_INIT
 	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6400 CPU support
 
 config CPU_S3C6410
 	bool
-	select CPU_S3C6400_INIT
 	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6410 CPU support

arch/arm/mach-s3c64xx/cpu.c +6 -0

index 410d688..374e45e 100644
@@ -129,6 +129,12 @@ static struct sys_device s3c64xx_sysdev = {
 	.cls	= &s3c64xx_sysclass,
 };
 
+/* uart registration process */
+
+void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+{
+	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
+}
 
 /* read cpu identification code */

arch/arm/plat-s3c64xx/Kconfig +0 -6

index 4edb580..6998f85 100644
@@ -30,12 +30,6 @@ if PLAT_S3C64XX
 
 # Configuration options shared by all S3C64XX implementations
 
-config CPU_S3C6400_INIT
-	bool
-	help
-	  Common initialisation code for the S3C6400 that is shared
-	  by other CPUs in the series, such as the S3C6410.
-
 config CPU_S3C6400_CLOCK
 	bool
 	help

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

index 60d7990..1d9513c 100644
@@ -12,7 +12,6 @@ obj-				:=
 
 # CPU support
 
-obj-$(CONFIG_CPU_S3C6400_INIT)	+= s3c6400-init.o
 obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o
 obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o

arch/arm/plat-s3c64xx/s3c6400-init.c deleted +0 ~~-29~~

deleted file mode 100644
index e64caa4..0000000
@@ -1,29 +0,0 @@
-/* linux/arch/arm/plat-s3c64xx/s3c6400-init.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <[email protected]>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C6400 - CPU initialisation (common with other S3C64XX chips)
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-
-#include <plat/cpu.h>
-#include <plat/devs.h>
-#include <mach/s3c6400.h>
-#include <mach/s3c6410.h>
-
-/* uart registration process */
-
-void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
-}

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:03 UTC #11 lore raw

PATCH 1/1 ARM: S3C64XX: Move CPUfreq and DMA support to the mach-s3c64xx directory

In reply to Ben Dooks

Move CPUfreq and DMA support to mach-s3c64xx as it is unlikely to be used outside of this directory

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

---
 arch/arm/mach-s3c64xx/Kconfig                     |    4 ++++
 arch/arm/mach-s3c64xx/Makefile                    |    8 ++++++++
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c |    0
 arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c     |    0
 arch/arm/plat-s3c64xx/Kconfig                     |    4 ----
 arch/arm/plat-s3c64xx/Makefile                    |    6 ------
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c (100%)
 rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c (100%)

arch/arm/mach-s3c64xx/Kconfig +4 -0

index 495b6e3..33d82b1 100644
@@ -17,6 +17,10 @@ config CPU_S3C6410
 	help
 	  Enable S3C6410 CPU support
 
+config S3C64XX_DMA
+	bool "S3C64XX DMA"
+	select S3C_DMA
+
 config S3C64XX_SETUP_SDHCI
 	select S3C64XX_SETUP_SDHCI_GPIO
 	bool

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

index ef8bec8..4417f1a 100644
@@ -23,6 +23,14 @@ obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o
 obj-y				+= irq.o
 obj-y				+= irq-eint.o
 
+# CPU frequency scaling
+
+obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o
+
+# DMA support
+
+obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
+
 # Device setup
 
 obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o

arch/arm/mach-s3c64xx/cpufreq.c renamed from arch/arm/plat-s3c64xx/cpufreq.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/cpufreq.c
rename to arch/arm/mach-s3c64xx/cpufreq.c

arch/arm/mach-s3c64xx/dma.c renamed from arch/arm/plat-s3c64xx/dma.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c64xx/dma.c
rename to arch/arm/mach-s3c64xx/dma.c

arch/arm/plat-s3c64xx/Kconfig +0 -4

index 6998f85..cc30089 100644
@@ -36,8 +36,4 @@ config CPU_S3C6400_CLOCK
 	  Common clock support code for the S3C6400 that is shared
 	  by other CPUs in the series, such as the S3C6410.
 
-config S3C64XX_DMA
-	bool "S3C64XX DMA"
-	select S3C_DMA
-
 endif

arch/arm/plat-s3c64xx/Makefile +0 -6

index 1d9513c..62fc253 100644
@@ -13,9 +13,3 @@ obj-				:=
 # CPU support
 
 obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o
-obj-$(CONFIG_CPU_FREQ_S3C64XX)  += cpufreq.o
-
-# DMA support
-
-obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
-

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:03 UTC #12 lore raw

PATCH 1/1 ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx

In reply to Ben Dooks

Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the clock code into one place.

Note, no effort is made in this patch to squash the init functions together.

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

---
 arch/arm/mach-s3c64xx/Kconfig         |    2 -
 arch/arm/mach-s3c64xx/clock.c         |  507 +++++++++++++++++++++++++++++++
 arch/arm/plat-s3c64xx/Kconfig         |   12 -
 arch/arm/plat-s3c64xx/Makefile        |    3 -
 arch/arm/plat-s3c64xx/s3c6400-clock.c |  536 ---------------------------------
 5 files changed, 507 insertions(+), 553 deletions(-)
 delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-clock.c

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

index 33d82b1..8c2c89c 100644
@@ -7,13 +7,11 @@
 
 config CPU_S3C6400
 	bool
-	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6400 CPU support
 
 config CPU_S3C6410
 	bool
-	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6410 CPU support

arch/arm/mach-s3c64xx/clock.c +507 -0

526 lines not on this page · raw message

arch/arm/plat-s3c64xx/Kconfig +0 ~~-12~~

index cc30089..94ac74e 100644
@@ -25,15 +25,3 @@ config PLAT_S3C64XX
 	select SAMSUNG_GPIOLIB_4BIT
 	help
 	  Base platform code for any Samsung S3C64XX device
-
-if PLAT_S3C64XX
-
-# Configuration options shared by all S3C64XX implementations
-
-config CPU_S3C6400_CLOCK
-	bool
-	help
-	  Common clock support code for the S3C6400 that is shared
-	  by other CPUs in the series, such as the S3C6410.
-
-endif

arch/arm/plat-s3c64xx/Makefile +0 -3

index 62fc253..7ca1c09 100644
@@ -10,6 +10,3 @@ obj-m				:=
 obj-n				:= dummy.o
 obj-				:=
 
-# CPU support
-
-obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o

arch/arm/plat-s3c64xx/s3c6400-clock.c deleted +0 ~~-536~~

536 lines not on this page · raw message

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:03 UTC #13 lore raw

PATCH 1/1 ARM: S3C64XX: Combine the clock init code

In reply to Ben Dooks

Turn the init sequence of

	s3c24xx_register_baseclocks(xtal);
	s3c64xx_register_clocks();
	s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK);

into a single call as this is now contained within one file.

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

---
 arch/arm/mach-s3c64xx/clock.c                |   50 ++++++++++----------------
 arch/arm/mach-s3c64xx/include/mach/s3c6400.h |    3 +-
 arch/arm/mach-s3c64xx/s3c6400.c              |    5 +--
 arch/arm/mach-s3c64xx/s3c6410.c              |    4 +--
 arch/arm/plat-samsung/include/plat/clock.h   |    1 -
 5 files changed, 23 insertions(+), 40 deletions(-)

arch/arm/mach-s3c64xx/clock.c +19 ~~-31~~

index 9b587e2..7f5e1aa 100644
@@ -748,19 +748,29 @@ static struct clk *clks1[] __initdata = {
 	&clk_arm,
 };
 
+static struct clk *clks[] __initdata = {
+	&clk_ext,
+	&clk_epll,
+	&clk_27m,
+	&clk_48m,
+	&clk_h2,
+};
+
 /**
- * s3c6400_register_clocks - register clocks for s3c6400 and above
- * @armclk_divlimit: Divisor mask for ARMCLK
+ * s3c64xx_register_clocks - register clocks for s3c6400 and s3c6410
+ * @xtal: The rate for the clock crystal feeding the PLLs.
+ * @armclk_divlimit: Divisor mask for ARMCLK.
  *
- * Register the clocks for the S3C6400 and above SoC range, such
- * as ARMCLK and the clocks which have divider chains attached.
+ * Register the clocks for the S3C6400 and S3C6410 SoC range, such
+ * as ARMCLK as well as the necessary parent clocks.
  *
  * This call does not setup the clocks, which is left to the
  * s3c6400_setup_clocks() call which may be needed by the cpufreq
  * or resume code to re-set the clocks if the bootloader has changed
  * them.
  */
-void __init s3c6400_register_clocks(unsigned armclk_divlimit)
+void __init s3c64xx_register_clocks(unsigned long xtal, 
+				    unsigned armclk_divlimit)
 {
 	struct clk *clkp;
 	int ret;

@@ -768,33 +778,9 @@ void __init s3c6400_register_clocks(unsigned armclk_divlimit)
 
 	armclk_mask = armclk_divlimit;
 
-	for (ptr = 0; ptr < ARRAY_SIZE(clks1); ptr++) {
-		clkp = clks1[ptr];
-		ret = s3c24xx_register_clock(clkp);
-		if (ret < 0) {
-			printk(KERN_ERR "Failed to register clock %s (%d)\n",
-			       clkp->name, ret);
-		}
-	}
-
-	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
-}
-
-static struct clk *clks[] __initdata = {
-	&clk_ext,
-	&clk_epll,
-	&clk_27m,
-	&clk_48m,
-	&clk_h2,
-};
-
-void __init s3c64xx_register_clocks(void)
-{
-	struct clk *clkp;
-	int ret;
-	int ptr;
-
+	s3c24xx_register_baseclocks(xtal);
 	s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
+
 	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
 
 	clkp = init_clocks_disable;

@@ -809,5 +795,7 @@ void __init s3c64xx_register_clocks(void)
 		(clkp->enable)(clkp, 0);
 	}
 
+	s3c24xx_register_clocks(clks1, ARRAY_SIZE(clks1));
+	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
 	s3c_pwmclk_init();
 }

arch/arm/mach-s3c64xx/include/mach/s3c6400.h +2 -1

index 2bc7c07..f86958d 100644
@@ -15,9 +15,10 @@
 /* Common init code for S3C6400 related SoCs */
 
 extern void s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-extern void s3c6400_register_clocks(unsigned armclk_divlimit);
 extern void s3c6400_setup_clocks(void);
 
+extern void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit);
+
 #ifdef CONFIG_CPU_S3C6400
 
 extern  int s3c6400_init(void);

arch/arm/mach-s3c64xx/s3c6400.c +1 -4

index 720d0d1..707e34e 100644
@@ -55,10 +55,7 @@ void __init s3c6400_map_io(void)
 
 void __init s3c6400_init_clocks(int xtal)
 {
-	printk(KERN_DEBUG "%s: initialising clocks\n", __func__);
-	s3c24xx_register_baseclocks(xtal);
-	s3c64xx_register_clocks();
-	s3c6400_register_clocks(S3C6400_CLKDIV0_ARM_MASK);
+	s3c64xx_register_clocks(xtal, S3C6400_CLKDIV0_ARM_MASK);
 	s3c6400_setup_clocks();
 }

arch/arm/mach-s3c64xx/s3c6410.c +1 -3

index fd457cc..59635d1 100644
@@ -58,9 +58,7 @@ void __init s3c6410_map_io(void)
 void __init s3c6410_init_clocks(int xtal)
 {
 	printk(KERN_DEBUG "%s: initialising clocks\n", __func__);
-	s3c24xx_register_baseclocks(xtal);
-	s3c64xx_register_clocks();
-	s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK);
+	s3c64xx_register_clocks(xtal, S3C6410_CLKDIV0_ARM_MASK);
 	s3c6400_setup_clocks();
 }

arch/arm/plat-samsung/include/plat/clock.h +0 -1

index ba9a1cd..60b6269 100644
@@ -94,7 +94,6 @@ extern void s3c_register_clocks(struct clk *clk, int nr_clks);
 
 extern int s3c24xx_register_baseclocks(unsigned long xtal);
 
-extern void s3c64xx_register_clocks(void);
 extern void s5p_register_clocks(unsigned long xtal_freq);
 
 extern void s3c24xx_setup_clocks(unsigned long fclk,

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-26 07:03 UTC #14 lore raw

PATCH 1/1 ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XX

In reply to Ben Dooks

Remove the Kconfig and PLAT_S3C64XX defines for the previous S3C64XX directory structure now that the code is moved into mach-s3c64xx.

Note, we cannot currently remove plat-s3c64xx directory as we have a pair of include files used within plat-s3c and plat-samsung that need to find a new home.

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

---
 arch/arm/Kconfig              |   16 +++++++++++++++-
 arch/arm/Makefile             |    2 +-
 arch/arm/plat-s3c64xx/Kconfig |   15 ---------------
 3 files changed, 16 insertions(+), 17 deletions(-)

arch/arm/Kconfig +15 -1

index 685ff7e..89fbed5 100644
@@ -627,9 +627,24 @@ config ARCH_S3C2410
 
 config ARCH_S3C64XX
 	bool "Samsung S3C64XX"
+	select PLAT_S3C
+	select CPU_V6
 	select GENERIC_GPIO
+	select ARM_VIC
 	select HAVE_CLK
+	select NO_IOPORT
 	select ARCH_HAS_CPUFREQ
+	select ARCH_REQUIRE_GPIOLIB
+	select SAMSUNG_CLKSRC
+	select SAMSUNG_IRQ_VIC_TIMER
+	select SAMSUNG_IRQ_UART
+	select S3C_GPIO_TRACK
+	select S3C_GPIO_PULL_UPDOWN
+	select S3C_GPIO_CFG_S3C24XX
+	select S3C_GPIO_CFG_S3C64XX
+	select S3C_DEV_NAND
+	select USB_ARCH_HAS_OHCI
+	select SAMSUNG_GPIOLIB_4BIT
 	help
 	  Samsung S3C64XX series based systems

@@ -784,7 +799,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 +1 -1

index ecf963d..c1300d8 100644
@@ -183,7 +183,7 @@ 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_ARCH_S3C64XX)	:= s3c64xx s3c samsung
 plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung
 plat-$(CONFIG_PLAT_S5P)		:= s5p samsung s3c
 plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

arch/arm/plat-s3c64xx/Kconfig +0 ~~-15~~

index 94ac74e..ae034c2 100644
@@ -8,20 +8,5 @@ config PLAT_S3C64XX
 	bool
 	depends on ARCH_S3C64XX
 	default y
-	select CPU_V6
-	select PLAT_S3C
-	select ARM_VIC
-	select NO_IOPORT
-	select ARCH_REQUIRE_GPIOLIB
-	select SAMSUNG_CLKSRC
-	select SAMSUNG_IRQ_VIC_TIMER
-	select SAMSUNG_IRQ_UART
-	select S3C_GPIO_TRACK
-	select S3C_GPIO_PULL_UPDOWN
-	select S3C_GPIO_CFG_S3C24XX
-	select S3C_GPIO_CFG_S3C64XX
-	select S3C_DEV_NAND
-	select USB_ARCH_HAS_OHCI
-	select SAMSUNG_GPIOLIB_4BIT
 	help
 	  Base platform code for any Samsung S3C64XX device

Signature · 1 line

1.6.0.4