S5PC2XX: Rename S5pc2XX to exynos4

Message ID 1321509072-7143-1-git-send-email-chander.kashyap@linaro.org
State Superseded
Headers show

Commit Message

Chander Kashyap Nov. 17, 2011, 5:51 a.m.
As per new conventions Samsung SoC's are named as Exynos.
Cortex-A9 based Soc's are named as exynos4. s5pc2xx is cortex-A9
based, hence renamed to exynos4. This is done as per kernel
naming convetions.

Similerly rename the s5p-common to exynos-common and
libs5p-common to libexynos-common.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
---
 Makefile                                           |    6 +++---
 .../armv7/{s5p-common => exynos-common}/Makefile   |    2 +-
 .../armv7/{s5p-common => exynos-common}/cpu_info.c |    0
 .../cpu/armv7/{s5p-common => exynos-common}/pwm.c  |    0
 .../armv7/{s5p-common => exynos-common}/sromc.c    |    0
 .../armv7/{s5p-common => exynos-common}/timer.c    |    0
 arch/arm/cpu/armv7/{s5pc2xx => exynos4}/Makefile   |    0
 arch/arm/cpu/armv7/{s5pc2xx => exynos4}/clock.c    |    0
 arch/arm/cpu/armv7/{s5pc2xx => exynos4}/soc.c      |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/adc.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/clk.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/clock.h     |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/cpu.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/gpio.h      |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/mmc.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/pwm.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/sromc.h     |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/sys_proto.h |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/uart.h      |    0
 boards.cfg                                         |    6 +++---
 20 files changed, 7 insertions(+), 7 deletions(-)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/Makefile (97%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/cpu_info.c (100%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/pwm.c (100%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/sromc.c (100%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/timer.c (100%)
 rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/Makefile (100%)
 rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/clock.c (100%)
 rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/soc.c (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/adc.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/clk.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/clock.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/cpu.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/mmc.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/pwm.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/sromc.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/sys_proto.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/uart.h (100%)

Comments

Minkyu Kang Nov. 24, 2011, 7:55 a.m. | #1
Dear Chander Kashyap,

On 17 November 2011 14:51, Chander Kashyap <chander.kashyap@linaro.org> wrote:
> As per new conventions Samsung SoC's are named as Exynos.
> Cortex-A9 based Soc's are named as exynos4. s5pc2xx is cortex-A9
> based, hence renamed to exynos4. This is done as per kernel
> naming convetions.
>
> Similerly rename the s5p-common to exynos-common and
> libs5p-common to libexynos-common.
>
> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
> ---
>  Makefile                                           |    6 +++---
>  .../armv7/{s5p-common => exynos-common}/Makefile   |    2 +-
>  .../armv7/{s5p-common => exynos-common}/cpu_info.c |    0
>  .../cpu/armv7/{s5p-common => exynos-common}/pwm.c  |    0
>  .../armv7/{s5p-common => exynos-common}/sromc.c    |    0
>  .../armv7/{s5p-common => exynos-common}/timer.c    |    0
>  arch/arm/cpu/armv7/{s5pc2xx => exynos4}/Makefile   |    0
>  arch/arm/cpu/armv7/{s5pc2xx => exynos4}/clock.c    |    0
>  arch/arm/cpu/armv7/{s5pc2xx => exynos4}/soc.c      |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/adc.h       |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/clk.h       |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/clock.h     |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/cpu.h       |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/gpio.h      |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/mmc.h       |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/pwm.h       |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/sromc.h     |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/sys_proto.h |    0
>  .../asm/{arch-s5pc2xx => arch-exynos4}/uart.h      |    0
>  boards.cfg                                         |    6 +++---
>  20 files changed, 7 insertions(+), 7 deletions(-)
>  rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/Makefile (97%)
>  rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/cpu_info.c (100%)
>  rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/pwm.c (100%)
>  rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/sromc.c (100%)
>  rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/timer.c (100%)
>  rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/Makefile (100%)
>  rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/clock.c (100%)
>  rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/soc.c (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/adc.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/clk.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/clock.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/cpu.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/gpio.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/mmc.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/pwm.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/sromc.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/sys_proto.h (100%)
>  rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/uart.h (100%)
>
> diff --git a/Makefile b/Makefile
> index 294c762..1d7721c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -301,10 +301,10 @@ LIBS += $(CPUDIR)/omap-common/libomap-common.o
>  endif
>
>  ifeq ($(SOC),s5pc1xx)
> -LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
> +LIBS += $(CPUDIR)/exynos-common/libexynos-common.o
>  endif
> -ifeq ($(SOC),s5pc2xx)
> -LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
> +ifeq ($(SOC),exynos4)
> +LIBS += $(CPUDIR)/exynos-common/libexynos-common.o
>  endif

Hm.. no, please don't modify the common directory.
Even though s5pc2xx is renamed to exynos4, it is still s5p platform.

>
>  LIBS := $(addprefix $(obj),$(sort $(LIBS)))
> diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/exynos-common/Makefile
> similarity index 97%
> rename from arch/arm/cpu/armv7/s5p-common/Makefile
> rename to arch/arm/cpu/armv7/exynos-common/Makefile
> index 1705399..3c2aef8 100644
> --- a/arch/arm/cpu/armv7/s5p-common/Makefile
> +++ b/arch/arm/cpu/armv7/exynos-common/Makefile
> @@ -23,7 +23,7 @@
>
>  include $(TOPDIR)/config.mk
>
> -LIB    = $(obj)libs5p-common.o
> +LIB    = $(obj)libexynos-common.o
>
>  COBJS-y                += cpu_info.o
>  COBJS-y                += timer.o
> diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/exynos-common/cpu_info.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5p-common/cpu_info.c
> rename to arch/arm/cpu/armv7/exynos-common/cpu_info.c
> diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/exynos-common/pwm.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5p-common/pwm.c
> rename to arch/arm/cpu/armv7/exynos-common/pwm.c
> diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/exynos-common/sromc.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5p-common/sromc.c
> rename to arch/arm/cpu/armv7/exynos-common/sromc.c
> diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/exynos-common/timer.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5p-common/timer.c
> rename to arch/arm/cpu/armv7/exynos-common/timer.c
> diff --git a/arch/arm/cpu/armv7/s5pc2xx/Makefile b/arch/arm/cpu/armv7/exynos4/Makefile
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc2xx/Makefile
> rename to arch/arm/cpu/armv7/exynos4/Makefile
> diff --git a/arch/arm/cpu/armv7/s5pc2xx/clock.c b/arch/arm/cpu/armv7/exynos4/clock.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc2xx/clock.c
> rename to arch/arm/cpu/armv7/exynos4/clock.c
> diff --git a/arch/arm/cpu/armv7/s5pc2xx/soc.c b/arch/arm/cpu/armv7/exynos4/soc.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc2xx/soc.c
> rename to arch/arm/cpu/armv7/exynos4/soc.c
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/adc.h b/arch/arm/include/asm/arch-exynos4/adc.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/adc.h
> rename to arch/arm/include/asm/arch-exynos4/adc.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/clk.h b/arch/arm/include/asm/arch-exynos4/clk.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/clk.h
> rename to arch/arm/include/asm/arch-exynos4/clk.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/clock.h b/arch/arm/include/asm/arch-exynos4/clock.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/clock.h
> rename to arch/arm/include/asm/arch-exynos4/clock.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-exynos4/cpu.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/cpu.h
> rename to arch/arm/include/asm/arch-exynos4/cpu.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/gpio.h b/arch/arm/include/asm/arch-exynos4/gpio.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/gpio.h
> rename to arch/arm/include/asm/arch-exynos4/gpio.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/mmc.h b/arch/arm/include/asm/arch-exynos4/mmc.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/mmc.h
> rename to arch/arm/include/asm/arch-exynos4/mmc.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-exynos4/pwm.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/pwm.h
> rename to arch/arm/include/asm/arch-exynos4/pwm.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/sromc.h b/arch/arm/include/asm/arch-exynos4/sromc.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/sromc.h
> rename to arch/arm/include/asm/arch-exynos4/sromc.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/sys_proto.h b/arch/arm/include/asm/arch-exynos4/sys_proto.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/sys_proto.h
> rename to arch/arm/include/asm/arch-exynos4/sys_proto.h
> diff --git a/arch/arm/include/asm/arch-s5pc2xx/uart.h b/arch/arm/include/asm/arch-exynos4/uart.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc2xx/uart.h
> rename to arch/arm/include/asm/arch-exynos4/uart.h

How you think about s5pc210 prefixes and defines and variable?

e.g)
arch-s5pc2xx/cpu.h:27:/* S5PC210 */
arch-s5pc2xx/cpu.h:28:#define S5PC210_GPIO_PART3_BASE	0x03860000
arch-s5pc2xx/cpu.h:29:#define S5PC210_PRO_ID		0x10000000
arch-s5pc2xx/cpu.h:30:#define S5PC210_POWER_BASE	0x10020000
arch-s5pc2xx/cpu.h:31:#define S5PC210_SWRESET		0x10020400
arch-s5pc2xx/cpu.h:32:#define S5PC210_CLOCK_BASE	0x10030000
arch-s5pc2xx/cpu.h:33:#define S5PC210_SYSTIMER_BASE	0x10050000
arch-s5pc2xx/cpu.h:34:#define S5PC210_WATCHDOG_BASE	0x10060000
arch-s5pc2xx/cpu.h:35:#define S5PC210_MIU_BASE	0x10600000
arch-s5pc2xx/cpu.h:36:#define S5PC210_DMC0_BASE	0x10400000
arch-s5pc2xx/cpu.h:37:#define S5PC210_DMC1_BASE	0x10410000
arch-s5pc2xx/cpu.h:38:#define S5PC210_GPIO_PART2_BASE	0x11000000
arch-s5pc2xx/cpu.h:39:#define S5PC210_GPIO_PART1_BASE	0x11400000
arch-s5pc2xx/cpu.h:40:#define S5PC210_FIMD_BASE	0x11C00000
arch-s5pc2xx/cpu.h:41:#define S5PC210_USBOTG_BASE	0x12480000
arch-s5pc2xx/cpu.h:42:#define S5PC210_MMC_BASE	0x12510000
arch-s5pc2xx/cpu.h:43:#define S5PC210_SROMC_BASE	0x12570000
arch-s5pc2xx/cpu.h:44:#define S5PC210_USBPHY_BASE	0x125B0000
arch-s5pc2xx/cpu.h:45:#define S5PC210_UART_BASE	0x13800000
arch-s5pc2xx/cpu.h:46:#define S5PC210_ADC_BASE	0x13910000
arch-s5pc2xx/cpu.h:47:#define S5PC210_PWMTIMER_BASE	0x139D0000
arch-s5pc2xx/cpu.h:48:#define S5PC210_MODEM_BASE	0x13A00000
arch-s5pc2xx/cpu.h:63:	s5p_cpu_id = readl(S5PC210_PRO_ID);
arch-s5pc2xx/cpu.h:67:	 * 0xC200: S5PC210 EVT0
arch-s5pc2xx/cpu.h:68:	 * 0xC210: S5PC210 EVT1
arch-s5pc2xx/cpu.h:90:		return S5PC210_##base;				\
arch-s5pc2xx/gpio.h:97:			       S5PC210_GPIO_PART1_BASE)->bank)) \
arch-s5pc2xx/gpio.h:98:	    - S5PC210_GPIO_PART1_BASE) / sizeof(struct
s5p_gpio_bank)) \
arch-s5pc2xx/gpio.h:106:				S5PC210_GPIO_PART2_BASE)->bank)) \
arch-s5pc2xx/gpio.h:107:	    - S5PC210_GPIO_PART2_BASE) /
sizeof(struct s5p_gpio_bank)) \
arch-s5pc2xx/gpio.h:113:		return S5PC210_GPIO_PART1_BASE;
arch-s5pc2xx/gpio.h:115:		return S5PC210_GPIO_PART2_BASE;

arch-s5pc2xx/clock.h:26:struct s5pc210_clock {
arch-s5pc2xx/cpu.h:84:IS_SAMSUNG_TYPE(s5pc210, 0xc210)
arch-s5pc2xx/cpu.h:89:	if (cpu_is_s5pc210())					\
arch-s5pc2xx/gpio.h:35:struct s5pc210_gpio_part1 {
arch-s5pc2xx/gpio.h:54:struct s5pc210_gpio_part2 {
arch-s5pc2xx/gpio.h:78:struct s5pc210_gpio_part3 {
arch-s5pc2xx/gpio.h:95:#define s5pc210_gpio_part1_get_nr(bank, pin) \
arch-s5pc2xx/gpio.h:96:	((((((unsigned int) &(((struct s5pc210_gpio_part1 *) \
arch-s5pc2xx/gpio.h:101:#define GPIO_PART1_MAX ((sizeof(struct
s5pc210_gpio_part1) \
arch-s5pc2xx/gpio.h:104:#define s5pc210_gpio_part2_get_nr(bank, pin) \
arch-s5pc2xx/gpio.h:105:	(((((((unsigned int) &(((struct s5pc210_gpio_part2 *) \

Similarly, you can found such things in board files and config files.
Please modify them also.

Thanks
Minkyu Kang.

Patch

diff --git a/Makefile b/Makefile
index 294c762..1d7721c 100644
--- a/Makefile
+++ b/Makefile
@@ -301,10 +301,10 @@  LIBS += $(CPUDIR)/omap-common/libomap-common.o
 endif
 
 ifeq ($(SOC),s5pc1xx)
-LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
+LIBS += $(CPUDIR)/exynos-common/libexynos-common.o
 endif
-ifeq ($(SOC),s5pc2xx)
-LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
+ifeq ($(SOC),exynos4)
+LIBS += $(CPUDIR)/exynos-common/libexynos-common.o
 endif
 
 LIBS := $(addprefix $(obj),$(sort $(LIBS)))
diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/exynos-common/Makefile
similarity index 97%
rename from arch/arm/cpu/armv7/s5p-common/Makefile
rename to arch/arm/cpu/armv7/exynos-common/Makefile
index 1705399..3c2aef8 100644
--- a/arch/arm/cpu/armv7/s5p-common/Makefile
+++ b/arch/arm/cpu/armv7/exynos-common/Makefile
@@ -23,7 +23,7 @@ 
 
 include $(TOPDIR)/config.mk
 
-LIB	= $(obj)libs5p-common.o
+LIB	= $(obj)libexynos-common.o
 
 COBJS-y		+= cpu_info.o
 COBJS-y		+= timer.o
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/exynos-common/cpu_info.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/cpu_info.c
rename to arch/arm/cpu/armv7/exynos-common/cpu_info.c
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/exynos-common/pwm.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/pwm.c
rename to arch/arm/cpu/armv7/exynos-common/pwm.c
diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/exynos-common/sromc.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/sromc.c
rename to arch/arm/cpu/armv7/exynos-common/sromc.c
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/exynos-common/timer.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/timer.c
rename to arch/arm/cpu/armv7/exynos-common/timer.c
diff --git a/arch/arm/cpu/armv7/s5pc2xx/Makefile b/arch/arm/cpu/armv7/exynos4/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/s5pc2xx/Makefile
rename to arch/arm/cpu/armv7/exynos4/Makefile
diff --git a/arch/arm/cpu/armv7/s5pc2xx/clock.c b/arch/arm/cpu/armv7/exynos4/clock.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5pc2xx/clock.c
rename to arch/arm/cpu/armv7/exynos4/clock.c
diff --git a/arch/arm/cpu/armv7/s5pc2xx/soc.c b/arch/arm/cpu/armv7/exynos4/soc.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5pc2xx/soc.c
rename to arch/arm/cpu/armv7/exynos4/soc.c
diff --git a/arch/arm/include/asm/arch-s5pc2xx/adc.h b/arch/arm/include/asm/arch-exynos4/adc.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/adc.h
rename to arch/arm/include/asm/arch-exynos4/adc.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/clk.h b/arch/arm/include/asm/arch-exynos4/clk.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/clk.h
rename to arch/arm/include/asm/arch-exynos4/clk.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/clock.h b/arch/arm/include/asm/arch-exynos4/clock.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/clock.h
rename to arch/arm/include/asm/arch-exynos4/clock.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-exynos4/cpu.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/cpu.h
rename to arch/arm/include/asm/arch-exynos4/cpu.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/gpio.h b/arch/arm/include/asm/arch-exynos4/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/gpio.h
rename to arch/arm/include/asm/arch-exynos4/gpio.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/mmc.h b/arch/arm/include/asm/arch-exynos4/mmc.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/mmc.h
rename to arch/arm/include/asm/arch-exynos4/mmc.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-exynos4/pwm.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/pwm.h
rename to arch/arm/include/asm/arch-exynos4/pwm.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/sromc.h b/arch/arm/include/asm/arch-exynos4/sromc.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/sromc.h
rename to arch/arm/include/asm/arch-exynos4/sromc.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/sys_proto.h b/arch/arm/include/asm/arch-exynos4/sys_proto.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/sys_proto.h
rename to arch/arm/include/asm/arch-exynos4/sys_proto.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/uart.h b/arch/arm/include/asm/arch-exynos4/uart.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/uart.h
rename to arch/arm/include/asm/arch-exynos4/uart.h
diff --git a/boards.cfg b/boards.cfg
index 8b7a03b..c7d5377 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -195,9 +195,9 @@  omap4_panda                  arm         armv7       panda               ti
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
 s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
 smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
-origen			     arm	 armv7	     origen		 samsung	s5pc2xx
-s5pc210_universal            arm         armv7       universal_c210      samsung        s5pc2xx
-smdkv310		     arm	 armv7	     smdkv310		 samsung	s5pc2xx
+origen			     arm	 armv7	     origen		 samsung	exynos4
+s5pc210_universal            arm         armv7       universal_c210      samsung        exynos4
+smdkv310		     arm	 armv7	     smdkv310		 samsung	exynos4
 harmony                      arm         armv7       harmony             nvidia         tegra2
 seaboard                     arm         armv7       seaboard            nvidia         tegra2
 u8500_href                   arm         armv7       u8500               st-ericsson    u8500