PXA: Rename pxa_dram_init to pxa2xx_dram_init

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
master
Marek Vasut 13 years ago committed by Albert ARIBAUD
parent 4438a45f4d
commit f68d2a222f
  1. 4
      arch/arm/cpu/pxa/pxa2xx.c
  2. 2
      arch/arm/include/asm/arch-pxa/pxa.h
  3. 2
      board/balloon3/balloon3.c
  4. 2
      board/colibri_pxa270/colibri_pxa270.c
  5. 2
      board/lubbock/lubbock.c
  6. 2
      board/palmld/palmld.c
  7. 2
      board/palmtc/palmtc.c
  8. 2
      board/pxa255_idp/pxa_idp.c
  9. 2
      board/trizepsiv/conxs.c
  10. 2
      board/vpac270/onenand.c
  11. 2
      board/vpac270/vpac270.c
  12. 2
      board/xaeniax/xaeniax.c
  13. 2
      board/zipitz2/zipitz2.c

@ -71,7 +71,7 @@ inline void writelrb(uint32_t val, uint32_t addr)
asm volatile("" : : : "memory"); asm volatile("" : : : "memory");
} }
void pxa_dram_init(void) void pxa2xx_dram_init(void)
{ {
uint32_t tmp; uint32_t tmp;
int i; int i;
@ -262,7 +262,7 @@ void pxa_wakeup(void)
/* Wakeup */ /* Wakeup */
if (rcsr & RCSR_SMR) { if (rcsr & RCSR_SMR) {
writel(PSSR_PH, PSSR); writel(PSSR_PH, PSSR);
pxa_dram_init(); pxa2xx_dram_init();
icache_disable(); icache_disable();
dcache_disable(); dcache_disable();
asm volatile("mov pc, %0" : : "r"(readl(PSPR))); asm volatile("mov pc, %0" : : "r"(readl(PSPR)));

@ -24,6 +24,6 @@
int cpu_is_pxa25x(void); int cpu_is_pxa25x(void);
int cpu_is_pxa27x(void); int cpu_is_pxa27x(void);
void pxa_dram_init(void); void pxa2xx_dram_init(void);
#endif /* __PXA_H__ */ #endif /* __PXA_H__ */

@ -60,7 +60,7 @@ struct serial_device *default_serial_console(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -51,7 +51,7 @@ int board_init(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -59,7 +59,7 @@ int board_late_init(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -59,7 +59,7 @@ struct serial_device *default_serial_console(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -58,7 +58,7 @@ struct serial_device *default_serial_console(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -86,7 +86,7 @@ int board_late_init(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -142,7 +142,7 @@ struct serial_device *default_serial_console (void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -45,7 +45,7 @@ void board_init_f(unsigned long unused)
/* Hereby, the code runs from (S)RAM, copy U-Boot and execute it. */ /* Hereby, the code runs from (S)RAM, copy U-Boot and execute it. */
arch_cpu_init(); arch_cpu_init();
pxa_dram_init(); pxa2xx_dram_init();
onenand_spl_load_image(CONFIG_SPL_ONENAND_LOAD_ADDR, onenand_spl_load_image(CONFIG_SPL_ONENAND_LOAD_ADDR,
CONFIG_SPL_ONENAND_LOAD_SIZE, CONFIG_SPL_ONENAND_LOAD_SIZE,
(void *)CONFIG_SYS_TEXT_BASE); (void *)CONFIG_SYS_TEXT_BASE);

@ -58,7 +58,7 @@ struct serial_device *default_serial_console(void)
int dram_init(void) int dram_init(void)
{ {
#ifndef CONFIG_ONENAND #ifndef CONFIG_ONENAND
pxa_dram_init(); pxa2xx_dram_init();
#endif #endif
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;

@ -62,7 +62,7 @@ int board_late_init(void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

@ -68,7 +68,7 @@ struct serial_device *default_serial_console (void)
int dram_init(void) int dram_init(void)
{ {
pxa_dram_init(); pxa2xx_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE; gd->ram_size = PHYS_SDRAM_1_SIZE;
return 0; return 0;
} }

Loading…
Cancel
Save