summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJia Hongtao <B38951@freescale.com>2011-11-15 15:04:11 +0800
committerKumar Gala <galak@kernel.crashing.org>2011-11-29 08:48:05 -0600
commit33c875366e1d3e433881a86704816cdad847532f (patch)
tree963e98153757c94893746e3e7c89a3b0871dd752 /arch
parent43f082bb7fc1c24b32a4abc693869c7d14d42829 (diff)
downloadu-boot-imx-33c875366e1d3e433881a86704816cdad847532f.zip
u-boot-imx-33c875366e1d3e433881a86704816cdad847532f.tar.gz
u-boot-imx-33c875366e1d3e433881a86704816cdad847532f.tar.bz2
powerpc/85xx: fixup flexcan device tree clock-frequency
Make the fixup matchable with dts and kernel. Update the compatible from "fsl,flexcan-v1.0" to "fsl,p1010-flexcan" and Change the "clock-freq" property to "clock-frequency". We also change flexcan frequency from CCB-clock to CCB-clock/2 according to P1010 spec. We now keep the old interfaces to make previous kernel work. They should be removed in the future. Signed-off-by: Jia Hongtao <B38951@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/mpc85xx/fdt.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 9d31568..a53a31d 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -660,8 +660,19 @@ void ft_cpu_setup(void *blob, bd_t *bd)
do_fixup_by_compat_u32(blob, "fsl,gianfar-ptp-timer",
"timer-frequency", gd->bus_clk/2, 1);
+ /*
+ * clock-freq should change to clock-frequency and
+ * flexcan-v1.0 should change to p1010-flexcan respectively
+ * in the future.
+ */
do_fixup_by_compat_u32(blob, "fsl,flexcan-v1.0",
- "clock_freq", gd->bus_clk, 1);
+ "clock_freq", gd->bus_clk/2, 1);
+
+ do_fixup_by_compat_u32(blob, "fsl,flexcan-v1.0",
+ "clock-frequency", gd->bus_clk/2, 1);
+
+ do_fixup_by_compat_u32(blob, "fsl,p1010-flexcan",
+ "clock-frequency", gd->bus_clk/2, 1);
fdt_fixup_usb(blob);
}