aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2007-08-29 15:08:40 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-10-03 20:35:43 -0500
commit6d817aa71fddea859ba02d1a0b326da930ce6b50 (patch)
treeb06061acb38cf5592c7a6480b9cd64b76679913c /arch/powerpc/boot
parent[PPC] Use cpu setup routines from cpu_setup_44x.S for ARCH=ppc (diff)
downloadlinux-dev-6d817aa71fddea859ba02d1a0b326da930ce6b50.tar.xz
linux-dev-6d817aa71fddea859ba02d1a0b326da930ce6b50.zip
[POWERPC] CPM: Change from fsl,brg-frequency to brg/clock-frequency
As suggested by David Gibson, now that we have a separate node for the baud rate generators, it's better to use the standard clock-frequency property than a cpm-node-level fsl,brg-frequency property. This patch updates existing places where fsl,brg-frequency is used. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/cuboot-8xx.c8
-rw-r--r--arch/powerpc/boot/cuboot-pq2.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/arch/powerpc/boot/cuboot-8xx.c b/arch/powerpc/boot/cuboot-8xx.c
index 88ed84015a8b..0e82015a5f95 100644
--- a/arch/powerpc/boot/cuboot-8xx.c
+++ b/arch/powerpc/boot/cuboot-8xx.c
@@ -29,10 +29,12 @@ static void platform_fixups(void)
dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 16, bd.bi_busfreq);
node = finddevice("/soc/cpm");
- if (node) {
+ if (node)
setprop(node, "clock-frequency", &bd.bi_busfreq, 4);
- setprop(node, "fsl,brg-frequency", &bd.bi_busfreq, 4);
- }
+
+ node = finddevice("/soc/cpm/brg");
+ if (node)
+ setprop(node, "clock-frequency", &bd.bi_busfreq, 4);
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
index 8021fd4a43bc..b150bd4f1b73 100644
--- a/arch/powerpc/boot/cuboot-pq2.c
+++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -264,10 +264,12 @@ static void pq2_platform_fixups(void)
dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
node = finddevice("/soc/cpm");
- if (node) {
+ if (node)
setprop(node, "clock-frequency", &bd.bi_cpmfreq, 4);
- setprop(node, "fsl,brg-frequency", &bd.bi_brgfreq, 4);
- }
+
+ node = finddevice("/soc/cpm/brg");
+ if (node)
+ setprop(node, "clock-frequency", &bd.bi_brgfreq, 4);
update_cs_ranges();
fixup_pci();