Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

imx: mx6ull: misc soc update

Browse source 
Update misc SOC related settings for i.MX6ULL, such as FEC mac address,
cpu speed grading and mmdc channel mask clearing.

Also update s_init to skip pfd reset.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Peng Fan 2016-08-11 14:02:45 +08:00 committed by Stefano Babic
parent 00ffa56d4b
commit 6615da4da3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/cpu/armv7/mx6/soc.c
View file

@ -126,7 +126,7 @@ u32 get_cpu_speed_grade_hz(void)
val >>= OCOTP_CFG3_SPEED_SHIFT; val >>= OCOTP_CFG3_SPEED_SHIFT;
val &= 0x3; val &= 0x3;
if (is_mx6ul()) { if (is_mx6ul() || is_mx6ull()) {
if (val == OCOTP_CFG3_SPEED_528MHZ) if (val == OCOTP_CFG3_SPEED_528MHZ)
return 528000000; return 528000000;
else if (val == OCOTP_CFG3_SPEED_696MHZ) else if (val == OCOTP_CFG3_SPEED_696MHZ)
@ -293,7 +293,7 @@ static void clear_mmdc_ch_mask(void)
reg = readl(&mxc_ccm->ccdr); reg = readl(&mxc_ccm->ccdr);
/* Clear MMDC channel mask */ /* Clear MMDC channel mask */
if (is_mx6sx() || is_mx6ul() || is_mx6sl()) if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl())
reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK); reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK);
else else
reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK | MXC_CCM_CCDR_MMDC_CH0_HS_MASK); reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK | MXC_CCM_CCDR_MMDC_CH0_HS_MASK);
@ -459,7 +459,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
struct fuse_bank4_regs *fuse = struct fuse_bank4_regs *fuse =
(struct fuse_bank4_regs *)bank->fuse_regs; (struct fuse_bank4_regs *)bank->fuse_regs;
if ((is_mx6sx() || is_mx6ul()) && dev_id == 1) { if ((is_mx6sx() || is_mx6ul() || is_mx6ull()) && dev_id == 1) {
u32 value = readl(&fuse->mac_addr2); u32 value = readl(&fuse->mac_addr2);
mac[0] = value >> 24 ; mac[0] = value >> 24 ;
mac[1] = value >> 16 ; mac[1] = value >> 16 ;
@ -523,7 +523,7 @@ void s_init(void)
u32 mask528; u32 mask528;
u32 reg, periph1, periph2; u32 reg, periph1, periph2;
if (is_mx6sx() || is_mx6ul()) if (is_mx6sx() || is_mx6ul() || is_mx6ull())
return; return;
/* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs /* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs