mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 04:34:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

board: freescale: ls2080ardb: Update QIXIS code

Browse Source 
Update QIXIS related code to be executed only if CONFIG_FSL_QIXIS
flag is enabled. In case QIXIS code is not enabled, use default
sysclk value as 100MHz per board documentation.

Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Priyanka Jain 2017-04-28 10:41:34 +05:30 committed by York Sun
parent 42e8179007
commit d1418c15c8
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
board/freescale/ls2080ardb/ls2080ardb.c
View File

@ -23,8 +23,10 @@
#include <asm/arch/ppa.h> #include <asm/arch/ppa.h>
#include <fsl_sec.h> #include <fsl_sec.h>
#ifdef CONFIG_FSL_QIXIS
#include "../common/qixis.h" #include "../common/qixis.h"
#include "ls2080ardb_qixis.h" #include "ls2080ardb_qixis.h"
#endif
#include "../common/vid.h" #include "../common/vid.h"
#define PIN_MUX_SEL_SDHC 0x00 #define PIN_MUX_SEL_SDHC 0x00
@ -58,12 +60,15 @@ unsigned long long get_qixis_addr(void)
int checkboard(void) int checkboard(void)
{ {
#ifdef CONFIG_FSL_QIXIS
u8 sw; u8 sw;
#endif
char buf[15]; char buf[15];
cpu_name(buf); cpu_name(buf);
printf("Board: %s-RDB, ", buf); printf("Board: %s-RDB, ", buf);
#ifdef CONFIG_FSL_QIXIS
sw = QIXIS_READ(arch); sw = QIXIS_READ(arch);
printf("Board Arch: V%d, ", sw >> 4); printf("Board Arch: V%d, ", sw >> 4);
printf("Board version: %c, boot from ", (sw & 0xf) + 'A'); printf("Board version: %c, boot from ", (sw & 0xf) + 'A');
@ -79,7 +84,7 @@ int checkboard(void)
printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH); printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH);
printf("FPGA: v%d.%d\n", QIXIS_READ(scver), QIXIS_READ(tagdata)); printf("FPGA: v%d.%d\n", QIXIS_READ(scver), QIXIS_READ(tagdata));
#endif
puts("SERDES1 Reference : "); puts("SERDES1 Reference : ");
printf("Clock1 = 156.25MHz "); printf("Clock1 = 156.25MHz ");
printf("Clock2 = 156.25MHz"); printf("Clock2 = 156.25MHz");
@ -93,6 +98,7 @@ int checkboard(void)
unsigned long get_board_sys_clk(void) unsigned long get_board_sys_clk(void)
{ {
#ifdef CONFIG_FSL_QIXIS
u8 sysclk_conf = QIXIS_READ(brdcfg[1]); u8 sysclk_conf = QIXIS_READ(brdcfg[1]);
switch (sysclk_conf & 0x0F) { switch (sysclk_conf & 0x0F) {
@ -111,7 +117,8 @@ unsigned long get_board_sys_clk(void)
case QIXIS_SYSCLK_166: case QIXIS_SYSCLK_166:
return 166666666; return 166666666;
} }
return 66666666; #endif
return 100000000;
} }
int select_i2c_ch_pca9547(u8 ch) int select_i2c_ch_pca9547(u8 ch)
@ -134,6 +141,7 @@ int i2c_multiplexer_select_vid_channel(u8 channel)
int config_board_mux(int ctrl_type) int config_board_mux(int ctrl_type)
{ {
#ifdef CONFIG_FSL_QIXIS
u8 reg5; u8 reg5;
reg5 = QIXIS_READ(brdcfg[5]); reg5 = QIXIS_READ(brdcfg[5]);
@ -151,7 +159,7 @@ int config_board_mux(int ctrl_type)
} }
QIXIS_WRITE(brdcfg[5], reg5); QIXIS_WRITE(brdcfg[5], reg5);
#endif
return 0; return 0;
} }
@ -181,8 +189,9 @@ int board_init(void)
#endif #endif
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
#ifdef CONFIG_FSL_QIXIS
QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN);
#endif
#ifdef CONFIG_FSL_LS_PPA #ifdef CONFIG_FSL_LS_PPA
ppa_init(); ppa_init();
#endif #endif
@ -319,6 +328,7 @@ int ft_board_setup(void *blob, bd_t *bd)
void qixis_dump_switch(void) void qixis_dump_switch(void)
{ {
#ifdef CONFIG_FSL_QIXIS
int i, nr_of_cfgsw; int i, nr_of_cfgsw;
QIXIS_WRITE(cms[0], 0x00); QIXIS_WRITE(cms[0], 0x00);
@ -329,6 +339,7 @@ void qixis_dump_switch(void)
QIXIS_WRITE(cms[0], i); QIXIS_WRITE(cms[0], i);
printf("SW%d = (0x%02x)\n", i, QIXIS_READ(cms[1])); printf("SW%d = (0x%02x)\n", i, QIXIS_READ(cms[1]));
} }
#endif
} }
/* /*
@ -339,6 +350,7 @@ void update_spd_address(unsigned int ctrl_num,
unsigned int slot, unsigned int slot,
unsigned int *addr) unsigned int *addr)
{ {
#ifdef CONFIG_FSL_QIXIS
u8 sw; u8 sw;
sw = QIXIS_READ(arch); sw = QIXIS_READ(arch);
@ -348,4 +360,5 @@ void update_spd_address(unsigned int ctrl_num,
else if (ctrl_num == 1 && slot == 1) else if (ctrl_num == 1 && slot == 1)
*addr = SPD_EEPROM_ADDRESS3; *addr = SPD_EEPROM_ADDRESS3;
} }
#endif
} }