ARM: S5P: moving plat-s5p stuff into plat-samsung

PATCH New Kukjin Kim 2 participants 10 messages Apr 19, 2012 – Apr 25, 2012

Subsystems (3)

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

lore

Share & tools

lore

Kukjin Kim

author

2012-04-19 02:20 UTC #0 lore raw

cover ARM: S5P: moving plat-s5p stuff into plat-samsung

This patches move plat-s5p stuff into plat-samsung for keep just one plat directory, plat-samsung for Samsung stuff. Actually, it includes small things for common s5p and there is no problem this moving. Of course, I'm working on removing plat-s3c24xx and will be submitted before v3.4 release.

NOTE, now the plat-s5p directory which is including Kconfig and dummy Makefile is not removed yet because need to cleanup CONFIG_PLAT_S5P and will be removed soon.

The following changes since commit b1a797eb3759e1c166561c8bc035dbf3d40b8710:

Merge branch 'next/cleanup-samsung-iommu' into topic/cleanup-plat-s5p (2012-04-16 21:13:20 -0700)

[PATCH 1/7] ARM: SAMSUNG: move clock part for common s5p into plat-samsung [PATCH 2/7] ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung [PATCH 3/7] ARM: SAMSUNG: move pm part for common s5p into plat-samsung [PATCH 4/7] ARM: SAMSUNG: move hr timer for common s5p into plat-samsung [PATCH 5/7] ARM: SAMSUNG: move platform device for s5p uart into plat-samsung [PATCH 6/7] ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung [PATCH 7/7] ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig

arch/arm/plat-s5p/Kconfig                          |  108 -----------------
arch/arm/plat-s5p/Makefile                         |   16 ---
arch/arm/plat-samsung/Kconfig                      |  122 ++++++++++++++++++++
arch/arm/plat-samsung/Makefile                     |   13 ++
.../{plat-s5p/clock.c => plat-samsung/s5p-clock.c} |    3 +-
.../dev-mfc.c => plat-samsung/s5p-dev-mfc.c}       |    4 +-
.../dev-uart.c => plat-samsung/s5p-dev-uart.c}     |   78 +++----------
.../irq-eint.c => plat-samsung/s5p-irq-eint.c}     |    3 +-
.../s5p-irq-gpioint.c}                             |    3 +-
.../irq-pm.c => plat-samsung/s5p-irq-pm.c}         |    3 +-
.../arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} |    3 +-
arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c}  |    3 +-
.../{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} |    3 +-
arch/arm/{plat-s5p => plat-samsung}/s5p-time.c     |    3 +-
.../arm/{plat-s5p => plat-samsung}/setup-mipiphy.c |    0
15 files changed, 159 insertions(+), 206 deletions(-)

rename arch/arm/{plat-s5p/clock.c => plat-samsung/s5p-clock.c} (99%) rename arch/arm/{plat-s5p/dev-mfc.c => plat-samsung/s5p-dev-mfc.c} (97%) rename arch/arm/{plat-s5p/dev-uart.c => plat-samsung/s5p-dev-uart.c} (57%) rename arch/arm/{plat-s5p/irq-eint.c => plat-samsung/s5p-irq-eint.c} (99%) rename arch/arm/{plat-s5p/irq-gpioint.c => plat-samsung/s5p-irq-gpioint.c} (99%) rename arch/arm/{plat-s5p/irq-pm.c => plat-samsung/s5p-irq-pm.c} (98%) rename arch/arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} (96%) rename arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} (95%) rename arch/arm/{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} (98%) rename arch/arm/{plat-s5p => plat-samsung}/s5p-time.c (99%)
rename arch/arm/{plat-s5p => plat-samsung}/setup-mipiphy.c (100%)

Kukjin Kim

author

2012-04-19 02:20 UTC #1 lore raw

PATCH 1/7 ARM: SAMSUNG: move clock part for common s5p into plat-samsung

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Makefile                         |    1 -
 arch/arm/plat-samsung/Kconfig                      |    5 +++++
 arch/arm/plat-samsung/Makefile                     |    1 +
 .../{plat-s5p/clock.c => plat-samsung/s5p-clock.c} |    3 +--
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename arch/arm/{plat-s5p/clock.c => plat-samsung/s5p-clock.c} (99%)

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

index 4953d50..8315210 100644
@@ -12,7 +12,6 @@ obj-				:=
 
 # Core files
 
-obj-y				+= clock.o
 obj-y				+= irq.o
 obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
 obj-$(CONFIG_S5P_GPIO_INT)	+= irq-gpioint.o

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

index a0ffc77d..4283765 100644
@@ -58,6 +58,11 @@ config SAMSUNG_CLKSRC
 	  Select the clock code for the clksrc implementation
 	  used by newer systems such as the S3C64XX.
 
+config S5P_CLOCK
+	def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
+	help
+	  Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
+
 # options for IRQ support
 
 config SAMSUNG_IRQ_VIC_TIMER

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

index 6012366..997ce10 100644
@@ -17,6 +17,7 @@ obj-y				+= clock.o
 obj-y				+= pwm-clock.o
 
 obj-$(CONFIG_SAMSUNG_CLKSRC)	+= clock-clksrc.o
+obj-$(CONFIG_S5P_CLOCK)		+= s5p-clock.o
 
 obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o

arch/arm/plat-samsung/s5p-clock.c renamed from arch/arm/plat-s5p/clock.c +1 -2

similarity index 99%
rename from arch/arm/plat-s5p/clock.c
rename to arch/arm/plat-samsung/s5p-clock.c
index f68a9bb..41d3dfd 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/clock.c
- *
+/*
  * Copyright 2009 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
  *

Signature · 1 line

1.7.2.3

Kukjin Kim

author

2012-04-19 02:20 UTC #2 lore raw

PATCH 2/7 ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung

In reply to Kukjin Kim

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Kconfig                          |   11 -----------
 arch/arm/plat-s5p/Makefile                         |    3 ---
 arch/arm/plat-samsung/Kconfig                      |   16 ++++++++++++++++
 arch/arm/plat-samsung/Makefile                     |    3 +++
 .../irq-eint.c => plat-samsung/s5p-irq-eint.c}     |    3 +--
 .../s5p-irq-gpioint.c}                             |    3 +--
 .../arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} |    3 +--
 7 files changed, 22 insertions(+), 20 deletions(-)
 rename arch/arm/{plat-s5p/irq-eint.c => plat-samsung/s5p-irq-eint.c} (99%)
 rename arch/arm/{plat-s5p/irq-gpioint.c => plat-samsung/s5p-irq-gpioint.c} (99%)
 rename arch/arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} (96%)

arch/arm/plat-s5p/Kconfig +0 ~~-11~~

index 2c1193c..efff0a3 100644
@@ -23,17 +23,6 @@ config PLAT_S5P
 	help
 	  Base platform code for Samsung's S5P series SoC.
 
-config S5P_EXT_INT
-	bool
-	help
-	  Use the external interrupts (other than GPIO interrupts.)
-	  Note: Do not choose this for S5P6440 and S5P6450.
-
-config S5P_GPIO_INT
-	bool
-	help
-	  Common code for the GPIO interrupts (other than external interrupts.)
-
 config S5P_HRT
 	bool
 	select SAMSUNG_DEV_PWM

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

index 8315210..8701c3c 100644
@@ -12,9 +12,6 @@ obj-				:=
 
 # Core files
 
-obj-y				+= irq.o
-obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
-obj-$(CONFIG_S5P_GPIO_INT)	+= irq-gpioint.o
 obj-$(CONFIG_S5P_PM)		+= pm.o irq-pm.o
 obj-$(CONFIG_S5P_SLEEP)		+= sleep.o
 obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o

arch/arm/plat-samsung/Kconfig +16 -0

index 4283765..9ae8036 100644
@@ -70,6 +70,22 @@ config SAMSUNG_IRQ_VIC_TIMER
        help
          Internal configuration to build the VIC timer interrupt code.
 
+config S5P_IRQ
+	def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
+	help
+	  Support common interrup part for ARCH_S5P and ARCH_EXYNOS SoCs
+
+config S5P_EXT_INT
+	bool
+	help
+	  Use the external interrupts (other than GPIO interrupts.)
+	  Note: Do not choose this for S5P6440 and S5P6450.
+
+config S5P_GPIO_INT
+	bool
+	help
+	  Common code for the GPIO interrupts (other than external interrupts.)
+
 # options for gpio configuration support
 
 config SAMSUNG_GPIOLIB_4BIT

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

index 997ce10..5b65009 100644
@@ -20,6 +20,9 @@ obj-$(CONFIG_SAMSUNG_CLKSRC)	+= clock-clksrc.o
 obj-$(CONFIG_S5P_CLOCK)		+= s5p-clock.o
 
 obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o
+obj-$(CONFIG_S5P_IRQ)		+= s5p-irq.o
+obj-$(CONFIG_S5P_EXT_INT)	+= s5p-irq-eint.o
+obj-$(CONFIG_S5P_GPIO_INT)	+= s5p-irq-gpioint.o
 
 # ADC

arch/arm/plat-samsung/s5p-irq-eint.c renamed from arch/arm/plat-s5p/irq-eint.c +1 -2

similarity index 99%
rename from arch/arm/plat-s5p/irq-eint.c
rename to arch/arm/plat-samsung/s5p-irq-eint.c
index 139c050..33bd3f3 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/irq-eint.c
- *
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *

arch/arm/plat-samsung/s5p-irq-gpioint.c renamed from arch/arm/plat-s5p/irq-gpioint.c +1 -2

similarity index 99%
rename from arch/arm/plat-s5p/irq-gpioint.c
rename to arch/arm/plat-samsung/s5p-irq-gpioint.c
index 82c7311..f9431fe 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/irq-gpioint.c
- *
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  * Author: Kyungmin Park <[email protected]>
  * Author: Joonyoung Shim <[email protected]>

arch/arm/plat-samsung/s5p-irq.c renamed from arch/arm/plat-s5p/irq.c +1 -2

similarity index 96%
rename from arch/arm/plat-s5p/irq.c
rename to arch/arm/plat-samsung/s5p-irq.c
index afdaa10..dfb47d6 100644
@@ -1,5 +1,4 @@
-/* arch/arm/plat-s5p/irq.c
- *
+/*
  * Copyright (c) 2009 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
  *

Signature · 1 line

1.7.2.3

Kukjin Kim

author

2012-04-19 02:20 UTC #3 lore raw

PATCH 3/7 ARM: SAMSUNG: move pm part for common s5p into plat-samsung

In reply to Kukjin Kim

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Kconfig                          |   12 ------------
 arch/arm/plat-s5p/Makefile                         |    2 --
 arch/arm/plat-samsung/Kconfig                      |   12 ++++++++++++
 arch/arm/plat-samsung/Makefile                     |    3 +++
 .../irq-pm.c => plat-samsung/s5p-irq-pm.c}         |    3 +--
 arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c}  |    3 +--
 .../{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} |    3 +--
 7 files changed, 18 insertions(+), 20 deletions(-)
 rename arch/arm/{plat-s5p/irq-pm.c => plat-samsung/s5p-irq-pm.c} (98%)
 rename arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} (95%)
 rename arch/arm/{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} (98%)

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

index efff0a3..8e45c8b 100644
@@ -33,18 +33,6 @@ config S5P_DEV_UART
 	def_bool y
 	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
 
-config S5P_PM
-	bool
-	help
-	  Common code for power management support on S5P and newer SoCs
-	  Note: Do not select this for S5P6440 and S5P6450.
-
-config S5P_SLEEP
-	bool
-	help
-	  Internal config node to apply common S5P sleep management code.
-	  Can be selected by S5P and newer SoCs with similar sleep procedure.
-
 config S5P_DEV_FIMC0
 	bool
 	help

arch/arm/plat-s5p/Makefile +0 -2

index 8701c3c..c81106f 100644
@@ -12,8 +12,6 @@ obj-				:=
 
 # Core files
 
-obj-$(CONFIG_S5P_PM)		+= pm.o irq-pm.o
-obj-$(CONFIG_S5P_SLEEP)		+= sleep.o
 obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o
 
 # devices

arch/arm/plat-samsung/Kconfig +12 -0

index 9ae8036..56e6ae7 100644
@@ -372,6 +372,18 @@ config SAMSUNG_WAKEMASK
 	  and above. This code allows a set of interrupt to wakeup-mask
 	  mappings. See <plat/wakeup-mask.h>
 
+config S5P_PM
+	bool
+	help
+	  Common code for power management support on S5P and newer SoCs
+	  Note: Do not select this for S5P6440 and S5P6450.
+
+config S5P_SLEEP
+	bool
+	help
+	  Internal config node to apply common S5P sleep management code.
+	  Can be selected by S5P and newer SoCs with similar sleep procedure.
+
 comment "Power Domain"
 
 config SAMSUNG_PD

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

index 5b65009..caa6f9a 100644
@@ -51,6 +51,9 @@ obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
 
+obj-$(CONFIG_S5P_PM)		+= s5p-pm.o s5p-irq-pm.o
+obj-$(CONFIG_S5P_SLEEP)		+= s5p-sleep.o
+
 # PD support
 
 obj-$(CONFIG_SAMSUNG_PD)	+= pd.o

arch/arm/plat-samsung/s5p-irq-pm.c renamed from arch/arm/plat-s5p/irq-pm.c +1 -2

similarity index 98%
rename from arch/arm/plat-s5p/irq-pm.c
rename to arch/arm/plat-samsung/s5p-irq-pm.c
index d1bfeca..7c1e3b7 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/irq-pm.c
- *
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *

arch/arm/plat-samsung/s5p-pm.c renamed from arch/arm/plat-s5p/pm.c +1 -2

similarity index 95%
rename from arch/arm/plat-s5p/pm.c
rename to arch/arm/plat-samsung/s5p-pm.c
index d15dc47..0747468 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/pm.c
- *
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *

arch/arm/plat-samsung/s5p-sleep.S renamed from arch/arm/plat-s5p/sleep.S +1 -2

similarity index 98%
rename from arch/arm/plat-s5p/sleep.S
rename to arch/arm/plat-samsung/s5p-sleep.S
index 006bd01..bdf6dad 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/sleep.S
- *
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *

Signature · 1 line

1.7.2.3

Kukjin Kim

author

2012-04-19 02:20 UTC #4 lore raw

PATCH 4/7 ARM: SAMSUNG: move hr timer for common s5p into plat-samsung

In reply to Kukjin Kim

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Kconfig                      |    6 ------
 arch/arm/plat-s5p/Makefile                     |    4 ----
 arch/arm/plat-samsung/Kconfig                  |    8 ++++++++
 arch/arm/plat-samsung/Makefile                 |    2 ++
 arch/arm/{plat-s5p => plat-samsung}/s5p-time.c |    3 +--
 5 files changed, 11 insertions(+), 12 deletions(-)
 rename arch/arm/{plat-s5p => plat-samsung}/s5p-time.c (99%)

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

index 8e45c8b..795790d 100644
@@ -23,12 +23,6 @@ config PLAT_S5P
 	help
 	  Base platform code for Samsung's S5P series SoC.
 
-config S5P_HRT
-	bool
-	select SAMSUNG_DEV_PWM
-	help
-	  Use the High Resolution timer support
-
 config S5P_DEV_UART
 	def_bool y
 	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)

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

index c81106f..0a2ce38 100644
@@ -10,10 +10,6 @@ obj-m				:=
 obj-n				:= dummy.o
 obj-				:=
 
-# Core files
-
-obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o
-
 # devices
 
 obj-$(CONFIG_S5P_DEV_UART)	+= dev-uart.o

arch/arm/plat-samsung/Kconfig +8 -0

index 56e6ae7..f27b295 100644
@@ -50,6 +50,14 @@ config S3C_LOWLEVEL_UART_PORT
 	  this configuration should be between zero and two. The port
 	  must have been initialised by the boot-loader before use.
 
+# timer options
+
+config S5P_HRT
+	bool
+	select SAMSUNG_DEV_PWM
+	help
+	  Use the High Resolution timer support
+
 # clock options
 
 config SAMSUNG_CLKSRC

arch/arm/plat-samsung/Makefile +2 -0

index caa6f9a..6217c41 100644
@@ -13,6 +13,8 @@ obj-				:=
 
 obj-y				+= init.o cpu.o
 obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o
+obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o
+
 obj-y				+= clock.o
 obj-y				+= pwm-clock.o

arch/arm/plat-samsung/s5p-time.c renamed from arch/arm/plat-s5p/s5p-time.c +1 -2

similarity index 99%
rename from arch/arm/plat-s5p/s5p-time.c
rename to arch/arm/plat-samsung/s5p-time.c
index 17c0a2c..028b6e8 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/s5p-time.c
- *
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
  *

Signature · 1 line

1.7.2.3

Kukjin Kim

author

2012-04-19 02:20 UTC #5 lore raw

PATCH 5/7 ARM: SAMSUNG: move platform device for s5p uart into plat-samsung

In reply to Kukjin Kim

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Kconfig                          |    4 -
 arch/arm/plat-s5p/Makefile                         |    1 -
 arch/arm/plat-samsung/Kconfig                      |    6 ++
 arch/arm/plat-samsung/Makefile                     |    1 +
 .../dev-uart.c => plat-samsung/s5p-dev-uart.c}     |   78 ++++----------------
 5 files changed, 22 insertions(+), 68 deletions(-)
 rename arch/arm/{plat-s5p/dev-uart.c => plat-samsung/s5p-dev-uart.c} (57%)

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

index 795790d..33d9bc8 100644
@@ -23,10 +23,6 @@ config PLAT_S5P
 	help
 	  Base platform code for Samsung's S5P series SoC.
 
-config S5P_DEV_UART
-	def_bool y
-	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
-
 config S5P_DEV_FIMC0
 	bool
 	help

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

index 0a2ce38..1dc6b1c 100644
@@ -12,6 +12,5 @@ obj-				:=
 
 # devices
 
-obj-$(CONFIG_S5P_DEV_UART)	+= dev-uart.o
 obj-$(CONFIG_S5P_DEV_MFC)	+= dev-mfc.o
 obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o

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

index f27b295..0f112a7 100644
@@ -146,6 +146,12 @@ config S3C_GPIO_TRACK
 	  Internal configuration option to enable the s3c specific gpio
 	  chip tracking if the platform requires it.
 
+# uart options
+
+config S5P_DEV_UART
+	def_bool y
+	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
+
 # ADC driver
 
 config S3C_ADC

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

index 6217c41..b20047b 100644
@@ -36,6 +36,7 @@ obj-y				+= platformdata.o
 
 obj-y				+= devs.o
 obj-y				+= dev-uart.o
+obj-$(CONFIG_S5P_DEV_UART)	+= s5p-dev-uart.o
 
 obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o

arch/arm/plat-samsung/s5p-dev-uart.c renamed from arch/arm/plat-s5p/dev-uart.c +15 ~~-63~~

113 lines not on this page · raw message

Signature · 1 line

1.7.2.3

Kukjin Kim

author

2012-04-19 02:20 UTC #6 lore raw

PATCH 6/7 ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung

In reply to Kukjin Kim

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Kconfig                          |   10 ----------
 arch/arm/plat-s5p/Makefile                         |    5 -----
 arch/arm/plat-samsung/Kconfig                      |   10 ++++++++++
 arch/arm/plat-samsung/Makefile                     |    3 +++
 .../dev-mfc.c => plat-samsung/s5p-dev-mfc.c}       |    4 +---
 .../arm/{plat-s5p => plat-samsung}/setup-mipiphy.c |    0
 6 files changed, 14 insertions(+), 18 deletions(-)
 rename arch/arm/{plat-s5p/dev-mfc.c => plat-samsung/s5p-dev-mfc.c} (97%)
 rename arch/arm/{plat-s5p => plat-samsung}/setup-mipiphy.c (100%)

arch/arm/plat-s5p/Kconfig +0 ~~-10~~

index 33d9bc8..4ff6d7e 100644
@@ -63,11 +63,6 @@ config S5P_DEV_I2C_HDMIPHY
 	help
 	  Compile in platform device definitions for I2C HDMIPHY controller
 
-config S5P_DEV_MFC
-	bool
-	help
-	  Compile in platform device definitions for MFC
-
 config S5P_DEV_ONENAND
 	bool
 	help

@@ -92,8 +87,3 @@ config S5P_DEV_USB_EHCI
 	bool
 	help
 	  Compile in platform device definition for USB EHCI
-
-config S5P_SETUP_MIPIPHY
-	bool
-	help
-	  Compile in common setup code for MIPI-CSIS and MIPI-DSIM devices

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

index 1dc6b1c..884b9a1 100644
@@ -9,8 +9,3 @@ obj-y				:=
 obj-m				:=
 obj-n				:= dummy.o
 obj-				:=
-
-# devices
-
-obj-$(CONFIG_S5P_DEV_MFC)	+= dev-mfc.o
-obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o

arch/arm/plat-samsung/Kconfig +10 -0

index 0f112a7..cfa62e8 100644
@@ -309,6 +309,11 @@ config SAMSUNG_DEV_BACKLIGHT
 	help
 	  Compile in platform device definition LCD backlight with PWM Timer
 
+config S5P_DEV_MFC
+	bool
+	help
+	  Compile in setup memory (init) code for MFC
+
 config S3C24XX_PWM
 	bool "PWM device support"
 	select HAVE_PWM

@@ -316,6 +321,11 @@ config S3C24XX_PWM
 	  Support for exporting the PWM timer blocks via the pwm device
 	  system
 
+config S5P_SETUP_MIPIPHY
+	bool
+	help
+	  Compile in common setup code for MIPI-CSIS and MIPI-DSIM devices
+
 # DMA
 
 config S3C_DMA

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

index b20047b..860b2db 100644
@@ -36,10 +36,13 @@ obj-y				+= platformdata.o
 
 obj-y				+= devs.o
 obj-y				+= dev-uart.o
+obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o
 obj-$(CONFIG_S5P_DEV_UART)	+= s5p-dev-uart.o
 
 obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o
 
+obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o
+
 # DMA support
 
 obj-$(CONFIG_S3C_DMA)		+= dma.o s3c-dma-ops.o

arch/arm/plat-samsung/s5p-dev-mfc.c renamed from arch/arm/plat-s5p/dev-mfc.c +1 -3

similarity index 97%
rename from arch/arm/plat-s5p/dev-mfc.c
rename to arch/arm/plat-samsung/s5p-dev-mfc.c
index a30d36b..ad60894 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/dev-mfc.c
- *
+/*
  * Copyright (C) 2010-2011 Samsung Electronics Co.Ltd
  *
  * Base S5P MFC resource and device definitions

@@ -9,7 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>

arch/arm/plat-samsung/setup-mipiphy.c renamed from arch/arm/plat-s5p/setup-mipiphy.c +0 -0

similarity index 100%
rename from arch/arm/plat-s5p/setup-mipiphy.c
rename to arch/arm/plat-samsung/setup-mipiphy.c

Signature · 1 line

1.7.2.3

Kukjin Kim

author

2012-04-19 02:20 UTC #7 lore raw

PATCH 7/7 ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig

In reply to Kukjin Kim

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/plat-s5p/Kconfig     |   65 -----------------------------------------
 arch/arm/plat-samsung/Kconfig |   65 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 65 deletions(-)

arch/arm/plat-s5p/Kconfig +0 ~~-65~~

index 4ff6d7e..e7d5d77 100644
@@ -22,68 +22,3 @@ config PLAT_S5P
 	select SAMSUNG_IRQ_VIC_TIMER
 	help
 	  Base platform code for Samsung's S5P series SoC.
-
-config S5P_DEV_FIMC0
-	bool
-	help
-	  Compile in platform device definitions for FIMC controller 0
-
-config S5P_DEV_FIMC1
-	bool
-	help
-	  Compile in platform device definitions for FIMC controller 1
-
-config S5P_DEV_FIMC2
-	bool
-	help
-	  Compile in platform device definitions for FIMC controller 2
-
-config S5P_DEV_FIMC3
-	bool
-	help
-	  Compile in platform device definitions for FIMC controller 3
-
-config S5P_DEV_JPEG
-	bool
-	help
-	  Compile in platform device definitions for JPEG codec
-
-config S5P_DEV_G2D
-	bool
-	help
-	  Compile in platform device definitions for G2D device
-
-config S5P_DEV_FIMD0
-	bool
-	help
-	  Compile in platform device definitions for FIMD controller 0
-
-config S5P_DEV_I2C_HDMIPHY
-	bool
-	help
-	  Compile in platform device definitions for I2C HDMIPHY controller
-
-config S5P_DEV_ONENAND
-	bool
-	help
-	  Compile in platform device definition for OneNAND controller
-
-config S5P_DEV_CSIS0
-	bool
-	help
-	  Compile in platform device definitions for MIPI-CSIS channel 0
-
-config S5P_DEV_CSIS1
-	bool
-	help
-	  Compile in platform device definitions for MIPI-CSIS channel 1
-
-config S5P_DEV_TV
-	bool
-	help
-	  Compile in platform device definition for TV interface
-
-config S5P_DEV_USB_EHCI
-	bool
-	help
-	  Compile in platform device definition for USB EHCI

arch/arm/plat-samsung/Kconfig +65 -0

76 lines not on this page · raw message

Signature · 1 line

1.7.2.3

Arnd Bergmann

2012-04-19 13:23 UTC #8 lore raw

cover ARM: S5P: moving plat-s5p stuff into plat-samsung

In reply to Kukjin Kim

Quoted 10 lines · Kukjin Kim

This patches move plat-s5p stuff into plat-samsung for keep just one plat directory, plat-samsung for Samsung stuff. Actually, it includes small things for common s5p and there is no problem this moving. Of course, I'm working on removing plat-s3c24xx and will be submitted before v3.4 release.
NOTE, now the plat-s5p directory which is including Kconfig and dummy Makefile is not removed yet because need to cleanup CONFIG_PLAT_S5P and will be removed soon.

Very nice!

Out of curiosity, how far are you planning to take the consolidation of the various directories in the end?
I assume all the s3c24* directories end up getting merged into s3c24xx, but what about s3c64xx, s5p64x0, s5pc100 and s5pcv210? Are they going to stay separate or do they get merged together or with exynos?

Arnd

Kukjin Kim

author

2012-04-25 00:16 UTC #9 lore raw

cover ARM: S5P: moving plat-s5p stuff into plat-samsung

Quoted 7 lines · Arnd Bergmann

Quoted 6 lines · Kukjin Kim
This patches move plat-s5p stuff into plat-samsung for keep just one plat directory, plat-samsung for Samsung stuff. Actually, it includes small things for common s5p and there is no problem this moving. Of course, I'm working on removing plat-s3c24xx and will be submitted before v3.4 release.

Quoted 7 lines

Quoted 4 lines
NOTE, now the plat-s5p directory which is including Kconfig and dummy Makefile is not removed yet because need to cleanup CONFIG_PLAT_S5P and will be removed soon.
Very nice!

Thanks :)

Quoted 2 lines

Out of curiosity, how far are you planning to take the consolidation of the various directories in the end?

Yes, actually, I need more work for it.

Quoted 2 lines

I assume all the s3c24* directories end up getting merged into s3c24xx, but what about s3c64xx, s5p64x0, s5pc100 and s5pcv210?

Yeah, remained mach-s3c24* directories are including just cpufreq stuff and will be cleaned out soon. Moreover, plat-s3c24xx will be merged into one mach-s3c24xx directory before v3.4 release means for v3.5.

But I think, other s5pxxxx are not for this turn probably next time? ;)

Quoted 3 lines

Are they going to stay separate or do they get merged together or with exynos?

Actually, I have a plan to merge them.

Thanks.

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