1
0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-29 09:15:21 +02:00

renmae 4740 function end with _4740

Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
This commit is contained in:
Xiangfu Liu 2010-06-07 18:12:20 +08:00
parent 5b682c28e0
commit 7dc41fd855
3 changed files with 15 additions and 15 deletions

View File

@ -11,7 +11,7 @@
#include "serial.h" #include "serial.h"
#include "board-jz4740.h" #include "board-jz4740.h"
void gpio_init() void gpio_init_4740()
{ {
__gpio_as_nand(); __gpio_as_nand();
__gpio_as_sdram_32bit(); __gpio_as_sdram_32bit();
@ -38,7 +38,7 @@ void gpio_init()
__gpio_clear_pin(GPIO_LCD_CS); __gpio_clear_pin(GPIO_LCD_CS);
} }
void pll_init() void pll_init_4740()
{ {
register unsigned int cfcr, plcr1; register unsigned int cfcr, plcr1;
int n2FR[33] = { int n2FR[33] = {
@ -92,7 +92,7 @@ static void serial_setbaud()
*uart_lcr = tmp; *uart_lcr = tmp;
} }
void serial_init() void serial_init_4740()
{ {
volatile u8* uart_fcr = (volatile u8*)(ARG_UART_BASE + OFF_FCR); volatile u8* uart_fcr = (volatile u8*)(ARG_UART_BASE + OFF_FCR);
volatile u8* uart_lcr = (volatile u8*)(ARG_UART_BASE + OFF_LCR); volatile u8* uart_lcr = (volatile u8*)(ARG_UART_BASE + OFF_LCR);
@ -126,7 +126,7 @@ void serial_init()
#define SDRAM_TRWL 7 /* Write Latency Time */ #define SDRAM_TRWL 7 /* Write Latency Time */
#define SDRAM_TREF 15625 /* Refresh period: 4096 refresh cycles/64ms */ #define SDRAM_TREF 15625 /* Refresh period: 4096 refresh cycles/64ms */
void sdram_init() void sdram_init_4740()
{ {
register unsigned int dmcr0, dmcr, sdmode, tmp, cpu_clk, mem_clk, ns; register unsigned int dmcr0, dmcr, sdmode, tmp, cpu_clk, mem_clk, ns;
@ -229,7 +229,7 @@ void sdram_init()
/* everything is ok now */ /* everything is ok now */
} }
void nand_init() void nand_init_4740()
{ {
REG_EMC_SMCR1 = 0x094c4400; REG_EMC_SMCR1 = 0x094c4400;
REG_EMC_NFCSR |= EMC_NFCSR_NFE1 | EMC_NFCSR_NFCE1; //__nand_enable() REG_EMC_NFCSR |= EMC_NFCSR_NFE1 | EMC_NFCSR_NFCE1; //__nand_enable()

View File

@ -9,11 +9,11 @@
#ifndef __BOARD_JZ4740_H__ #ifndef __BOARD_JZ4740_H__
#define __BOARD_JZ4740_H__ #define __BOARD_JZ4740_H__
void gpio_init(); void gpio_init_4740();
void pll_init(); void pll_init_4740();
void serial_init(); void serial_init_4740();
void sdram_init(); void sdram_init_4740();
void nand_init(); void nand_init_4740();
// tbd: do they have to be copied into globals? or just reference STAGE1_ARGS_ADDR? // tbd: do they have to be copied into globals? or just reference STAGE1_ARGS_ADDR?
volatile u32 ARG_EXTAL; volatile u32 ARG_EXTAL;

View File

@ -33,11 +33,11 @@ void c_main(void)
switch (ARG_CPU_ID) { switch (ARG_CPU_ID) {
case 0x4740: case 0x4740:
gpio_init(); gpio_init_4740();
serial_init(); serial_init_4740();
pll_init(); pll_init_4740();
sdram_init(); sdram_init_4740();
nand_init(); nand_init_4740();
break; break;
case 0x4760: case 0x4760:
break; break;