LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: uniphier: rename function names ph1_* to uniphier_* 

Eliminate the "ph1"_ prefixes from function names because "uniphier_"
describes the SoC familiy better.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-03-30 20:17:02 +09:00
parent a75ecfc2a6
commit 5b66006646
51 changed files with 190 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/mach-uniphier/arm32/debug_ll.S
View File

@ -29,7 +29,7 @@ ENTRY(debug_ll_init)
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
#define UNIPHIER_SLD3_UART_CLK 36864000 #define UNIPHIER_SLD3_UART_CLK 36864000
cmp r1, #0x25 cmp r1, #0x25
bne ph1_sld3_end bne sld3_end
sg_set_pinsel 64, 1, 4, 4, r0, r1 @ TXD0 -> TXD0 sg_set_pinsel 64, 1, 4, 4, r0, r1 @ TXD0 -> TXD0
@ -45,12 +45,12 @@ ENTRY(debug_ll_init)
ldr r3, =DIV_ROUND(UNIPHIER_SLD3_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_SLD3_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
ph1_sld3_end: sld3_end:
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) #if defined(CONFIG_ARCH_UNIPHIER_LD4)
#define UNIPHIER_LD4_UART_CLK 36864000 #define UNIPHIER_LD4_UART_CLK 36864000
cmp r1, #0x26 cmp r1, #0x26
bne ph1_ld4_end bne ld4_end
ldr r0, =SG_IECTRL ldr r0, =SG_IECTRL
ldr r1, [r0] ldr r1, [r0]
@ -62,12 +62,12 @@ ph1_sld3_end:
ldr r3, =DIV_ROUND(UNIPHIER_LD4_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_LD4_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
ph1_ld4_end: ld4_end:
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO4) #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
#define UNIPHIER_PRO4_UART_CLK 73728000 #define UNIPHIER_PRO4_UART_CLK 73728000
cmp r1, #0x28 cmp r1, #0x28
bne ph1_pro4_end bne pro4_end
sg_set_pinsel 128, 0, 4, 8, r0, r1 @ TXD0 -> TXD0 sg_set_pinsel 128, 0, 4, 8, r0, r1 @ TXD0 -> TXD0
@ -83,12 +83,12 @@ ph1_ld4_end:
ldr r3, =DIV_ROUND(UNIPHIER_PRO4_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_PRO4_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
ph1_pro4_end: pro4_end:
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8) #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
#define UNIPHIER_SLD8_UART_CLK 80000000 #define UNIPHIER_SLD8_UART_CLK 80000000
cmp r1, #0x29 cmp r1, #0x29
bne ph1_sld8_end bne sld8_end
ldr r0, =SG_IECTRL ldr r0, =SG_IECTRL
ldr r1, [r0] ldr r1, [r0]
@ -100,12 +100,12 @@ ph1_pro4_end:
ldr r3, =DIV_ROUND(UNIPHIER_SLD8_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_SLD8_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
ph1_sld8_end: sld8_end:
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
#define UNIPHIER_PRO5_UART_CLK 73728000 #define UNIPHIER_PRO5_UART_CLK 73728000
cmp r1, #0x2A cmp r1, #0x2A
bne ph1_pro5_end bne pro5_end
sg_set_pinsel 47, 0, 4, 8, r0, r1 @ TXD0 -> TXD0 sg_set_pinsel 47, 0, 4, 8, r0, r1 @ TXD0 -> TXD0
sg_set_pinsel 49, 0, 4, 8, r0, r1 @ TXD1 -> TXD1 sg_set_pinsel 49, 0, 4, 8, r0, r1 @ TXD1 -> TXD1
@ -124,12 +124,12 @@ ph1_sld8_end:
ldr r3, =DIV_ROUND(UNIPHIER_PRO5_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_PRO5_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
ph1_pro5_end: pro5_end:
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
#define UNIPHIER_PXS2_UART_CLK 88900000 #define UNIPHIER_PXS2_UART_CLK 88900000
cmp r1, #0x2E cmp r1, #0x2E
bne proxstream2_end bne pxs2_end
ldr r0, =SG_IECTRL ldr r0, =SG_IECTRL
ldr r1, [r0] ldr r1, [r0]
@ -149,12 +149,12 @@ ph1_pro5_end:
ldr r3, =DIV_ROUND(UNIPHIER_PXS2_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_PXS2_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
proxstream2_end: pxs2_end:
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
#define UNIPHIER_LD6B_UART_CLK 88900000 #define UNIPHIER_LD6B_UART_CLK 88900000
cmp r1, #0x2F cmp r1, #0x2F
bne ph1_ld6b_end bne ld6b_end
ldr r0, =SG_IECTRL ldr r0, =SG_IECTRL
ldr r1, [r0] ldr r1, [r0]
@ -173,7 +173,7 @@ proxstream2_end:
ldr r3, =DIV_ROUND(UNIPHIER_LD6B_UART_CLK, 16 * BAUDRATE) ldr r3, =DIV_ROUND(UNIPHIER_LD6B_UART_CLK, 16 * BAUDRATE)
b init_uart b init_uart
ph1_ld6b_end: ld6b_end:
#endif #endif
mov pc, lr mov pc, lr

2
arch/arm/mach-uniphier/bcu/bcu-ld4.c
View File

@ -11,7 +11,7 @@
#define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x)) #define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x))
int ph1_ld4_bcu_init(const struct uniphier_board_data *bd) int uniphier_ld4_bcu_init(const struct uniphier_board_data *bd)
{ {
int shift; int shift;

2
arch/arm/mach-uniphier/bcu/bcu-sld3.c
View File

@ -11,7 +11,7 @@
#define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x)) #define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x))
int ph1_sld3_bcu_init(const struct uniphier_board_data *bd) int uniphier_sld3_bcu_init(const struct uniphier_board_data *bd)
{ {
int shift; int shift;

28
arch/arm/mach-uniphier/board_early_init_f.c
View File

@ -15,51 +15,51 @@ int board_early_init_f(void)
switch (uniphier_get_soc_type()) { switch (uniphier_get_soc_type()) {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
case SOC_UNIPHIER_SLD3: case SOC_UNIPHIER_SLD3:
ph1_sld3_pin_init(); uniphier_sld3_pin_init();
led_puts("U1"); led_puts("U1");
ph1_ld4_clk_init(); uniphier_ld4_clk_init();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) #if defined(CONFIG_ARCH_UNIPHIER_LD4)
case SOC_UNIPHIER_LD4: case SOC_UNIPHIER_LD4:
ph1_ld4_pin_init(); uniphier_ld4_pin_init();
led_puts("U1"); led_puts("U1");
ph1_ld4_clk_init(); uniphier_ld4_clk_init();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO4) #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
case SOC_UNIPHIER_PRO4: case SOC_UNIPHIER_PRO4:
ph1_pro4_pin_init(); uniphier_pro4_pin_init();
led_puts("U1"); led_puts("U1");
ph1_pro4_clk_init(); uniphier_pro4_clk_init();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8) #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
case SOC_UNIPHIER_SLD8: case SOC_UNIPHIER_SLD8:
ph1_sld8_pin_init(); uniphier_sld8_pin_init();
led_puts("U1"); led_puts("U1");
ph1_ld4_clk_init(); uniphier_ld4_clk_init();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
case SOC_UNIPHIER_PRO5: case SOC_UNIPHIER_PRO5:
ph1_pro5_pin_init(); uniphier_pro5_pin_init();
led_puts("U1"); led_puts("U1");
ph1_pro5_clk_init(); uniphier_pro5_clk_init();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
case SOC_UNIPHIER_PXS2: case SOC_UNIPHIER_PXS2:
proxstream2_pin_init(); uniphier_pxs2_pin_init();
led_puts("U1"); led_puts("U1");
proxstream2_clk_init(); uniphier_pxs2_clk_init();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
case SOC_UNIPHIER_LD6B: case SOC_UNIPHIER_LD6B:
ph1_ld6b_pin_init(); uniphier_ld6b_pin_init();
led_puts("U1"); led_puts("U1");
proxstream2_clk_init(); uniphier_pxs2_clk_init();
break; break;
#endif #endif
default: default:

34
arch/arm/mach-uniphier/boards.c
View File

@ -13,7 +13,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
static const struct uniphier_board_data ph1_sld3_data = { static const struct uniphier_board_data uniphier_sld3_data = {
.dram_freq = 1600, .dram_freq = 1600,
.dram_nr_ch = 3, .dram_nr_ch = 3,
.dram_ch[0] = { .dram_ch[0] = {
@ -35,7 +35,7 @@ static const struct uniphier_board_data ph1_sld3_data = {
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) #if defined(CONFIG_ARCH_UNIPHIER_LD4)
static const struct uniphier_board_data ph1_ld4_data = { static const struct uniphier_board_data uniphier_ld4_data = {
.dram_freq = 1600, .dram_freq = 1600,
.dram_nr_ch = 2, .dram_nr_ch = 2,
.dram_ddr3plus = true, .dram_ddr3plus = true,
@ -54,7 +54,7 @@ static const struct uniphier_board_data ph1_ld4_data = {
#if defined(CONFIG_ARCH_UNIPHIER_PRO4) #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
/* 1GB RAM board */ /* 1GB RAM board */
static const struct uniphier_board_data ph1_pro4_data = { static const struct uniphier_board_data uniphier_pro4_data = {
.dram_freq = 1600, .dram_freq = 1600,
.dram_nr_ch = 2, .dram_nr_ch = 2,
.dram_ch[0] = { .dram_ch[0] = {
@ -70,7 +70,7 @@ static const struct uniphier_board_data ph1_pro4_data = {
}; };
/* 2GB RAM board */ /* 2GB RAM board */
static const struct uniphier_board_data ph1_pro4_2g_data = { static const struct uniphier_board_data uniphier_pro4_2g_data = {
.dram_freq = 1600, .dram_freq = 1600,
.dram_nr_ch = 2, .dram_nr_ch = 2,
.dram_ch[0] = { .dram_ch[0] = {
@ -87,7 +87,7 @@ static const struct uniphier_board_data ph1_pro4_2g_data = {
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8) #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
static const struct uniphier_board_data ph1_sld8_data = { static const struct uniphier_board_data uniphier_sld8_data = {
.dram_freq = 1333, .dram_freq = 1333,
.dram_nr_ch = 2, .dram_nr_ch = 2,
.dram_ddr3plus = true, .dram_ddr3plus = true,
@ -105,7 +105,7 @@ static const struct uniphier_board_data ph1_sld8_data = {
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
static const struct uniphier_board_data ph1_pro5_data = { static const struct uniphier_board_data uniphier_pro5_data = {
.dram_freq = 1866, .dram_freq = 1866,
.dram_nr_ch = 2, .dram_nr_ch = 2,
.dram_ch[0] = { .dram_ch[0] = {
@ -122,7 +122,7 @@ static const struct uniphier_board_data ph1_pro5_data = {
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
static const struct uniphier_board_data proxstream2_data = { static const struct uniphier_board_data uniphier_pxs2_data = {
.dram_freq = 2133, .dram_freq = 2133,
.dram_nr_ch = 3, .dram_nr_ch = 3,
.dram_ch[0] = { .dram_ch[0] = {
@ -144,7 +144,7 @@ static const struct uniphier_board_data proxstream2_data = {
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
static const struct uniphier_board_data ph1_ld6b_data = { static const struct uniphier_board_data uniphier_ld6b_data = {
.dram_freq = 1866, .dram_freq = 1866,
.dram_nr_ch = 3, .dram_nr_ch = 3,
.dram_ch[0] = { .dram_ch[0] = {
@ -172,27 +172,27 @@ struct uniphier_board_id {
static const struct uniphier_board_id uniphier_boards[] = { static const struct uniphier_board_id uniphier_boards[] = {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
{ "socionext,ph1-sld3", &ph1_sld3_data, }, { "socionext,ph1-sld3", &uniphier_sld3_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) #if defined(CONFIG_ARCH_UNIPHIER_LD4)
{ "socionext,ph1-ld4", &ph1_ld4_data, }, { "socionext,ph1-ld4", &uniphier_ld4_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO4) #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
{ "socionext,ph1-pro4-ace", &ph1_pro4_2g_data, }, { "socionext,ph1-pro4-ace", &uniphier_pro4_2g_data, },
{ "socionext,ph1-pro4-sanji", &ph1_pro4_2g_data, }, { "socionext,ph1-pro4-sanji", &uniphier_pro4_2g_data, },
{ "socionext,ph1-pro4", &ph1_pro4_data, }, { "socionext,ph1-pro4", &uniphier_pro4_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8) #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
{ "socionext,ph1-sld8", &ph1_sld8_data, }, { "socionext,ph1-sld8", &uniphier_sld8_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
{ "socionext,ph1-pro5", &ph1_pro5_data, }, { "socionext,ph1-pro5", &uniphier_pro5_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
{ "socionext,proxstream2", &proxstream2_data, }, { "socionext,proxstream2", &uniphier_pxs2_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
{ "socionext,ph1-ld6b", &ph1_ld6b_data, }, { "socionext,ph1-ld6b", &uniphier_ld6b_data, },
#endif #endif
}; };

16
arch/arm/mach-uniphier/boot-mode/boot-device.h
View File

@ -12,15 +12,15 @@ struct boot_device_info {
char *info; char *info;
}; };
u32 ph1_sld3_boot_device(void); u32 uniphier_sld3_boot_device(void);
u32 ph1_ld4_boot_device(void); u32 uniphier_ld4_boot_device(void);
u32 ph1_pro5_boot_device(void); u32 uniphier_pro5_boot_device(void);
u32 proxstream2_boot_device(void); u32 uniphier_pxs2_boot_device(void);
void ph1_sld3_boot_mode_show(void); void uniphier_sld3_boot_mode_show(void);
void ph1_ld4_boot_mode_show(void); void uniphier_ld4_boot_mode_show(void);
void ph1_pro5_boot_mode_show(void); void uniphier_pro5_boot_mode_show(void);
void proxstream2_boot_mode_show(void); void uniphier_pxs2_boot_mode_show(void);
u32 spl_boot_device_raw(void); u32 spl_boot_device_raw(void);

4
arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c
View File

@ -51,7 +51,7 @@ static int get_boot_mode_sel(void)
return (readl(SG_PINMON0) >> 1) & 0x1f; return (readl(SG_PINMON0) >> 1) & 0x1f;
} }
u32 ph1_ld4_boot_device(void) u32 uniphier_ld4_boot_device(void)
{ {
int boot_mode; int boot_mode;
@ -60,7 +60,7 @@ u32 ph1_ld4_boot_device(void)
return boot_device_table[boot_mode].type; return boot_device_table[boot_mode].type;
} }
void ph1_ld4_boot_mode_show(void) void uniphier_ld4_boot_mode_show(void)
{ {
int mode_sel, i; int mode_sel, i;

4
arch/arm/mach-uniphier/boot-mode/boot-mode-pro5.c
View File

@ -52,7 +52,7 @@ static int get_boot_mode_sel(void)
return (readl(SG_PINMON0) >> 1) & 0x1f; return (readl(SG_PINMON0) >> 1) & 0x1f;
} }
u32 ph1_pro5_boot_device(void) u32 uniphier_pro5_boot_device(void)
{ {
int boot_mode; int boot_mode;
@ -61,7 +61,7 @@ u32 ph1_pro5_boot_device(void)
return boot_device_table[boot_mode].type; return boot_device_table[boot_mode].type;
} }
void ph1_pro5_boot_mode_show(void) void uniphier_pro5_boot_mode_show(void)
{ {
int mode_sel, i; int mode_sel, i;

4
arch/arm/mach-uniphier/boot-mode/boot-mode-pxs2.c
View File

@ -51,7 +51,7 @@ static int get_boot_mode_sel(void)
return (readl(SG_PINMON0) >> 1) & 0x1f; return (readl(SG_PINMON0) >> 1) & 0x1f;
} }
u32 proxstream2_boot_device(void) u32 uniphier_pxs2_boot_device(void)
{ {
int boot_mode; int boot_mode;
@ -63,7 +63,7 @@ u32 proxstream2_boot_device(void)
return boot_device_table[boot_mode].type; return boot_device_table[boot_mode].type;
} }
void proxstream2_boot_mode_show(void) void uniphier_pxs2_boot_mode_show(void)
{ {
int mode_sel, i; int mode_sel, i;

4
arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c
View File

@ -83,7 +83,7 @@ static int get_boot_mode_sel(void)
return readl(SG_PINMON0) & 0x3f; return readl(SG_PINMON0) & 0x3f;
} }
u32 ph1_sld3_boot_device(void) u32 uniphier_sld3_boot_device(void)
{ {
int boot_mode; int boot_mode;
@ -92,7 +92,7 @@ u32 ph1_sld3_boot_device(void)
return boot_device_table[boot_mode].type; return boot_device_table[boot_mode].type;
} }
void ph1_sld3_boot_mode_show(void) void uniphier_sld3_boot_mode_show(void)
{ {
int mode_sel, i; int mode_sel, i;

8
arch/arm/mach-uniphier/boot-mode/boot-mode.c
View File

@ -21,23 +21,23 @@ u32 spl_boot_device_raw(void)
switch (uniphier_get_soc_type()) { switch (uniphier_get_soc_type()) {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
case SOC_UNIPHIER_SLD3: case SOC_UNIPHIER_SLD3:
return ph1_sld3_boot_device(); return uniphier_sld3_boot_device();
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_PRO4) || \ #if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_PRO4) || \
defined(CONFIG_ARCH_UNIPHIER_SLD8) defined(CONFIG_ARCH_UNIPHIER_SLD8)
case SOC_UNIPHIER_LD4: case SOC_UNIPHIER_LD4:
case SOC_UNIPHIER_PRO4: case SOC_UNIPHIER_PRO4:
case SOC_UNIPHIER_SLD8: case SOC_UNIPHIER_SLD8:
return ph1_ld4_boot_device(); return uniphier_ld4_boot_device();
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
case SOC_UNIPHIER_PRO5: case SOC_UNIPHIER_PRO5:
return ph1_pro5_boot_device(); return uniphier_pro5_boot_device();
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
case SOC_UNIPHIER_PXS2: case SOC_UNIPHIER_PXS2:
case SOC_UNIPHIER_LD6B: case SOC_UNIPHIER_LD6B:
return proxstream2_boot_device(); return uniphier_pxs2_boot_device();
#endif #endif
default: default:
return BOOT_DEVICE_NONE; return BOOT_DEVICE_NONE;

8
arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c
View File

@ -17,7 +17,7 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
switch (uniphier_get_soc_type()) { switch (uniphier_get_soc_type()) {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
case SOC_UNIPHIER_SLD3: case SOC_UNIPHIER_SLD3:
ph1_sld3_boot_mode_show(); uniphier_sld3_boot_mode_show();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_PRO4) || \ #if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_PRO4) || \
@ -25,18 +25,18 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
case SOC_UNIPHIER_LD4: case SOC_UNIPHIER_LD4:
case SOC_UNIPHIER_PRO4: case SOC_UNIPHIER_PRO4:
case SOC_UNIPHIER_SLD8: case SOC_UNIPHIER_SLD8:
ph1_ld4_boot_mode_show(); uniphier_ld4_boot_mode_show();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
case SOC_UNIPHIER_PRO5: case SOC_UNIPHIER_PRO5:
ph1_pro5_boot_mode_show(); uniphier_pro5_boot_mode_show();
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
case SOC_UNIPHIER_PXS2: case SOC_UNIPHIER_PXS2:
case SOC_UNIPHIER_LD6B: case SOC_UNIPHIER_LD6B:
proxstream2_boot_mode_show(); uniphier_pxs2_boot_mode_show();
break; break;
#endif #endif
default: default:

2
arch/arm/mach-uniphier/clk/clk-ld4.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
void ph1_ld4_clk_init(void) void uniphier_ld4_clk_init(void)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/clk/clk-pro4.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
void ph1_pro4_clk_init(void) void uniphier_pro4_clk_init(void)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/clk/clk-pro5.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
void ph1_pro5_clk_init(void) void uniphier_pro5_clk_init(void)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/clk/clk-pxs2.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
void proxstream2_clk_init(void) void uniphier_pxs2_clk_init(void)
{ {
u32 tmp; u32 tmp;

3
arch/arm/mach-uniphier/dram/ddrphy-ld4.c
View File

@ -27,7 +27,8 @@ static u32 ddrphy_dtpr2[DRAM_FREQ_NR] = {0x5002c200, 0xa00214f8};
static u32 ddrphy_mr0[DRAM_FREQ_NR] = {0x00000b51, 0x00000d71}; static u32 ddrphy_mr0[DRAM_FREQ_NR] = {0x00000b51, 0x00000d71};
static u32 ddrphy_mr2[DRAM_FREQ_NR] = {0x00000290, 0x00000298}; static u32 ddrphy_mr2[DRAM_FREQ_NR] = {0x00000290, 0x00000298};
int ph1_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq, bool ddr3plus) int uniphier_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq,
bool ddr3plus)
{ {
enum dram_freq freq_e; enum dram_freq freq_e;
u32 tmp; u32 tmp;

3
arch/arm/mach-uniphier/dram/ddrphy-regs.h
View File

@ -159,7 +159,8 @@ struct ddrphy {
#define NR_DATX8_PER_DDRPHY 2 #define NR_DATX8_PER_DDRPHY 2
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
int ph1_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq, bool ddr3plus); int uniphier_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq,
bool ddr3plus);
void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank); void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank);
int ddrphy_training(struct ddrphy __iomem *phy); int ddrphy_training(struct ddrphy __iomem *phy);
#endif #endif

4
arch/arm/mach-uniphier/dram/umc-ld4.c
View File

@ -152,7 +152,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
writel(0x00000101, dc_base + UMC_DIOCTLA); writel(0x00000101, dc_base + UMC_DIOCTLA);
ret = ph1_ld4_ddrphy_init(phy_base, freq, ddr3plus); ret = uniphier_ld4_ddrphy_init(phy_base, freq, ddr3plus);
if (ret) if (ret)
return ret; return ret;
@ -164,7 +164,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
return umc_dramcont_init(dc_base, ca_base, freq, size, ddr3plus); return umc_dramcont_init(dc_base, ca_base, freq, size, ddr3plus);
} }
int ph1_ld4_umc_init(const struct uniphier_board_data *bd) int uniphier_ld4_umc_init(const struct uniphier_board_data *bd)
{ {
void __iomem *umc_base = (void __iomem *)0x5b800000; void __iomem *umc_base = (void __iomem *)0x5b800000;
void __iomem *ca_base = umc_base + 0x00001000; void __iomem *ca_base = umc_base + 0x00001000;

4
arch/arm/mach-uniphier/dram/umc-pro4.c
View File

@ -142,7 +142,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
writel(0x00000100 | ((1 << (phy + 1)) - 1), writel(0x00000100 | ((1 << (phy + 1)) - 1),
dc_base + UMC_DIOCTLA); dc_base + UMC_DIOCTLA);
ret = ph1_ld4_ddrphy_init(phy_base, freq, ddr3plus); ret = uniphier_ld4_ddrphy_init(phy_base, freq, ddr3plus);
if (ret) if (ret)
return ret; return ret;
@ -158,7 +158,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
ddr3plus); ddr3plus);
} }
int ph1_pro4_umc_init(const struct uniphier_board_data *bd) int uniphier_pro4_umc_init(const struct uniphier_board_data *bd)
{ {
void __iomem *umc_base = (void __iomem *)0x5b800000; void __iomem *umc_base = (void __iomem *)0x5b800000;
void __iomem *ca_base = umc_base + 0x00001000; void __iomem *ca_base = umc_base + 0x00001000;

2
arch/arm/mach-uniphier/dram/umc-pxs2.c
View File

@ -598,7 +598,7 @@ static void um_init(void __iomem *um_base)
writel(0x000000ff, um_base + UMC_MBUS3); writel(0x000000ff, um_base + UMC_MBUS3);
} }
int proxstream2_umc_init(const struct uniphier_board_data *bd) int uniphier_pxs2_umc_init(const struct uniphier_board_data *bd)
{ {
void __iomem *um_base = (void __iomem *)0x5b600000; void __iomem *um_base = (void __iomem *)0x5b600000;
void __iomem *umc_ch_base = (void __iomem *)0x5b800000; void __iomem *umc_ch_base = (void __iomem *)0x5b800000;

4
arch/arm/mach-uniphier/dram/umc-sld8.c
View File

@ -155,7 +155,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
writel(0x00000101, dc_base + UMC_DIOCTLA); writel(0x00000101, dc_base + UMC_DIOCTLA);
ret = ph1_ld4_ddrphy_init(phy_base, freq, ddr3plus); ret = uniphier_ld4_ddrphy_init(phy_base, freq, ddr3plus);
if (ret) if (ret)
return ret; return ret;
@ -167,7 +167,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
return umc_dramcont_init(dc_base, ca_base, freq, size, ddr3plus); return umc_dramcont_init(dc_base, ca_base, freq, size, ddr3plus);
} }
int ph1_sld8_umc_init(const struct uniphier_board_data *bd) int uniphier_sld8_umc_init(const struct uniphier_board_data *bd)
{ {
void __iomem *umc_base = (void __iomem *)0x5b800000; void __iomem *umc_base = (void __iomem *)0x5b800000;
void __iomem *ca_base = umc_base + 0x00001000; void __iomem *ca_base = umc_base + 0x00001000;

2
arch/arm/mach-uniphier/early-clk/early-clk-ld4.c
View File

@ -11,7 +11,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
int ph1_ld4_early_clk_init(const struct uniphier_board_data *bd) int uniphier_ld4_early_clk_init(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/early-clk/early-clk-pro5.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
int ph1_pro5_early_clk_init(const struct uniphier_board_data *bd) int uniphier_pro5_early_clk_init(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c
View File

@ -11,7 +11,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
int proxstream2_early_clk_init(const struct uniphier_board_data *bd) int uniphier_pxs2_early_clk_init(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c
View File

@ -7,7 +7,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
int ph1_sld3_early_pin_init(const struct uniphier_board_data *bd) int uniphier_sld3_early_pin_init(const struct uniphier_board_data *bd)
{ {
/* Comment format: PAD Name -> Function Name */ /* Comment format: PAD Name -> Function Name */

80
arch/arm/mach-uniphier/init.h
View File

@ -26,26 +26,28 @@ struct uniphier_board_data {
const struct uniphier_board_data *uniphier_get_board_param(void); const struct uniphier_board_data *uniphier_get_board_param(void);
int ph1_sld3_init(const struct uniphier_board_data *bd); int uniphier_sld3_init(const struct uniphier_board_data *bd);
int ph1_ld4_init(const struct uniphier_board_data *bd); int uniphier_ld4_init(const struct uniphier_board_data *bd);
int ph1_pro4_init(const struct uniphier_board_data *bd); int uniphier_pro4_init(const struct uniphier_board_data *bd);
int ph1_sld8_init(const struct uniphier_board_data *bd); int uniphier_sld8_init(const struct uniphier_board_data *bd);
int ph1_pro5_init(const struct uniphier_board_data *bd); int uniphier_pro5_init(const struct uniphier_board_data *bd);
int proxstream2_init(const struct uniphier_board_data *bd); int uniphier_pxs2_init(const struct uniphier_board_data *bd);
#if defined(CONFIG_MICRO_SUPPORT_CARD) #if defined(CONFIG_MICRO_SUPPORT_CARD)
int sbc_admulti_init(const struct uniphier_board_data *bd); int uniphier_sbc_init_admulti(const struct uniphier_board_data *bd);
int sbc_savepin_init(const struct uniphier_board_data *bd); int uniphier_sbc_init_savepin(const struct uniphier_board_data *bd);
int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd); int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd);
int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd); int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd);
int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd); int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd);
#else #else
static inline int sbc_admulti_init(const struct uniphier_board_data *bd) static inline int uniphier_sbc_init_admulti(
const struct uniphier_board_data *bd)
{ {
return 0; return 0;
} }
static inline int sbc_savepin_init(const struct uniphier_board_data *bd) static inline int uniphier_sbc_init_savepin(
const struct uniphier_board_data *bd)
{ {
return 0; return 0;
} }
@ -66,44 +68,44 @@ static inline int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd)
} }
#endif #endif
int ph1_sld3_bcu_init(const struct uniphier_board_data *bd); int uniphier_sld3_bcu_init(const struct uniphier_board_data *bd);
int ph1_ld4_bcu_init(const struct uniphier_board_data *bd); int uniphier_ld4_bcu_init(const struct uniphier_board_data *bd);
int memconf_init(const struct uniphier_board_data *bd); int memconf_init(const struct uniphier_board_data *bd);
int ph1_sld3_memconf_init(const struct uniphier_board_data *bd); int uniphier_sld3_memconf_init(const struct uniphier_board_data *bd);
int proxstream2_memconf_init(const struct uniphier_board_data *bd); int uniphier_pxs2_memconf_init(const struct uniphier_board_data *bd);
int ph1_sld3_pll_init(const struct uniphier_board_data *bd); int uniphier_sld3_pll_init(const struct uniphier_board_data *bd);
int ph1_ld4_pll_init(const struct uniphier_board_data *bd); int uniphier_ld4_pll_init(const struct uniphier_board_data *bd);
int ph1_pro4_pll_init(const struct uniphier_board_data *bd); int uniphier_pro4_pll_init(const struct uniphier_board_data *bd);
int ph1_sld8_pll_init(const struct uniphier_board_data *bd); int uniphier_sld8_pll_init(const struct uniphier_board_data *bd);
int ph1_sld3_enable_dpll_ssc(const struct uniphier_board_data *bd); int uniphier_sld3_enable_dpll_ssc(const struct uniphier_board_data *bd);
int ph1_ld4_enable_dpll_ssc(const struct uniphier_board_data *bd); int uniphier_ld4_enable_dpll_ssc(const struct uniphier_board_data *bd);
int ph1_ld4_early_clk_init(const struct uniphier_board_data *bd); int uniphier_ld4_early_clk_init(const struct uniphier_board_data *bd);
int ph1_pro5_early_clk_init(const struct uniphier_board_data *bd); int uniphier_pro5_early_clk_init(const struct uniphier_board_data *bd);
int proxstream2_early_clk_init(const struct uniphier_board_data *bd); int uniphier_pxs2_early_clk_init(const struct uniphier_board_data *bd);
int ph1_sld3_early_pin_init(const struct uniphier_board_data *bd); int uniphier_sld3_early_pin_init(const struct uniphier_board_data *bd);
int ph1_ld4_umc_init(const struct uniphier_board_data *bd); int uniphier_ld4_umc_init(const struct uniphier_board_data *bd);
int ph1_pro4_umc_init(const struct uniphier_board_data *bd); int uniphier_pro4_umc_init(const struct uniphier_board_data *bd);
int ph1_sld8_umc_init(const struct uniphier_board_data *bd); int uniphier_sld8_umc_init(const struct uniphier_board_data *bd);
int proxstream2_umc_init(const struct uniphier_board_data *bd); int uniphier_pxs2_umc_init(const struct uniphier_board_data *bd);
void ph1_sld3_pin_init(void); void uniphier_sld3_pin_init(void);
void ph1_ld4_pin_init(void); void uniphier_ld4_pin_init(void);
void ph1_pro4_pin_init(void); void uniphier_pro4_pin_init(void);
void ph1_sld8_pin_init(void); void uniphier_sld8_pin_init(void);
void ph1_pro5_pin_init(void); void uniphier_pro5_pin_init(void);
void proxstream2_pin_init(void); void uniphier_pxs2_pin_init(void);
void ph1_ld6b_pin_init(void); void uniphier_ld6b_pin_init(void);
void ph1_ld4_clk_init(void); void uniphier_ld4_clk_init(void);
void ph1_pro4_clk_init(void); void uniphier_pro4_clk_init(void);
void ph1_pro5_clk_init(void); void uniphier_pro5_clk_init(void);
void proxstream2_clk_init(void); void uniphier_pxs2_clk_init(void);
#define pr_err(fmt, args...) printf(fmt, ##args) #define pr_err(fmt, args...) printf(fmt, ##args)

14
arch/arm/mach-uniphier/init/init-ld4.c
View File

@ -10,16 +10,16 @@
#include "../init.h" #include "../init.h"
#include "../micro-support-card.h" #include "../micro-support-card.h"
int ph1_ld4_init(const struct uniphier_board_data *bd) int uniphier_ld4_init(const struct uniphier_board_data *bd)
{ {
ph1_ld4_bcu_init(bd); uniphier_ld4_bcu_init(bd);
sbc_savepin_init(bd); uniphier_sbc_init_savepin(bd);
uniphier_ld4_sbc_init(bd); uniphier_ld4_sbc_init(bd);
support_card_reset(); support_card_reset();
ph1_ld4_pll_init(bd); uniphier_ld4_pll_init(bd);
support_card_init(); support_card_init();
@ -29,7 +29,7 @@ int ph1_ld4_init(const struct uniphier_board_data *bd)
led_puts("L1"); led_puts("L1");
ph1_ld4_early_clk_init(bd); uniphier_ld4_early_clk_init(bd);
led_puts("L2"); led_puts("L2");
@ -44,7 +44,7 @@ int ph1_ld4_init(const struct uniphier_board_data *bd)
{ {
int res; int res;
res = ph1_ld4_umc_init(bd); res = uniphier_ld4_umc_init(bd);
if (res < 0) { if (res < 0) {
while (1) while (1)
; ;
@ -53,7 +53,7 @@ int ph1_ld4_init(const struct uniphier_board_data *bd)
led_puts("L5"); led_puts("L5");
ph1_ld4_enable_dpll_ssc(bd); uniphier_ld4_enable_dpll_ssc(bd);
led_puts("L6"); led_puts("L6");

12
arch/arm/mach-uniphier/init/init-pro4.c
View File

@ -10,13 +10,13 @@
#include "../init.h" #include "../init.h"
#include "../micro-support-card.h" #include "../micro-support-card.h"
int ph1_pro4_init(const struct uniphier_board_data *bd) int uniphier_pro4_init(const struct uniphier_board_data *bd)
{ {
sbc_savepin_init(bd); uniphier_sbc_init_savepin(bd);
support_card_reset(); support_card_reset();
ph1_pro4_pll_init(bd); uniphier_pro4_pll_init(bd);
support_card_init(); support_card_init();
@ -26,7 +26,7 @@ int ph1_pro4_init(const struct uniphier_board_data *bd)
led_puts("L1"); led_puts("L1");
ph1_ld4_early_clk_init(bd); uniphier_ld4_early_clk_init(bd);
led_puts("L2"); led_puts("L2");
@ -41,7 +41,7 @@ int ph1_pro4_init(const struct uniphier_board_data *bd)
{ {
int res; int res;
res = ph1_pro4_umc_init(bd); res = uniphier_pro4_umc_init(bd);
if (res < 0) { if (res < 0) {
while (1) while (1)
; ;
@ -50,7 +50,7 @@ int ph1_pro4_init(const struct uniphier_board_data *bd)
led_puts("L5"); led_puts("L5");
ph1_ld4_enable_dpll_ssc(bd); uniphier_ld4_enable_dpll_ssc(bd);
led_puts("L6"); led_puts("L6");

6
arch/arm/mach-uniphier/init/init-pro5.c
View File

@ -10,9 +10,9 @@
#include "../init.h" #include "../init.h"
#include "../micro-support-card.h" #include "../micro-support-card.h"
int ph1_pro5_init(const struct uniphier_board_data *bd) int uniphier_pro5_init(const struct uniphier_board_data *bd)
{ {
sbc_savepin_init(bd); uniphier_sbc_init_savepin(bd);
support_card_reset(); support_card_reset();
@ -24,7 +24,7 @@ int ph1_pro5_init(const struct uniphier_board_data *bd)
led_puts("L1"); led_puts("L1");
ph1_pro5_early_clk_init(bd); uniphier_pro5_early_clk_init(bd);
led_puts("L2"); led_puts("L2");

10
arch/arm/mach-uniphier/init/init-pxs2.c
View File

@ -10,11 +10,11 @@
#include "../init.h" #include "../init.h"
#include "../micro-support-card.h" #include "../micro-support-card.h"
int proxstream2_init(const struct uniphier_board_data *bd) int uniphier_pxs2_init(const struct uniphier_board_data *bd)
{ {
int ret; int ret;
sbc_savepin_init(bd); uniphier_sbc_init_savepin(bd);
uniphier_pxs2_sbc_init(bd); uniphier_pxs2_sbc_init(bd);
support_card_reset(); support_card_reset();
@ -24,11 +24,11 @@ int proxstream2_init(const struct uniphier_board_data *bd)
led_puts("L0"); led_puts("L0");
memconf_init(bd); memconf_init(bd);
proxstream2_memconf_init(bd); uniphier_pxs2_memconf_init(bd);
led_puts("L1"); led_puts("L1");
proxstream2_early_clk_init(bd); uniphier_pxs2_early_clk_init(bd);
led_puts("L2"); led_puts("L2");
@ -40,7 +40,7 @@ int proxstream2_init(const struct uniphier_board_data *bd)
led_puts("L4"); led_puts("L4");
ret = proxstream2_umc_init(bd); ret = uniphier_pxs2_umc_init(bd);
if (ret) if (ret)
return ret; return ret;

16
arch/arm/mach-uniphier/init/init-sld3.c
View File

@ -10,31 +10,31 @@
#include "../init.h" #include "../init.h"
#include "../micro-support-card.h" #include "../micro-support-card.h"
int ph1_sld3_init(const struct uniphier_board_data *bd) int uniphier_sld3_init(const struct uniphier_board_data *bd)
{ {
ph1_sld3_bcu_init(bd); uniphier_sld3_bcu_init(bd);
sbc_admulti_init(bd); uniphier_sbc_init_admulti(bd);
uniphier_sld3_sbc_init(bd); uniphier_sld3_sbc_init(bd);
support_card_reset(); support_card_reset();
ph1_sld3_pll_init(bd); uniphier_sld3_pll_init(bd);
support_card_init(); support_card_init();
led_puts("L0"); led_puts("L0");
memconf_init(bd); memconf_init(bd);
ph1_sld3_memconf_init(bd); uniphier_sld3_memconf_init(bd);
led_puts("L1"); led_puts("L1");
ph1_ld4_early_clk_init(bd); uniphier_ld4_early_clk_init(bd);
led_puts("L2"); led_puts("L2");
ph1_sld3_early_pin_init(bd); uniphier_sld3_early_pin_init(bd);
led_puts("L3"); led_puts("L3");
@ -46,7 +46,7 @@ int ph1_sld3_init(const struct uniphier_board_data *bd)
led_puts("L5"); led_puts("L5");
ph1_sld3_enable_dpll_ssc(bd); uniphier_sld3_enable_dpll_ssc(bd);
led_puts("L6"); led_puts("L6");

14
arch/arm/mach-uniphier/init/init-sld8.c
View File

@ -10,16 +10,16 @@
#include "../init.h" #include "../init.h"
#include "../micro-support-card.h" #include "../micro-support-card.h"
int ph1_sld8_init(const struct uniphier_board_data *bd) int uniphier_sld8_init(const struct uniphier_board_data *bd)
{ {
ph1_ld4_bcu_init(bd); uniphier_ld4_bcu_init(bd);
sbc_savepin_init(bd); uniphier_sbc_init_savepin(bd);
uniphier_ld4_sbc_init(bd); uniphier_ld4_sbc_init(bd);
support_card_reset(); support_card_reset();
ph1_sld8_pll_init(bd); uniphier_sld8_pll_init(bd);
support_card_init(); support_card_init();
@ -29,7 +29,7 @@ int ph1_sld8_init(const struct uniphier_board_data *bd)
led_puts("L1"); led_puts("L1");
ph1_ld4_early_clk_init(bd); uniphier_ld4_early_clk_init(bd);
led_puts("L2"); led_puts("L2");
@ -44,7 +44,7 @@ int ph1_sld8_init(const struct uniphier_board_data *bd)
{ {
int res; int res;
res = ph1_sld8_umc_init(bd); res = uniphier_sld8_umc_init(bd);
if (res < 0) { if (res < 0) {
while (1) while (1)
; ;
@ -53,7 +53,7 @@ int ph1_sld8_init(const struct uniphier_board_data *bd)
led_puts("L5"); led_puts("L5");
ph1_ld4_enable_dpll_ssc(bd); uniphier_ld4_enable_dpll_ssc(bd);
led_puts("L6"); led_puts("L6");

12
arch/arm/mach-uniphier/init/init.c
View File

@ -26,33 +26,33 @@ void spl_board_init(void)
switch (uniphier_get_soc_type()) { switch (uniphier_get_soc_type()) {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
case SOC_UNIPHIER_SLD3: case SOC_UNIPHIER_SLD3:
ph1_sld3_init(param); uniphier_sld3_init(param);
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) #if defined(CONFIG_ARCH_UNIPHIER_LD4)
case SOC_UNIPHIER_LD4: case SOC_UNIPHIER_LD4:
ph1_ld4_init(param); uniphier_ld4_init(param);
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO4) #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
case SOC_UNIPHIER_PRO4: case SOC_UNIPHIER_PRO4:
ph1_pro4_init(param); uniphier_pro4_init(param);
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8) #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
case SOC_UNIPHIER_SLD8: case SOC_UNIPHIER_SLD8:
ph1_sld8_init(param); uniphier_sld8_init(param);
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
case SOC_UNIPHIER_PRO5: case SOC_UNIPHIER_PRO5:
ph1_pro5_init(param); uniphier_pro5_init(param);
break; break;
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
case SOC_UNIPHIER_PXS2: case SOC_UNIPHIER_PXS2:
case SOC_UNIPHIER_LD6B: case SOC_UNIPHIER_LD6B:
proxstream2_init(param); uniphier_pxs2_init(param);
break; break;
#endif #endif
default: default:

2
arch/arm/mach-uniphier/memconf/memconf-pxs2.c
View File

@ -12,7 +12,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
int proxstream2_memconf_init(const struct uniphier_board_data *bd) int uniphier_pxs2_memconf_init(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;
unsigned long size_per_word; unsigned long size_per_word;

2
arch/arm/mach-uniphier/memconf/memconf-sld3.c
View File

@ -12,7 +12,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
int ph1_sld3_memconf_init(const struct uniphier_board_data *bd) int uniphier_sld3_memconf_init(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;
unsigned long size_per_word; unsigned long size_per_word;

2
arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void ph1_ld4_pin_init(void) void uniphier_ld4_pin_init(void)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void ph1_ld6b_pin_init(void) void uniphier_ld6b_pin_init(void)
{ {
/* Comment format: PAD Name -> Function Name */ /* Comment format: PAD Name -> Function Name */

2
arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void ph1_pro4_pin_init(void) void uniphier_pro4_pin_init(void)
{ {
/* Comment format: PAD Name -> Function Name */ /* Comment format: PAD Name -> Function Name */

2
arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void ph1_pro5_pin_init(void) void uniphier_pro5_pin_init(void)
{ {
/* Comment format: PAD Name -> Function Name */ /* Comment format: PAD Name -> Function Name */

2
arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void proxstream2_pin_init(void) void uniphier_pxs2_pin_init(void)
{ {
/* Comment format: PAD Name -> Function Name */ /* Comment format: PAD Name -> Function Name */

2
arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
View File

@ -7,7 +7,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void ph1_sld3_pin_init(void) void uniphier_sld3_pin_init(void)
{ {
#ifdef CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI
sg_set_pinsel(13, 0, 4, 4); /* USB0OC */ sg_set_pinsel(13, 0, 4, 4); /* USB0OC */

2
arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void ph1_sld8_pin_init(void) void uniphier_sld8_pin_init(void)
{ {
/* Comment format: PAD Name -> Function Name */ /* Comment format: PAD Name -> Function Name */

2
arch/arm/mach-uniphier/pll/pll-init-ld4.c
View File

@ -183,7 +183,7 @@ static void vpll_init(void)
writel(tmp, SC_VPLL27BCTRL); writel(tmp, SC_VPLL27BCTRL);
} }
int ph1_ld4_pll_init(const struct uniphier_board_data *bd) int uniphier_ld4_pll_init(const struct uniphier_board_data *bd)
{ {
int ret; int ret;

2
arch/arm/mach-uniphier/pll/pll-init-pro4.c
View File

@ -145,7 +145,7 @@ static void vpll_init(void)
writel(tmp, SC_VPLL27BCTRL); writel(tmp, SC_VPLL27BCTRL);
} }
int ph1_pro4_pll_init(const struct uniphier_board_data *bd) int uniphier_pro4_pll_init(const struct uniphier_board_data *bd)
{ {
int ret; int ret;

2
arch/arm/mach-uniphier/pll/pll-init-sld3.c
View File

@ -6,7 +6,7 @@
#include "../init.h" #include "../init.h"
int ph1_sld3_pll_init(const struct uniphier_board_data *bd) int uniphier_sld3_pll_init(const struct uniphier_board_data *bd)
{ {
/* add pll init code here */ /* add pll init code here */
return 0; return 0;

2
arch/arm/mach-uniphier/pll/pll-init-sld8.c
View File

@ -188,7 +188,7 @@ static void vpll_init(void)
writel(tmp, SC_VPLL27BCTRL); writel(tmp, SC_VPLL27BCTRL);
} }
int ph1_sld8_pll_init(const struct uniphier_board_data *bd) int uniphier_sld8_pll_init(const struct uniphier_board_data *bd)
{ {
dpll_init(); dpll_init();
upll_init(); upll_init();

2
arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c
View File

@ -9,7 +9,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
int ph1_ld4_enable_dpll_ssc(const struct uniphier_board_data *bd) int uniphier_ld4_enable_dpll_ssc(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c
View File

@ -10,7 +10,7 @@
#include "../init.h" #include "../init.h"
#include "../sc-regs.h" #include "../sc-regs.h"
int ph1_sld3_enable_dpll_ssc(const struct uniphier_board_data *bd) int uniphier_sld3_enable_dpll_ssc(const struct uniphier_board_data *bd)
{ {
u32 tmp; u32 tmp;

2
arch/arm/mach-uniphier/sbc/sbc-admulti.c
View File

@ -19,7 +19,7 @@
#define SBCTRL1_ADMULTIPLX_MEM_VALUE 0x03005500 #define SBCTRL1_ADMULTIPLX_MEM_VALUE 0x03005500
#define SBCTRL2_ADMULTIPLX_MEM_VALUE 0x14000010 #define SBCTRL2_ADMULTIPLX_MEM_VALUE 0x14000010
int sbc_admulti_init(const struct uniphier_board_data *bd) int uniphier_sbc_init_admulti(const struct uniphier_board_data *bd)
{ {
/* /*
* Only CS1 is connected to support card. * Only CS1 is connected to support card.

2
arch/arm/mach-uniphier/sbc/sbc-savepin.c
View File

@ -22,7 +22,7 @@
#define SBCTRL2_SAVEPIN_MEM_VALUE 0x34000009 #define SBCTRL2_SAVEPIN_MEM_VALUE 0x34000009
#define SBCTRL4_SAVEPIN_MEM_VALUE 0x02110210 #define SBCTRL4_SAVEPIN_MEM_VALUE 0x02110210
int sbc_savepin_init(const struct uniphier_board_data *bd) int uniphier_sbc_init_savepin(const struct uniphier_board_data *bd)
{ {
/* /*
* Only CS1 is connected to support card. * Only CS1 is connected to support card.