diff options
| -rw-r--r-- | arch/arm/cpu/pxa/pxa2xx.c | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-pxa/pxa.h | 2 | ||||
| -rw-r--r-- | board/balloon3/balloon3.c | 2 | ||||
| -rw-r--r-- | board/colibri_pxa270/colibri_pxa270.c | 2 | ||||
| -rw-r--r-- | board/lubbock/lubbock.c | 2 | ||||
| -rw-r--r-- | board/palmld/palmld.c | 2 | ||||
| -rw-r--r-- | board/palmtc/palmtc.c | 2 | ||||
| -rw-r--r-- | board/pxa255_idp/pxa_idp.c | 2 | ||||
| -rw-r--r-- | board/trizepsiv/conxs.c | 2 | ||||
| -rw-r--r-- | board/vpac270/onenand.c | 2 | ||||
| -rw-r--r-- | board/vpac270/vpac270.c | 2 | ||||
| -rw-r--r-- | board/xaeniax/xaeniax.c | 2 | ||||
| -rw-r--r-- | board/zipitz2/zipitz2.c | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index e7b475d..09e8177 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -71,7 +71,7 @@ inline void writelrb(uint32_t val, uint32_t addr) asm volatile("" : : : "memory"); } -void pxa_dram_init(void) +void pxa2xx_dram_init(void) { uint32_t tmp; int i; @@ -262,7 +262,7 @@ void pxa_wakeup(void) /* Wakeup */ if (rcsr & RCSR_SMR) { writel(PSSR_PH, PSSR); - pxa_dram_init(); + pxa2xx_dram_init(); icache_disable(); dcache_disable(); asm volatile("mov pc, %0" : : "r"(readl(PSPR))); diff --git a/arch/arm/include/asm/arch-pxa/pxa.h b/arch/arm/include/asm/arch-pxa/pxa.h index 050b3cd..49c6552 100644 --- a/arch/arm/include/asm/arch-pxa/pxa.h +++ b/arch/arm/include/asm/arch-pxa/pxa.h @@ -24,6 +24,6 @@ int cpu_is_pxa25x(void); int cpu_is_pxa27x(void); -void pxa_dram_init(void); +void pxa2xx_dram_init(void); #endif /* __PXA_H__ */ diff --git a/board/balloon3/balloon3.c b/board/balloon3/balloon3.c index ebee5e1..f360323 100644 --- a/board/balloon3/balloon3.c +++ b/board/balloon3/balloon3.c @@ -60,7 +60,7 @@ struct serial_device *default_serial_console(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/colibri_pxa270/colibri_pxa270.c b/board/colibri_pxa270/colibri_pxa270.c index 06f970b..d72e5d6 100644 --- a/board/colibri_pxa270/colibri_pxa270.c +++ b/board/colibri_pxa270/colibri_pxa270.c @@ -51,7 +51,7 @@ int board_init(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c index e9e6bda..437f944 100644 --- a/board/lubbock/lubbock.c +++ b/board/lubbock/lubbock.c @@ -59,7 +59,7 @@ int board_late_init(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/palmld/palmld.c b/board/palmld/palmld.c index 65bde83..2f1ad20 100644 --- a/board/palmld/palmld.c +++ b/board/palmld/palmld.c @@ -59,7 +59,7 @@ struct serial_device *default_serial_console(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/palmtc/palmtc.c b/board/palmtc/palmtc.c index 414562b..4adf152 100644 --- a/board/palmtc/palmtc.c +++ b/board/palmtc/palmtc.c @@ -58,7 +58,7 @@ struct serial_device *default_serial_console(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/pxa255_idp/pxa_idp.c b/board/pxa255_idp/pxa_idp.c index 7b975f6..877e8d9 100644 --- a/board/pxa255_idp/pxa_idp.c +++ b/board/pxa255_idp/pxa_idp.c @@ -86,7 +86,7 @@ int board_late_init(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 008cdd8..1291195 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -142,7 +142,7 @@ struct serial_device *default_serial_console (void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/vpac270/onenand.c b/board/vpac270/onenand.c index dceb5b7..c2ae9a7 100644 --- a/board/vpac270/onenand.c +++ b/board/vpac270/onenand.c @@ -45,7 +45,7 @@ void board_init_f(unsigned long unused) /* Hereby, the code runs from (S)RAM, copy U-Boot and execute it. */ arch_cpu_init(); - pxa_dram_init(); + pxa2xx_dram_init(); onenand_spl_load_image(CONFIG_SPL_ONENAND_LOAD_ADDR, CONFIG_SPL_ONENAND_LOAD_SIZE, (void *)CONFIG_SYS_TEXT_BASE); diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c index bd2f241..dfdab9b 100644 --- a/board/vpac270/vpac270.c +++ b/board/vpac270/vpac270.c @@ -58,7 +58,7 @@ struct serial_device *default_serial_console(void) int dram_init(void) { #ifndef CONFIG_ONENAND - pxa_dram_init(); + pxa2xx_dram_init(); #endif gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; diff --git a/board/xaeniax/xaeniax.c b/board/xaeniax/xaeniax.c index 9cc64bb..a4acf6c 100644 --- a/board/xaeniax/xaeniax.c +++ b/board/xaeniax/xaeniax.c @@ -62,7 +62,7 @@ int board_late_init(void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } diff --git a/board/zipitz2/zipitz2.c b/board/zipitz2/zipitz2.c index e72a5d9..b093c2f 100644 --- a/board/zipitz2/zipitz2.c +++ b/board/zipitz2/zipitz2.c @@ -68,7 +68,7 @@ struct serial_device *default_serial_console (void) int dram_init(void) { - pxa_dram_init(); + pxa2xx_dram_init(); gd->ram_size = PHYS_SDRAM_1_SIZE; return 0; } |