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

Correction patch

Browse Source
This commit is contained in:
Peter Pearse 2007-11-15 08:45:13 +00:00
parent dd28e10d94
commit 2db916e144
7 changed files with 239 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

452
board/apollon/apollon.c
View File

@ -31,18 +31,32 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/sys_info.h> #include <asm/arch/sys_info.h>
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <i2c.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
void wait_for_command_complete(unsigned int wd_base); void wait_for_command_complete(unsigned int wd_base);
DECLARE_GLOBAL_DATA_PTR;
#define write_config_reg(reg, value) \
do { \
writeb(value, reg); \
} while (0)
#define mask_config_reg(reg, mask) \
do { \
char value = readb(reg) & ~(mask); \
writeb(value, reg); \
} while (0)
/******************************************************* /*******************************************************
* Routine: delay * Routine: delay
* Description: spinning delay to use before udelay works * Description: spinning delay to use before udelay works
******************************************************/ ******************************************************/
static inline void delay(unsigned long loops) { static inline void delay(unsigned long loops)
__asm__ volatile ("1:\n" "subs %0, %1, #1\n" {
"bne 1b":"=r" (loops):"0"(loops)); } __asm__("1:\n" "subs %0, %1, #1\n"
"bne 1b":"=r" (loops):"0"(loops));
}
/***************************************** /*****************************************
* Routine: board_init * Routine: board_init
@ -50,8 +64,6 @@ static inline void delay(unsigned long loops) {
*****************************************/ *****************************************/
int board_init(void) int board_init(void)
{ {
DECLARE_GLOBAL_DATA_PTR;
gpmc_init(); /* in SRAM or SDRM, finish GPMC */ gpmc_init(); /* in SRAM or SDRM, finish GPMC */
gd->bd->bi_arch_number = 919; gd->bd->bi_arch_number = 919;
@ -68,7 +80,6 @@ int board_init(void)
**********************************************************/ **********************************************************/
void s_init(void) void s_init(void)
{ {
watchdog_init(); watchdog_init();
set_muxconf_regs(); set_muxconf_regs();
delay(100); delay(100);
@ -80,7 +91,7 @@ void s_init(void)
/******************************************************* /*******************************************************
* Routine: misc_init_r * Routine: misc_init_r
* Description: Init ethernet (done here so udelay works) * Description: Init ethernet (done here so udelay works)
********************************************************/ ********************************************************/
int misc_init_r(void) int misc_init_r(void)
{ {
ether_init(); /* better done here so timers are init'ed */ ether_init(); /* better done here so timers are init'ed */
@ -102,7 +113,8 @@ void watchdog_init(void)
__raw_writel(WD_UNLOCK2, WD2_BASE + WSPR); __raw_writel(WD_UNLOCK2, WD2_BASE + WSPR);
#define MPU_WD_CLOCKED 1 #define MPU_WD_CLOCKED 1
#if MPU_WD_CLOCKED /* value 0x10 stick on aptix, BIT4 polarity seems oppsite */ #if MPU_WD_CLOCKED
/* value 0x10 stick on aptix, BIT4 polarity seems oppsite */
__raw_writel(WD_UNLOCK1, WD3_BASE + WSPR); __raw_writel(WD_UNLOCK1, WD3_BASE + WSPR);
wait_for_command_complete(WD3_BASE); wait_for_command_complete(WD3_BASE);
__raw_writel(WD_UNLOCK2, WD3_BASE + WSPR); __raw_writel(WD_UNLOCK2, WD3_BASE + WSPR);
@ -116,8 +128,9 @@ void watchdog_init(void)
/****************************************************** /******************************************************
* Routine: wait_for_command_complete * Routine: wait_for_command_complete
* Description: Wait for posting to finish on watchdog * Description: Wait for posting to finish on watchdog
******************************************************/ ******************************************************/
void wait_for_command_complete(unsigned int wd_base) { void wait_for_command_complete(unsigned int wd_base)
{
int pending = 1; int pending = 1;
do { do {
pending = __raw_readl(wd_base + WWPS); pending = __raw_readl(wd_base + WWPS);
@ -160,7 +173,7 @@ void ether_init(void)
} while (__raw_readw(LAN_RESET_REGISTER) != 0x0000); } while (__raw_readw(LAN_RESET_REGISTER) != 0x0000);
udelay(1000); udelay(1000);
*((volatile unsigned char *)ETH_CONTROL_REG) &= ~0x01; mask_config_reg(ETH_CONTROL_REG, 0x01);
udelay(1000); udelay(1000);
eth_reset_err_out: eth_reset_err_out:
@ -171,10 +184,9 @@ eth_reset_err_out:
/********************************************** /**********************************************
* Routine: dram_init * Routine: dram_init
* Description: sets uboots idea of sdram size * Description: sets uboots idea of sdram size
**********************************************/ **********************************************/
int dram_init(void) int dram_init(void)
{ {
DECLARE_GLOBAL_DATA_PTR;
unsigned int size0 = 0, size1 = 0; unsigned int size0 = 0, size1 = 0;
u32 mtype, btype, rev = 0, cpu = 0; u32 mtype, btype, rev = 0, cpu = 0;
#define NOT_EARLY 0 #define NOT_EARLY 0
@ -187,8 +199,8 @@ int dram_init(void)
display_board_info(btype); display_board_info(btype);
if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) { if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) {
printf("ddr combo\n"); /* init other chip select */
do_sdrc_init(SDRC_CS1_OSET, NOT_EARLY); /* init other chip select */ do_sdrc_init(SDRC_CS1_OSET, NOT_EARLY);
} }
size0 = get_sdr_cs_size(SDRC_CS0_OSET); size0 = get_sdr_cs_size(SDRC_CS0_OSET);
@ -224,7 +236,7 @@ void set_muxconf_regs(void)
/***************************************************************** /*****************************************************************
* Routine: peripheral_enable * Routine: peripheral_enable
* Description: Enable the clks & power for perifs (GPT2, UART1,...) * Description: Enable the clks & power for perifs (GPT2, UART1,...)
******************************************************************/ ******************************************************************/
void peripheral_enable(void) void peripheral_enable(void)
{ {
unsigned int v, if_clks = 0, func_clks = 0; unsigned int v, if_clks = 0, func_clks = 0;
@ -232,7 +244,8 @@ void peripheral_enable(void)
/* Enable GP2 timer. */ /* Enable GP2 timer. */
if_clks |= BIT4 | BIT3; if_clks |= BIT4 | BIT3;
func_clks |= BIT4 | BIT3; func_clks |= BIT4 | BIT3;
v = __raw_readl(CM_CLKSEL2_CORE) | 0x4 | 0x2; /* Sys_clk input OMAP2420_GPT2 */ /* Sys_clk input OMAP2420_GPT2 */
v = __raw_readl(CM_CLKSEL2_CORE) | 0x4 | 0x2;
__raw_writel(v, CM_CLKSEL2_CORE); __raw_writel(v, CM_CLKSEL2_CORE);
__raw_writel(0x1, CM_CLKSEL_WKUP); __raw_writel(0x1, CM_CLKSEL_WKUP);
@ -241,9 +254,11 @@ void peripheral_enable(void)
func_clks |= BIT21; func_clks |= BIT21;
if_clks |= BIT21; if_clks |= BIT21;
#endif #endif
v = __raw_readl(CM_ICLKEN1_CORE) | if_clks; /* Interface clocks on */ /* Interface clocks on */
v = __raw_readl(CM_ICLKEN1_CORE) | if_clks;
__raw_writel(v, CM_ICLKEN1_CORE); __raw_writel(v, CM_ICLKEN1_CORE);
v = __raw_readl(CM_FCLKEN1_CORE) | func_clks; /* Functional Clocks on */ /* Functional Clocks on */
v = __raw_readl(CM_FCLKEN1_CORE) | func_clks;
__raw_writel(v, CM_FCLKEN1_CORE); __raw_writel(v, CM_FCLKEN1_CORE);
delay(1000); delay(1000);
@ -266,72 +281,37 @@ void peripheral_enable(void)
*****************************************/ *****************************************/
void muxSetupUsb0(void) void muxSetupUsb0(void)
{ {
volatile uint8 *MuxConfigReg; mask_config_reg(CONTROL_PADCONF_USB0_PUEN, 0x1f);
mask_config_reg(CONTROL_PADCONF_USB0_VP, 0x1f);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_PUEN; mask_config_reg(CONTROL_PADCONF_USB0_VM, 0x1f);
*MuxConfigReg &= (uint8) (~0x1F); mask_config_reg(CONTROL_PADCONF_USB0_RCV, 0x1f);
mask_config_reg(CONTROL_PADCONF_USB0_TXEN, 0x1f);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_VP; mask_config_reg(CONTROL_PADCONF_USB0_SE0, 0x1f);
*MuxConfigReg &= (uint8) (~0x1F); mask_config_reg(CONTROL_PADCONF_USB0_DAT, 0x1f);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_VM;
*MuxConfigReg &= (uint8) (~0x1F);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_RCV;
*MuxConfigReg &= (uint8) (~0x1F);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_TXEN;
*MuxConfigReg &= (uint8) (~0x1F);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_SE0;
*MuxConfigReg &= (uint8) (~0x1F);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB0_DAT;
*MuxConfigReg &= (uint8) (~0x1F);
} }
#define CONTROL_PADCONF_USB1_RCV ((volatile uint8 *)0x480000EB)
#define CONTROL_PADCONF_USB1_TXEN ((volatile uint8 *)0x480000EC)
#define CONTROL_PADCONF_GPIO69 ((volatile uint8 *)0x480000ED)
#define CONTROL_PADCONF_GPIO70 ((volatile uint8 *)0x480000EE)
#define CONTROL_PADCONF_GPIO102 ((volatile uint8 *)0x48000116)
#define CONTROL_PADCONF_GPIO103 ((volatile uint8 *)0x48000117)
#define CONTROL_PADCONF_GPIO104 ((volatile uint8 *)0x48000118)
#define CONTROL_PADCONF_GPIO105 ((volatile uint8 *)0x48000119)
/**************************************** /****************************************
* Routine: muxSetupUSBHost (ostboot) * Routine: muxSetupUSBHost (ostboot)
* Description: Setup USB Host muxing * Description: Setup USB Host muxing
*****************************************/ *****************************************/
void muxSetupUsbHost(void) void muxSetupUsbHost(void)
{ {
volatile uint8 *MuxConfigReg;
/* V19 */ /* V19 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB1_RCV; write_config_reg(CONTROL_PADCONF_USB1_RCV, 1);
*MuxConfigReg = 1;
/* W20 */ /* W20 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_USB1_TXEN; write_config_reg(CONTROL_PADCONF_USB1_TXEN, 1);
*MuxConfigReg = 1;
/* N14 */ /* N14 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPIO69; write_config_reg(CONTROL_PADCONF_GPIO69, 3);
*MuxConfigReg = 3;
/* P15 */ /* P15 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPIO70; write_config_reg(CONTROL_PADCONF_GPIO70, 3);
*MuxConfigReg = 3;
/* L18 */ /* L18 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPIO102; write_config_reg(CONTROL_PADCONF_GPIO102, 3);
*MuxConfigReg = 3;
/* L19 */ /* L19 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPIO103; write_config_reg(CONTROL_PADCONF_GPIO103, 3);
*MuxConfigReg = 3;
/* K15 */ /* K15 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPIO104; write_config_reg(CONTROL_PADCONF_GPIO104, 3);
*MuxConfigReg = 3;
/* K14 */ /* K14 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPIO105; write_config_reg(CONTROL_PADCONF_GPIO105, 3);
*MuxConfigReg = 3;
} }
/**************************************** /****************************************
@ -340,23 +320,14 @@ void muxSetupUsbHost(void)
*****************************************/ *****************************************/
void muxSetupUART1(void) void muxSetupUART1(void)
{ {
volatile unsigned char *MuxConfigReg; /* UART1_CTS pin configuration, PIN = D21, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_UART1_CTS, 0);
/* UART1_CTS pin configuration, PIN = D21 */ /* UART1_RTS pin configuration, PIN = H21, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_UART1_CTS; write_config_reg(CONTROL_PADCONF_UART1_RTS, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* UART1_TX pin configuration, PIN = L20, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_UART1_TX, 0);
/* UART1_RTS pin configuration, PIN = H21 */ /* UART1_RX pin configuration, PIN = T21, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_UART1_RTS; write_config_reg(CONTROL_PADCONF_UART1_RX, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* UART1_TX pin configuration, PIN = L20 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_UART1_TX;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* UART1_RX pin configuration, PIN = T21 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_UART1_RX;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
} }
/**************************************** /****************************************
@ -365,95 +336,50 @@ void muxSetupUART1(void)
*****************************************/ *****************************************/
void muxSetupLCD(void) void muxSetupLCD(void)
{ {
volatile unsigned char *MuxConfigReg; /* LCD_D0 pin configuration, PIN = Y7, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D0, 0);
/* LCD_D0 pin configuration, PIN = Y7 */ /* LCD_D1 pin configuration, PIN = P10 , Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D0; write_config_reg(CONTROL_PADCONF_DSS_D1, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D2 pin configuration, PIN = V8, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D2, 0);
/* LCD_D1 pin configuration, PIN = P10 */ /* LCD_D3 pin configuration, PIN = Y8, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D1; write_config_reg(CONTROL_PADCONF_DSS_D3, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D4 pin configuration, PIN = W8, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D4, 0);
/* LCD_D2 pin configuration, PIN = V8 */ /* LCD_D5 pin configuration, PIN = R10, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D2; write_config_reg(CONTROL_PADCONF_DSS_D5, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D6 pin configuration, PIN = Y9, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D6, 0);
/* LCD_D3 pin configuration, PIN = Y8 */ /* LCD_D7 pin configuration, PIN = V9, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D3; write_config_reg(CONTROL_PADCONF_DSS_D7, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D8 pin configuration, PIN = W9, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D8, 0);
/* LCD_D4 pin configuration, PIN = W8 */ /* LCD_D9 pin configuration, PIN = P11, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D4; write_config_reg(CONTROL_PADCONF_DSS_D9, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D10 pin configuration, PIN = V10, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D10, 0);
/* LCD_D5 pin configuration, PIN = R10 */ /* LCD_D11 pin configuration, PIN = Y10, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D5; write_config_reg(CONTROL_PADCONF_DSS_D11, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D12 pin configuration, PIN = W10, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D12, 0);
/* LCD_D6 pin configuration, PIN = Y9 */ /* LCD_D13 pin configuration, PIN = R11, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D6; write_config_reg(CONTROL_PADCONF_DSS_D13, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D14 pin configuration, PIN = V11, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D14, 0);
/* LCD_D7 pin configuration, PIN = V9 */ /* LCD_D15 pin configuration, PIN = W11, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D7; write_config_reg(CONTROL_PADCONF_DSS_D15, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_D16 pin configuration, PIN = P12, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_D16, 0);
/* LCD_D8 pin configuration, PIN = W9 */ /* LCD_D17 pin configuration, PIN = R12, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D8; write_config_reg(CONTROL_PADCONF_DSS_D17, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_PCLK pin configuration, PIN = W6, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_PCLK, 0);
/* LCD_D9 pin configuration, PIN = P11 */ /* LCD_VSYNC pin configuration, PIN = V7, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D9; write_config_reg(CONTROL_PADCONF_DSS_VSYNC, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* LCD_HSYNC pin configuration, PIN = Y6, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_DSS_HSYNC, 0);
/* LCD_D10 pin configuration, PIN = V10 */ /* LCD_ACBIAS pin configuration, PIN = W7, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D10; write_config_reg(CONTROL_PADCONF_DSS_ACBIAS, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D11 pin configuration, PIN = Y10 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D11;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D12 pin configuration, PIN = W10 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D12;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D13 pin configuration, PIN = R11 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D13;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D14 pin configuration, PIN = V11 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D14;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D15 pin configuration, PIN = W11 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D15;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D16 pin configuration, PIN = P12 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D16;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_D17 pin configuration, PIN = R12 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_D17;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_PCLK pin configuration, PIN = W6 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_PCLK;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_VSYNC pin configuration, PIN = V7 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_VSYNC;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_HSYNC pin configuration, PIN = Y6 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_HSYNC;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* LCD_ACBIAS pin configuration, PIN = W7 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_DSS_ACBIAS;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
} }
/**************************************** /****************************************
@ -462,146 +388,84 @@ void muxSetupLCD(void)
*****************************************/ *****************************************/
void muxSetupMMCSD(void) void muxSetupMMCSD(void)
{ {
volatile unsigned char *MuxConfigReg; /* SDMMC_CLKI pin configuration, PIN = H15, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_MMC_CLKI, 0);
/* SDMMC_CLKI pin configuration, PIN = H15 */ /* SDMMC_CLKO pin configuration, PIN = G19, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_CLKI; write_config_reg(CONTROL_PADCONF_MMC_CLKO, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* SDMMC_CMD pin configuration, PIN = H18, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_MMC_CMD, 0);
/* SDMMC_CLKO pin configuration, PIN = G19 */ /* SDMMC_DAT0 pin configuration, PIN = F20, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_CLKO; write_config_reg(CONTROL_PADCONF_MMC_DAT0, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* SDMMC_DAT1 pin configuration, PIN = H14, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_MMC_DAT1, 0);
/* SDMMC_CMD pin configuration, PIN = H18 */ /* SDMMC_DAT2 pin configuration, PIN = E19, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_CMD; write_config_reg(CONTROL_PADCONF_MMC_DAT2, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* SDMMC_DAT3 pin configuration, PIN = D19, Mode = 0, PUPD=Disabled */
/* External pull-ups are present. */ write_config_reg(CONTROL_PADCONF_MMC_DAT3, 0);
/* *MuxConfigReg |= 0x18 ; #/ PullUDEnable=Enabled, PullTypeSel=PU */ /* SDMMC_DDIR0 pin configuration, PIN = F19, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_MMC_DAT_DIR0, 0);
/* SDMMC_DAT0 pin configuration, PIN = F20 */ /* SDMMC_DDIR1 pin configuration, PIN = E20, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT0; write_config_reg(CONTROL_PADCONF_MMC_DAT_DIR1, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* SDMMC_DDIR2 pin configuration, PIN = F18, Mode = 0, PUPD=Disabled */
/* External pull-ups are present. */ write_config_reg(CONTROL_PADCONF_MMC_DAT_DIR2, 0);
/* *MuxConfigReg |= 0x18 ; #/ PullUDEnable=Enabled, PullTypeSel=PU */ /* SDMMC_DDIR3 pin configuration, PIN = E18, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_MMC_DAT_DIR3, 0);
/* SDMMC_DAT1 pin configuration, PIN = H14 */ /* SDMMC_CDIR pin configuration, PIN = G18, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT1; write_config_reg(CONTROL_PADCONF_MMC_CMD_DIR, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* External pull-ups are present. */
/* *MuxConfigReg |= 0x18 ; #/ PullUDEnable=Enabled, PullTypeSel=PU */
/* SDMMC_DAT2 pin configuration, PIN = E19 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT2;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* External pull-ups are present. */
/* *MuxConfigReg |= 0x18 ; #/ PullUDEnable=Enabled, PullTypeSel=PU */
/* SDMMC_DAT3 pin configuration, PIN = D19 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT3;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* External pull-ups are present. */
/* *MuxConfigReg |= 0x18 ; #/ PullUDEnable=Enabled, PullTypeSel=PU */
/* SDMMC_DDIR0 pin configuration, PIN = F19 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT_DIR0;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* SDMMC_DDIR1 pin configuration, PIN = E20 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT_DIR1;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* SDMMC_DDIR2 pin configuration, PIN = F18 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT_DIR2;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* SDMMC_DDIR3 pin configuration, PIN = E18 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_DAT_DIR3;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* SDMMC_CDIR pin configuration, PIN = G18 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_MMC_CMD_DIR;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
} }
/****************************************** /******************************************
* Routine: muxSetupTouchScreen (ostboot) * Routine: muxSetupTouchScreen (ostboot)
* Description: Set up touch screen muxing * Description: Set up touch screen muxing
*******************************************/ *******************************************/
void muxSetupTouchScreen(void) void muxSetupTouchScreen(void)
{ {
volatile unsigned char *MuxConfigReg; /* SPI1_CLK pin configuration, PIN = U18, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_SPI1_CLK, 0);
/* SPI1_CLK pin configuration, PIN = U18 */ /* SPI1_MOSI pin configuration, PIN = V20, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_SPI1_CLK; write_config_reg(CONTROL_PADCONF_SPI1_SIMO, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */ /* SPI1_MISO pin configuration, PIN = T18, Mode = 0, PUPD=Disabled */
write_config_reg(CONTROL_PADCONF_SPI1_SOMI, 0);
/* SPI1_MOSI pin configuration, PIN = V20 */ /* SPI1_nCS0 pin configuration, PIN = U19, Mode = 0, PUPD=Disabled */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_SPI1_SIMO; write_config_reg(CONTROL_PADCONF_SPI1_NCS0, 0);
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* SPI1_MISO pin configuration, PIN = T18 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_SPI1_SOMI;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
/* SPI1_nCS0 pin configuration, PIN = U19 */
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_SPI1_NCS0;
*MuxConfigReg = 0x00; /* Mode = 0, PUPD=Disabled */
#define CONTROL_PADCONF_GPIO85 CONTROL_PADCONF_SPI1_NCS1 #define CONTROL_PADCONF_GPIO85 CONTROL_PADCONF_SPI1_NCS1
/* PEN_IRQ pin configuration, PIN = N15, Mode = 3, PUPD=Disabled */
/* PEN_IRQ pin configuration, PIN = N15 */ write_config_reg(CONTROL_PADCONF_GPIO85, 3);
MuxConfigReg = (volatile unsigned char *)CONTROL_PADCONF_GPIO85;
*MuxConfigReg = 0x03; /* Mode = 3, PUPD=Disabled */
} }
/*************************************************************** /***************************************************************
* Routine: muxSetupGPMC (ostboot) * Routine: muxSetupGPMC (ostboot)
* Description: Configures balls which cam up in protected mode * Description: Configures balls which cam up in protected mode
***************************************************************/ ***************************************************************/
void muxSetupGPMC(void) void muxSetupGPMC(void)
{ {
volatile uint8 *MuxConfigReg; /* gpmc_io_dir, MCR */
volatile unsigned int *MCR = (volatile unsigned int *)0x4800008C; writel(0x4800008C, 0x19000000);
/* gpmc_io_dir */
*MCR = 0x19000000;
/* NOR FLASH CS0 */ /* NOR FLASH CS0 */
/* signal - Gpmc_clk; /* signal - Gpmc_clk; pin - J4; offset - 0x0088; mode 0; Byte-3 */
pin - J4; offset - 0x0088; mode - 0; Byte-3 Pull/up - N/A */ write_config_reg(CONTROL_PADCONF_GPMC_D2_BYTE3, 0);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPMC_D2_BYTE3;
*MuxConfigReg = 0x00;
/* MPDB(Multi Port Debug Port) CS1 */ /* MPDB(Multi Port Debug Port) CS1 */
/* signal - gpmc_ncs1; /* signal - gpmc_ncs1; pin - N8; offset - 0x008D; mode 0; Byte-1 */
pin - N8; offset - 0x008C; mode - 0; Byte-1 Pull/up - N/A */ write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE1, 0);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPMC_NCS0_BYTE1; /* signal - Gpmc_ncs2; pin - E2; offset - 0x008E; mode 0; Byte-2 */
*MuxConfigReg = 0x00; write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE2, 0);
/* signal - Gpmc_ncs3; pin - N2; offset - 0x008F; mode 0; Byte-3 */
/* signal - Gpmc_ncs2; write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE3, 0);
pin - E2; offset - 0x008C; mode - 0; Byte-2 Pull/up - N/A */ /* signal - Gpmc_ncs4; pin - ??; offset - 0x0090; mode 0; Byte-4 */
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPMC_NCS0_BYTE2; write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE4, 0);
*MuxConfigReg = 0x00; /* signal - Gpmc_ncs5; pin - ??; offset - 0x0091; mode 0; Byte-5 */
write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE5, 0);
/* signal - Gpmc_ncs3; /* signal - Gpmc_ncs6; pin - ??; offset - 0x0092; mode 0; Byte-6 */
pin - N2; offset - 0x008C; mode - 0; Byte-3 Pull/up - N/A */ write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE6, 0);
MuxConfigReg = (volatile uint8 *)CONTROL_PADCONF_GPMC_NCS0_BYTE3; /* signal - Gpmc_ncs7; pin - ??; offset - 0x0093; mode 0; Byte-7 */
*MuxConfigReg = 0x00; write_config_reg(CONTROL_PADCONF_GPMC_NCS0_BYTE7, 0);
MuxConfigReg = (volatile uint8 *)((volatile unsigned char *)0x48000090);
*MuxConfigReg = 0x00;
MuxConfigReg = (volatile uint8 *)((volatile unsigned char *)0x48000091);
*MuxConfigReg = 0x00;
MuxConfigReg = (volatile uint8 *)((volatile unsigned char *)0x48000092);
*MuxConfigReg = 0x00;
MuxConfigReg = (volatile uint8 *)((volatile unsigned char *)0x48000093);
*MuxConfigReg = 0x00;
} }
/**************************************************************** /****************************************************************
* Routine: muxSetupSDRC (ostboot) * Routine: muxSetupSDRC (ostboot)
* Description: Configures balls which come up in protected mode * Description: Configures balls which come up in protected mode
****************************************************************/ ****************************************************************/
void muxSetupSDRC(void) void muxSetupSDRC(void)
{ {
/* It's set by IPL */ /* It's set by IPL */

12
board/apollon/lowlevel_init.S
View File

@ -34,13 +34,13 @@
#define APOLLON_CS0_BASE 0x00000000 #define APOLLON_CS0_BASE 0x00000000
#ifdef PRCM_CONFIG_I #ifdef PRCM_CONFIG_I
# define SDRC_ACTIM_CTRLA_0_VAL 0x7BA35907 #define SDRC_ACTIM_CTRLA_0_VAL 0x7BA35907
# define SDRC_ACTIM_CTRLB_0_VAL 0x00000013 #define SDRC_ACTIM_CTRLB_0_VAL 0x00000013
# define SDRC_RFR_CTRL_0_VAL 0x00044C01 #define SDRC_RFR_CTRL_0_VAL 0x00044C01
#elif defined(PRCM_CONFIG_II) #elif defined(PRCM_CONFIG_II)
# define SDRC_ACTIM_CTRLA_0_VAL 0x4A59B485 #define SDRC_ACTIM_CTRLA_0_VAL 0x4A59B485
# define SDRC_ACTIM_CTRLB_0_VAL 0x0000000C #define SDRC_ACTIM_CTRLB_0_VAL 0x0000000C
# define SDRC_RFR_CTRL_0_VAL 0x00030001 #define SDRC_RFR_CTRL_0_VAL 0x00030001
#endif #endif
#define SDRAM_BASE_ADDRESS 0x80008000 #define SDRAM_BASE_ADDRESS 0x80008000

41
board/apollon/mem.c
View File

@ -39,20 +39,19 @@
* is necessary until timers are accessible. * is necessary until timers are accessible.
* *
* not inline to increase chances its in cache when called * not inline to increase chances its in cache when called
*************************************************************/ *************************************************************/
void sdelay(unsigned long loops) void sdelay(unsigned long loops)
{ {
__asm__ volatile ("1:\n" "subs %0, %1, #1\n" __asm__("1:\n" "subs %0, %1, #1\n"
"bne 1b":"=r" (loops):"0"(loops)); "bne 1b":"=r" (loops):"0"(loops));
} }
/***************************************************************************** /********************************************************************
* prcm_init() - inits clocks for PRCM as defined in clocks.h * prcm_init() - inits clocks for PRCM as defined in clocks.h
* (config II default). Called from SRAM, or Flash (using temp SRAM stack). * (config II default).
*****************************************************************************/ * -- called from SRAM, or Flash (using temp SRAM stack).
void prcm_init(void) ********************************************************************/
{ void prcm_init(void) { }
}
/************************************************************************** /**************************************************************************
* make_cs1_contiguous() - for es2 and above remap cs1 behind cs0 to allow * make_cs1_contiguous() - for es2 and above remap cs1 behind cs0 to allow
@ -69,6 +68,7 @@ void make_cs1_contiguous(void)
a_add_high = (size & 3) << 8; /* set up low field */ a_add_high = (size & 3) << 8; /* set up low field */
a_add_low = (size & 0x3C) >> 2; /* set up high field */ a_add_low = (size & 0x3C) >> 2; /* set up high field */
__raw_writel((a_add_high | a_add_low), SDRC_CS_CFG); __raw_writel((a_add_high | a_add_low), SDRC_CS_CFG);
} }
/******************************************************** /********************************************************
@ -81,13 +81,18 @@ u32 mem_ok(void)
u32 val1, val2; u32 val1, val2;
u32 pattern = 0x12345678; u32 pattern = 0x12345678;
__raw_writel(0x0, OMAP2420_SDRC_CS0 + 0x400); /* clear pos A */ /* clear pos A */
__raw_writel(pattern, OMAP2420_SDRC_CS0); /* pattern to pos B */ __raw_writel(0x0, OMAP2420_SDRC_CS0 + 0x400);
__raw_writel(0x0, OMAP2420_SDRC_CS0 + 4); /* remove pattern off the bus */ /* pattern to pos B */
val1 = __raw_readl(OMAP2420_SDRC_CS0 + 0x400); /* get pos A value */ __raw_writel(pattern, OMAP2420_SDRC_CS0);
/* remove pattern off the bus */
__raw_writel(0x0, OMAP2420_SDRC_CS0 + 4);
/* get pos A value */
val1 = __raw_readl(OMAP2420_SDRC_CS0 + 0x400);
val2 = __raw_readl(OMAP2420_SDRC_CS0); /* get val2 */ val2 = __raw_readl(OMAP2420_SDRC_CS0); /* get val2 */
if ((val1 != 0) || (val2 != pattern)) /* see if pos A value changed */ /* see if pos A value changed */
if ((val1 != 0) || (val2 != pattern))
return (0); return (0);
else else
return (1); return (1);
@ -142,9 +147,11 @@ void gpmc_init(void)
__raw_writel(0x0, GPMC_IRQENABLE); /* isr's sources masked */ __raw_writel(0x0, GPMC_IRQENABLE); /* isr's sources masked */
__raw_writel(tval, GPMC_TIMEOUT_CONTROL); /* timeout disable */ __raw_writel(tval, GPMC_TIMEOUT_CONTROL); /* timeout disable */
#ifdef CFG_NAND_BOOT #ifdef CFG_NAND_BOOT
__raw_writel(0x001, GPMC_CONFIG); /* set nWP, disable limited addr */ /* set nWP, disable limited addr */
__raw_writel(0x001, GPMC_CONFIG);
#else #else
__raw_writel(0x111, GPMC_CONFIG); /* set nWP, disable limited addr */ /* set nWP, disable limited addr */
__raw_writel(0x111, GPMC_CONFIG);
#endif #endif
/* discover bus connection from sysboot */ /* discover bus connection from sysboot */
@ -164,7 +171,8 @@ void gpmc_init(void)
__raw_writel(APOLLON_24XX_GPMC_CONFIG4_3, GPMC_CONFIG4_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG4_3, GPMC_CONFIG4_0);
__raw_writel(APOLLON_24XX_GPMC_CONFIG5_3, GPMC_CONFIG5_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG5_3, GPMC_CONFIG5_0);
__raw_writel(APOLLON_24XX_GPMC_CONFIG6_3, GPMC_CONFIG6_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG6_3, GPMC_CONFIG6_0);
__raw_writel(APOLLON_24XX_GPMC_CONFIG7_3, GPMC_CONFIG7_0); #else __raw_writel(APOLLON_24XX_GPMC_CONFIG7_3, GPMC_CONFIG7_0);
#else
__raw_writel(APOLLON_24XX_GPMC_CONFIG1_0 | mux | mtype | mwidth, __raw_writel(APOLLON_24XX_GPMC_CONFIG1_0 | mux | mtype | mwidth,
GPMC_CONFIG1_0); GPMC_CONFIG1_0);
__raw_writel(APOLLON_24XX_GPMC_CONFIG2_0, GPMC_CONFIG2_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG2_0, GPMC_CONFIG2_0);
@ -172,7 +180,6 @@ void gpmc_init(void)
__raw_writel(APOLLON_24XX_GPMC_CONFIG4_0, GPMC_CONFIG4_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG4_0, GPMC_CONFIG4_0);
__raw_writel(APOLLON_24XX_GPMC_CONFIG5_0, GPMC_CONFIG5_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG5_0, GPMC_CONFIG5_0);
__raw_writel(APOLLON_24XX_GPMC_CONFIG6_0, GPMC_CONFIG6_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG6_0, GPMC_CONFIG6_0);
/* enable new mapping */
__raw_writel(APOLLON_24XX_GPMC_CONFIG7_0, GPMC_CONFIG7_0); __raw_writel(APOLLON_24XX_GPMC_CONFIG7_0, GPMC_CONFIG7_0);
#endif #endif
sdelay(2000); sdelay(2000);

16
board/apollon/mem.h
View File

@ -44,15 +44,15 @@
#define APOLLON_242x_SDRC_DLLAB_CTRL_166MHz 0x00000506 #define APOLLON_242x_SDRC_DLLAB_CTRL_166MHz 0x00000506
#ifdef PRCM_CONFIG_I #ifdef PRCM_CONFIG_I
# define APOLLON_2420_SDRC_ACTIM_CTRLA_0 APOLLON_242X_SDRC_ACTIM_CTRLA_0_166MHz #define APOLLON_2420_SDRC_ACTIM_CTRLA_0 APOLLON_242X_SDRC_ACTIM_CTRLA_0_166MHz
# define APOLLON_2420_SDRC_ACTIM_CTRLB_0 APOLLON_242X_SDRC_ACTIM_CTRLB_0_166MHz #define APOLLON_2420_SDRC_ACTIM_CTRLB_0 APOLLON_242X_SDRC_ACTIM_CTRLB_0_166MHz
# define APOLLON_2420_SDRC_RFR_CTRL APOLLON_242X_SDRC_RFR_CTRL_166MHz #define APOLLON_2420_SDRC_RFR_CTRL APOLLON_242X_SDRC_RFR_CTRL_166MHz
# define APOLLON_2420_SDRC_DLLAB_CTRL APOLLON_242x_SDRC_DLLAB_CTRL_166MHz #define APOLLON_2420_SDRC_DLLAB_CTRL APOLLON_242x_SDRC_DLLAB_CTRL_166MHz
#elif PRCM_CONFIG_II #elif PRCM_CONFIG_II
# define APOLLON_2420_SDRC_ACTIM_CTRLA_0 APOLLON_242X_SDRC_ACTIM_CTRLA_0_100MHz #define APOLLON_2420_SDRC_ACTIM_CTRLA_0 APOLLON_242X_SDRC_ACTIM_CTRLA_0_100MHz
# define APOLLON_2420_SDRC_ACTIM_CTRLB_0 APOLLON_242X_SDRC_ACTIM_CTRLB_0_100MHz #define APOLLON_2420_SDRC_ACTIM_CTRLB_0 APOLLON_242X_SDRC_ACTIM_CTRLB_0_100MHz
# define APOLLON_2420_SDRC_RFR_CTRL APOLLON_242X_SDRC_RFR_CTRL_100MHz #define APOLLON_2420_SDRC_RFR_CTRL APOLLON_242X_SDRC_RFR_CTRL_100MHz
# define APOLLON_2420_SDRC_DLLAB_CTRL APOLLON_242x_SDRC_DLLAB_CTRL_100MHz #define APOLLON_2420_SDRC_DLLAB_CTRL APOLLON_242x_SDRC_DLLAB_CTRL_100MHz
#endif #endif
/* GPMC settings */ /* GPMC settings */

29
board/apollon/sys_info.c
View File

@ -39,6 +39,7 @@ static u32 get_prod_id(void)
p = __raw_readl(PRODUCTION_ID); /* get production ID */ p = __raw_readl(PRODUCTION_ID); /* get production ID */
return ((p & CPU_242X_PID_MASK) >> 16); return ((p & CPU_242X_PID_MASK) >> 16);
} }
/************************************************************************** /**************************************************************************
* get_cpu_type() - low level get cpu type * get_cpu_type() - low level get cpu type
* - no C globals yet. * - no C globals yet.
@ -68,7 +69,8 @@ u32 get_cpu_type(void)
v = __raw_readl(TAP_IDCODE_REG); v = __raw_readl(TAP_IDCODE_REG);
v &= CPU_24XX_ID_MASK; v &= CPU_24XX_ID_MASK;
if (v == CPU_2420_CHIPID) { /* currently 2420 and 2422 have same id */ /* currently 2420 and 2422 have same id */
if (v == CPU_2420_CHIPID) {
if (is_gpmc_muxed() == GPMC_MUXED) /* if mux'ed */ if (is_gpmc_muxed() == GPMC_MUXED) /* if mux'ed */
return (CPU_2420); return (CPU_2420);
else else
@ -127,8 +129,7 @@ u32 get_mem_type(void)
return (DDR_DISCRETE); /* origional SDP */ return (DDR_DISCRETE); /* origional SDP */
} }
/********************************************************************** /***********************************************************************
*
* get_cs0_size() - get size of chip select 0/1 * get_cs0_size() - get size of chip select 0/1
************************************************************************/ ************************************************************************/
u32 get_sdr_cs_size(u32 offset) u32 get_sdr_cs_size(u32 offset)
@ -140,8 +141,7 @@ u32 get_sdr_cs_size(u32 offset)
return (size); return (size);
} }
/********************************************************************** /***********************************************************************
*
* get_board_type() - get board type based on current production stats. * get_board_type() - get board type based on current production stats.
* --- NOTE: 2 I2C EEPROMs will someday be populated with proper info. * --- NOTE: 2 I2C EEPROMs will someday be populated with proper info.
* when they are available we can get info from there. This should * when they are available we can get info from there. This should
@ -149,17 +149,12 @@ u32 get_sdr_cs_size(u32 offset)
************************************************************************/ ************************************************************************/
u32 get_board_type(void) u32 get_board_type(void)
{ {
#if 0
if (i2c_probe(I2C_MENELAUS) == 0)
return (BOARD_H4_MENELAUS);
else
#endif
return (BOARD_H4_SDP); return (BOARD_H4_SDP);
} }
/****************************************************************** /******************************************************************
* get_sysboot_value() - get init word settings (dip switch on h4) * get_sysboot_value() - get init word settings (dip switch on h4)
******************************************************************/ ******************************************************************/
inline u32 get_sysboot_value(void) inline u32 get_sysboot_value(void)
{ {
return (0x00000FFF & __raw_readl(CONTROL_STATUS)); return (0x00000FFF & __raw_readl(CONTROL_STATUS));
@ -175,7 +170,7 @@ inline u32 get_sysboot_value(void)
* -- 4 to flash * -- 4 to flash
* -- 8 to enent * -- 8 to enent
* -- c to wifi * -- c to wifi
***************************************************************************/ ****************************************************************************/
u32 get_gpmc0_base(void) u32 get_gpmc0_base(void)
{ {
u32 b; u32 b;
@ -231,8 +226,8 @@ u32 get_gpmc0_width(void)
* wait_on_value() - common routine to allow waiting for changes in * wait_on_value() - common routine to allow waiting for changes in
* volatile regs. * volatile regs.
*********************************************************************/ *********************************************************************/
u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 bound)
u32 bound) { {
u32 i = 0, val; u32 i = 0, val;
do { do {
++i; ++i;
@ -304,7 +299,8 @@ void display_board_info(u32 btype)
} }
printf("OMAP%s-%s revision %d\n", cpu_s, sec_s, rev - 1); printf("OMAP%s-%s revision %d\n", cpu_s, sec_s, rev - 1);
printf("Samsung Apollon SDP Base Board + %s \n", mem_s); } printf("Samsung Apollon SDP Base Board + %s \n", mem_s);
}
/************************************************************************* /*************************************************************************
* get_board_rev() - setup to pass kernel board revision information * get_board_rev() - setup to pass kernel board revision information
@ -316,9 +312,8 @@ u32 get_board_rev(void)
u32 rev = 0; u32 rev = 0;
u32 btype = get_board_type(); u32 btype = get_board_type();
if (btype == BOARD_H4_MENELAUS) { if (btype == BOARD_H4_MENELAUS)
rev = 1; rev = 1;
}
return (rev); return (rev);
} }

1
board/apollon/u-boot.lds
View File

@ -61,4 +61,3 @@ SECTIONS
.bss : { *(.bss) } .bss : { *(.bss) }
_end = .; _end = .;
} }

18
include/asm-arm/arch-arm1136/mux.h
View File

@ -54,6 +54,10 @@ void muxSetupHDQ(void);
#define CONTROL_PADCONF_GPMC_NCS0_BYTE1 ((volatile unsigned char *)0x4800008D) #define CONTROL_PADCONF_GPMC_NCS0_BYTE1 ((volatile unsigned char *)0x4800008D)
#define CONTROL_PADCONF_GPMC_NCS0_BYTE2 ((volatile unsigned char *)0x4800008E) #define CONTROL_PADCONF_GPMC_NCS0_BYTE2 ((volatile unsigned char *)0x4800008E)
#define CONTROL_PADCONF_GPMC_NCS0_BYTE3 ((volatile unsigned char *)0x4800008F) #define CONTROL_PADCONF_GPMC_NCS0_BYTE3 ((volatile unsigned char *)0x4800008F)
#define CONTROL_PADCONF_GPMC_NCS0_BYTE4 (0x48000090)
#define CONTROL_PADCONF_GPMC_NCS0_BYTE5 (0x48000091)
#define CONTROL_PADCONF_GPMC_NCS0_BYTE6 (0x48000092)
#define CONTROL_PADCONF_GPMC_NCS0_BYTE7 (0x48000093)
/* Pin Muxing registers used for SDRC */ /* Pin Muxing registers used for SDRC */
#define CONTROL_PADCONF_SDRC_NCS0_BYTE0 ((volatile unsigned char *)0x480000A0) #define CONTROL_PADCONF_SDRC_NCS0_BYTE0 ((volatile unsigned char *)0x480000A0)
@ -71,7 +75,7 @@ void muxSetupHDQ(void);
#define CONTROL_PADCONF_SPI1_SIMO ((volatile unsigned char *)0x48000100) #define CONTROL_PADCONF_SPI1_SIMO ((volatile unsigned char *)0x48000100)
#define CONTROL_PADCONF_SPI1_SOMI ((volatile unsigned char *)0x48000101) #define CONTROL_PADCONF_SPI1_SOMI ((volatile unsigned char *)0x48000101)
#define CONTROL_PADCONF_SPI1_NCS0 ((volatile unsigned char *)0x48000102) #define CONTROL_PADCONF_SPI1_NCS0 ((volatile unsigned char *)0x48000102)
#define CONTROL_PADCONF_SPI1_NCS1 ((volatile unsigned char *)0x48000103) #define CONTROL_PADCONF_SPI1_NCS1 (0x48000103)
#define CONTROL_PADCONF_MCBSP1_FSR ((volatile unsigned char *)0x4800010B) #define CONTROL_PADCONF_MCBSP1_FSR ((volatile unsigned char *)0x4800010B)
@ -153,8 +157,20 @@ void muxSetupHDQ(void);
#define CONTROL_PADCONF_USB0_SE0 ((volatile uint8 *)0x48000122) #define CONTROL_PADCONF_USB0_SE0 ((volatile uint8 *)0x48000122)
#define CONTROL_PADCONF_USB0_DAT ((volatile uint8 *)0x48000123) #define CONTROL_PADCONF_USB0_DAT ((volatile uint8 *)0x48000123)
/* Pin Muxing registres used for USB1. */
#define CONTROL_PADCONF_USB1_RCV (0x480000EB)
#define CONTROL_PADCONF_USB1_TXEN (0x480000EC)
/* Pin Muxing registers used for UART3/IRDA */ /* Pin Muxing registers used for UART3/IRDA */
#define CONTROL_PADCONF_UART3_TX_IRTX ((volatile uint8 *)0x48000118) #define CONTROL_PADCONF_UART3_TX_IRTX ((volatile uint8 *)0x48000118)
#define CONTROL_PADCONF_UART3_RX_IRRX ((volatile uint8 *)0x48000119) #define CONTROL_PADCONF_UART3_RX_IRRX ((volatile uint8 *)0x48000119)
/* Pin Muxing registers used for GPIO */
#define CONTROL_PADCONF_GPIO69 (0x480000ED)
#define CONTROL_PADCONF_GPIO70 (0x480000EE)
#define CONTROL_PADCONF_GPIO102 (0x48000116)
#define CONTROL_PADCONF_GPIO103 (0x48000117)
#define CONTROL_PADCONF_GPIO104 (0x48000118)
#define CONTROL_PADCONF_GPIO105 (0x48000119)
#endif #endif