diff options
author | Chander Kashyap <chander.kashyap@linaro.org> | 2011-12-06 23:34:12 +0000 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-12-09 17:30:09 +0100 |
commit | 393cb36199d337c8554cc8dfc853f5f405f4742b (patch) | |
tree | 2f33a5043d10915372d2ce3f0a76c1372d74a966 /arch/arm | |
parent | 7f8c070ff99aadf153cd90cd0ec1987e8c2ebbe1 (diff) | |
download | u-boot-imx-393cb36199d337c8554cc8dfc853f5f405f4742b.zip u-boot-imx-393cb36199d337c8554cc8dfc853f5f405f4742b.tar.gz u-boot-imx-393cb36199d337c8554cc8dfc853f5f405f4742b.tar.bz2 |
S5PC2XX: Rename S5pc2XX to exynos
As per new naming convention for Samsung SoC's, all Cortex-A9 and Cortex-A15
based SoC's will be classified under the name Exynos. Cortex-A9 and Cortex-A15
based SoC's will be sub-classified as Exynos4 and Exynos5 respectively.
In order to better adapt and reuse code across various upcoming Samsung Exynos
based boards, all uses of s5pc210 prefix/suffix/directory-names are renamed in
this patch. s5pc210 is renamed as exynos4210 and S5PC210/s5pc210 suffix/prefix
are renamed as exynos4/EXYNOS4.
Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/armv7/exynos/Makefile (renamed from arch/arm/cpu/armv7/s5pc2xx/Makefile) | 0 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/exynos/clock.c (renamed from arch/arm/cpu/armv7/s5pc2xx/clock.c) | 50 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/exynos/soc.c (renamed from arch/arm/cpu/armv7/s5pc2xx/soc.c) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/adc.h (renamed from arch/arm/include/asm/arch-s5pc2xx/adc.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/clk.h (renamed from arch/arm/include/asm/arch-s5pc2xx/clk.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/clock.h (renamed from arch/arm/include/asm/arch-s5pc2xx/clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/cpu.h (renamed from arch/arm/include/asm/arch-s5pc2xx/cpu.h) | 64 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/gpio.h (renamed from arch/arm/include/asm/arch-s5pc2xx/gpio.h) | 28 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/mmc.h (renamed from arch/arm/include/asm/arch-s5pc2xx/mmc.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/pwm.h (renamed from arch/arm/include/asm/arch-s5pc2xx/pwm.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/sromc.h (renamed from arch/arm/include/asm/arch-s5pc2xx/sromc.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/sys_proto.h (renamed from arch/arm/include/asm/arch-s5pc2xx/sys_proto.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-exynos/uart.h (renamed from arch/arm/include/asm/arch-s5pc2xx/uart.h) | 0 |
13 files changed, 72 insertions, 72 deletions
diff --git a/arch/arm/cpu/armv7/s5pc2xx/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 124c380..124c380 100644 --- a/arch/arm/cpu/armv7/s5pc2xx/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile diff --git a/arch/arm/cpu/armv7/s5pc2xx/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index 5ecd475..64de262 100644 --- a/arch/arm/cpu/armv7/s5pc2xx/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -30,11 +30,11 @@ #define CONFIG_SYS_CLK_FREQ_C210 24000000 #endif -/* s5pc210: return pll clock frequency */ -static unsigned long s5pc210_get_pll_clk(int pllreg) +/* exynos4: return pll clock frequency */ +static unsigned long exynos4_get_pll_clk(int pllreg) { - struct s5pc210_clock *clk = - (struct s5pc210_clock *)samsung_get_base_clock(); + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); unsigned long r, m, p, s, k = 0, mask, fout; unsigned int freq; @@ -96,11 +96,11 @@ static unsigned long s5pc210_get_pll_clk(int pllreg) return fout; } -/* s5pc210: return ARM clock frequency */ -static unsigned long s5pc210_get_arm_clk(void) +/* exynos4: return ARM clock frequency */ +static unsigned long exynos4_get_arm_clk(void) { - struct s5pc210_clock *clk = - (struct s5pc210_clock *)samsung_get_base_clock(); + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); unsigned long div; unsigned long dout_apll; unsigned int apll_ratio; @@ -115,11 +115,11 @@ static unsigned long s5pc210_get_arm_clk(void) return dout_apll; } -/* s5pc210: return pwm clock frequency */ -static unsigned long s5pc210_get_pwm_clk(void) +/* exynos4: return pwm clock frequency */ +static unsigned long exynos4_get_pwm_clk(void) { - struct s5pc210_clock *clk = - (struct s5pc210_clock *)samsung_get_base_clock(); + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); unsigned long pclk, sclk; unsigned int sel; unsigned int ratio; @@ -158,11 +158,11 @@ static unsigned long s5pc210_get_pwm_clk(void) return pclk; } -/* s5pc210: return uart clock frequency */ -static unsigned long s5pc210_get_uart_clk(int dev_index) +/* exynos4: return uart clock frequency */ +static unsigned long exynos4_get_uart_clk(int dev_index) { - struct s5pc210_clock *clk = - (struct s5pc210_clock *)samsung_get_base_clock(); + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); unsigned long uclk, sclk; unsigned int sel; unsigned int ratio; @@ -205,11 +205,11 @@ static unsigned long s5pc210_get_uart_clk(int dev_index) return uclk; } -/* s5pc210: set the mmc clock */ -static void s5pc210_set_mmc_clk(int dev_index, unsigned int div) +/* exynos4: set the mmc clock */ +static void exynos4_set_mmc_clk(int dev_index, unsigned int div) { - struct s5pc210_clock *clk = - (struct s5pc210_clock *)samsung_get_base_clock(); + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); unsigned int addr; unsigned int val; @@ -234,25 +234,25 @@ static void s5pc210_set_mmc_clk(int dev_index, unsigned int div) unsigned long get_pll_clk(int pllreg) { - return s5pc210_get_pll_clk(pllreg); + return exynos4_get_pll_clk(pllreg); } unsigned long get_arm_clk(void) { - return s5pc210_get_arm_clk(); + return exynos4_get_arm_clk(); } unsigned long get_pwm_clk(void) { - return s5pc210_get_pwm_clk(); + return exynos4_get_pwm_clk(); } unsigned long get_uart_clk(int dev_index) { - return s5pc210_get_uart_clk(dev_index); + return exynos4_get_uart_clk(dev_index); } void set_mmc_clk(int dev_index, unsigned int div) { - s5pc210_set_mmc_clk(dev_index, div); + exynos4_set_mmc_clk(dev_index, div); } diff --git a/arch/arm/cpu/armv7/s5pc2xx/soc.c b/arch/arm/cpu/armv7/exynos/soc.c index dcfcec2..dcfcec2 100644 --- a/arch/arm/cpu/armv7/s5pc2xx/soc.c +++ b/arch/arm/cpu/armv7/exynos/soc.c diff --git a/arch/arm/include/asm/arch-s5pc2xx/adc.h b/arch/arm/include/asm/arch-exynos/adc.h index c0aa580..c0aa580 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/adc.h +++ b/arch/arm/include/asm/arch-exynos/adc.h diff --git a/arch/arm/include/asm/arch-s5pc2xx/clk.h b/arch/arm/include/asm/arch-exynos/clk.h index ff0f641..ff0f641 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/clk.h +++ b/arch/arm/include/asm/arch-exynos/clk.h diff --git a/arch/arm/include/asm/arch-s5pc2xx/clock.h b/arch/arm/include/asm/arch-exynos/clock.h index 0ff8cf8..483c911 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/clock.h +++ b/arch/arm/include/asm/arch-exynos/clock.h @@ -23,7 +23,7 @@ #define __ASM_ARM_ARCH_CLOCK_H_ #ifndef __ASSEMBLY__ -struct s5pc210_clock { +struct exynos4_clock { unsigned char res1[0x4200]; unsigned int src_leftbus; unsigned char res2[0x1fc]; diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index f9015c7..4464d27 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -19,33 +19,33 @@ * */ -#ifndef _S5PC2XX_CPU_H -#define _S5PC2XX_CPU_H +#ifndef _EXYNOS4_CPU_H +#define _EXYNOS4_CPU_H -#define S5PC2XX_ADDR_BASE 0x10000000 +#define EXYNOS4_ADDR_BASE 0x10000000 -/* S5PC210 */ -#define S5PC210_GPIO_PART3_BASE 0x03860000 -#define S5PC210_PRO_ID 0x10000000 -#define S5PC210_POWER_BASE 0x10020000 -#define S5PC210_SWRESET 0x10020400 -#define S5PC210_CLOCK_BASE 0x10030000 -#define S5PC210_SYSTIMER_BASE 0x10050000 -#define S5PC210_WATCHDOG_BASE 0x10060000 -#define S5PC210_MIU_BASE 0x10600000 -#define S5PC210_DMC0_BASE 0x10400000 -#define S5PC210_DMC1_BASE 0x10410000 -#define S5PC210_GPIO_PART2_BASE 0x11000000 -#define S5PC210_GPIO_PART1_BASE 0x11400000 -#define S5PC210_FIMD_BASE 0x11C00000 -#define S5PC210_USBOTG_BASE 0x12480000 -#define S5PC210_MMC_BASE 0x12510000 -#define S5PC210_SROMC_BASE 0x12570000 -#define S5PC210_USBPHY_BASE 0x125B0000 -#define S5PC210_UART_BASE 0x13800000 -#define S5PC210_ADC_BASE 0x13910000 -#define S5PC210_PWMTIMER_BASE 0x139D0000 -#define S5PC210_MODEM_BASE 0x13A00000 +/* EXYNOS4 */ +#define EXYNOS4_GPIO_PART3_BASE 0x03860000 +#define EXYNOS4_PRO_ID 0x10000000 +#define EXYNOS4_POWER_BASE 0x10020000 +#define EXYNOS4_SWRESET 0x10020400 +#define EXYNOS4_CLOCK_BASE 0x10030000 +#define EXYNOS4_SYSTIMER_BASE 0x10050000 +#define EXYNOS4_WATCHDOG_BASE 0x10060000 +#define EXYNOS4_MIU_BASE 0x10600000 +#define EXYNOS4_DMC0_BASE 0x10400000 +#define EXYNOS4_DMC1_BASE 0x10410000 +#define EXYNOS4_GPIO_PART2_BASE 0x11000000 +#define EXYNOS4_GPIO_PART1_BASE 0x11400000 +#define EXYNOS4_FIMD_BASE 0x11C00000 +#define EXYNOS4_USBOTG_BASE 0x12480000 +#define EXYNOS4_MMC_BASE 0x12510000 +#define EXYNOS4_SROMC_BASE 0x12570000 +#define EXYNOS4_USBPHY_BASE 0x125B0000 +#define EXYNOS4_UART_BASE 0x13800000 +#define EXYNOS4_ADC_BASE 0x13910000 +#define EXYNOS4_PWMTIMER_BASE 0x139D0000 +#define EXYNOS4_MODEM_BASE 0x13A00000 #ifndef __ASSEMBLY__ #include <asm/io.h> @@ -60,12 +60,12 @@ static inline int s5p_get_cpu_rev(void) static inline void s5p_set_cpu_id(void) { - s5p_cpu_id = readl(S5PC210_PRO_ID); + s5p_cpu_id = readl(EXYNOS4_PRO_ID); s5p_cpu_id = (0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12)); /* - * 0xC200: S5PC210 EVT0 - * 0xC210: S5PC210 EVT1 + * 0xC200: EXYNOS4210 EVT0 + * 0xC210: EXYNOS4210 EVT1 */ if (s5p_cpu_id == 0xC200) { s5p_cpu_id |= 0x10; @@ -81,13 +81,13 @@ static inline int cpu_is_##type(void) \ return s5p_cpu_id == id ? 1 : 0; \ } -IS_SAMSUNG_TYPE(s5pc210, 0xc210) +IS_SAMSUNG_TYPE(exynos4, 0xc210) #define SAMSUNG_BASE(device, base) \ static inline unsigned int samsung_get_base_##device(void) \ { \ - if (cpu_is_s5pc210()) \ - return S5PC210_##base; \ + if (cpu_is_exynos4()) \ + return EXYNOS4_##base; \ else \ return 0; \ } @@ -110,4 +110,4 @@ SAMSUNG_BASE(usb_otg, USBOTG_BASE) SAMSUNG_BASE(watchdog, WATCHDOG_BASE) #endif -#endif /* _S5PC2XX_CPU_H */ +#endif /* _EXYNOS4_CPU_H */ diff --git a/arch/arm/include/asm/arch-s5pc2xx/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h index 8be620c..9863a12 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/gpio.h +++ b/arch/arm/include/asm/arch-exynos/gpio.h @@ -32,7 +32,7 @@ struct s5p_gpio_bank { unsigned char res1[8]; }; -struct s5pc210_gpio_part1 { +struct exynos4_gpio_part1 { struct s5p_gpio_bank a0; struct s5p_gpio_bank a1; struct s5p_gpio_bank b; @@ -51,7 +51,7 @@ struct s5pc210_gpio_part1 { struct s5p_gpio_bank f3; }; -struct s5pc210_gpio_part2 { +struct exynos4_gpio_part2 { struct s5p_gpio_bank j0; struct s5p_gpio_bank j1; struct s5p_gpio_bank k0; @@ -75,7 +75,7 @@ struct s5pc210_gpio_part2 { struct s5p_gpio_bank x3; }; -struct s5pc210_gpio_part3 { +struct exynos4_gpio_part3 { struct s5p_gpio_bank z; }; @@ -92,27 +92,27 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode); /* GPIO pins per bank */ #define GPIO_PER_BANK 8 -#define s5pc210_gpio_part1_get_nr(bank, pin) \ - ((((((unsigned int) &(((struct s5pc210_gpio_part1 *) \ - S5PC210_GPIO_PART1_BASE)->bank)) \ - - S5PC210_GPIO_PART1_BASE) / sizeof(struct s5p_gpio_bank)) \ +#define exynos4_gpio_part1_get_nr(bank, pin) \ + ((((((unsigned int) &(((struct exynos4_gpio_part1 *) \ + EXYNOS4_GPIO_PART1_BASE)->bank)) \ + - EXYNOS4_GPIO_PART1_BASE) / sizeof(struct s5p_gpio_bank)) \ * GPIO_PER_BANK) + pin) -#define GPIO_PART1_MAX ((sizeof(struct s5pc210_gpio_part1) \ +#define GPIO_PART1_MAX ((sizeof(struct exynos4_gpio_part1) \ / sizeof(struct s5p_gpio_bank)) * GPIO_PER_BANK) -#define s5pc210_gpio_part2_get_nr(bank, pin) \ - (((((((unsigned int) &(((struct s5pc210_gpio_part2 *) \ - S5PC210_GPIO_PART2_BASE)->bank)) \ - - S5PC210_GPIO_PART2_BASE) / sizeof(struct s5p_gpio_bank)) \ +#define exynos4_gpio_part2_get_nr(bank, pin) \ + (((((((unsigned int) &(((struct exynos4_gpio_part2 *) \ + EXYNOS4_GPIO_PART2_BASE)->bank)) \ + - EXYNOS4_GPIO_PART2_BASE) / sizeof(struct s5p_gpio_bank)) \ * GPIO_PER_BANK) + pin) + GPIO_PART1_MAX) static inline unsigned int s5p_gpio_base(int nr) { if (nr < GPIO_PART1_MAX) - return S5PC210_GPIO_PART1_BASE; + return EXYNOS4_GPIO_PART1_BASE; else - return S5PC210_GPIO_PART2_BASE; + return EXYNOS4_GPIO_PART2_BASE; return 0; } diff --git a/arch/arm/include/asm/arch-s5pc2xx/mmc.h b/arch/arm/include/asm/arch-exynos/mmc.h index 30f82b8..30f82b8 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/mmc.h +++ b/arch/arm/include/asm/arch-exynos/mmc.h diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-exynos/pwm.h index d0cf3cb..d0cf3cb 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/pwm.h +++ b/arch/arm/include/asm/arch-exynos/pwm.h diff --git a/arch/arm/include/asm/arch-s5pc2xx/sromc.h b/arch/arm/include/asm/arch-exynos/sromc.h index f616bcb..f616bcb 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/sromc.h +++ b/arch/arm/include/asm/arch-exynos/sromc.h diff --git a/arch/arm/include/asm/arch-s5pc2xx/sys_proto.h b/arch/arm/include/asm/arch-exynos/sys_proto.h index 11f1636..11f1636 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/sys_proto.h +++ b/arch/arm/include/asm/arch-exynos/sys_proto.h diff --git a/arch/arm/include/asm/arch-s5pc2xx/uart.h b/arch/arm/include/asm/arch-exynos/uart.h index 6cc68df..6cc68df 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/uart.h +++ b/arch/arm/include/asm/arch-exynos/uart.h |