diff options
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/fdt.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/fdt.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 84bb8fab8..533d47ab4 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -403,22 +403,22 @@ static void ft_fixup_dpaa_clks(void *blob)  	get_sys_info(&sysinfo);  #ifdef CONFIG_SYS_DPAA_FMAN  	ft_fixup_clks(blob, "fsl,fman", CONFIG_SYS_FSL_FM1_OFFSET, -			sysinfo.freqFMan[0]); +			sysinfo.freq_fman[0]);  #if (CONFIG_SYS_NUM_FMAN == 2)  	ft_fixup_clks(blob, "fsl,fman", CONFIG_SYS_FSL_FM2_OFFSET, -			sysinfo.freqFMan[1]); +			sysinfo.freq_fman[1]);  #endif  #endif  #ifdef CONFIG_SYS_DPAA_QBMAN  	do_fixup_by_compat_u32(blob, "fsl,qman", -			"clock-frequency", sysinfo.freqQMAN, 1); +			"clock-frequency", sysinfo.freq_qman, 1);  #endif  #ifdef CONFIG_SYS_DPAA_PME  	do_fixup_by_compat_u32(blob, "fsl,pme", -		"clock-frequency", sysinfo.freqPME, 1); +		"clock-frequency", sysinfo.freq_pme, 1);  #endif  }  #else @@ -476,7 +476,7 @@ void fdt_fixup_fman_firmware(void *blob)  	if (!p)  		return; -	fmanfw = (struct qe_firmware *) simple_strtoul(p, NULL, 0); +	fmanfw = (struct qe_firmware *) simple_strtoul(p, NULL, 16);  	if (!fmanfw)  		return; @@ -616,7 +616,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)  	off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4);  	while (off != -FDT_ERR_NOTFOUND) {  		u32 *reg = (u32 *)fdt_getprop(blob, off, "reg", 0); -		val = cpu_to_fdt32(sysinfo.freqProcessor[*reg]); +		val = cpu_to_fdt32(sysinfo.freq_processor[*reg]);  		fdt_setprop(blob, off, "clock-frequency", &val, 4);  		off = fdt_node_offset_by_prop_value(blob, off, "device_type",  							"cpu", 4); |