[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>
This commit is contained in:
Родитель
26f571d7c9
Коммит
6d817aa71f
|
@ -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,
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -73,22 +73,26 @@ static u32 brgfreq = -1;
|
|||
u32 get_brgfreq(void)
|
||||
{
|
||||
struct device_node *node;
|
||||
const unsigned int *prop;
|
||||
int size;
|
||||
|
||||
if (brgfreq != -1)
|
||||
return brgfreq;
|
||||
|
||||
node = of_find_compatible_node(NULL, NULL, "fsl,cpm1");
|
||||
if (!node)
|
||||
node = of_find_compatible_node(NULL, NULL, "fsl,cpm2");
|
||||
if (!node)
|
||||
node = of_find_node_by_type(NULL, "cpm");
|
||||
node = of_find_compatible_node(NULL, NULL, "fsl,cpm-brg");
|
||||
if (node) {
|
||||
int size;
|
||||
const unsigned int *prop;
|
||||
prop = of_get_property(node, "clock-frequency", &size);
|
||||
if (prop && size == 4)
|
||||
brgfreq = *prop;
|
||||
|
||||
prop = of_get_property(node, "fsl,brg-frequency", &size);
|
||||
if (!prop)
|
||||
prop = of_get_property(node, "brg-frequency", &size);
|
||||
of_node_put(node);
|
||||
return brgfreq;
|
||||
}
|
||||
|
||||
/* Legacy device binding -- will go away when no users are left. */
|
||||
node = of_find_node_by_type(NULL, "cpm");
|
||||
if (node) {
|
||||
prop = of_get_property(node, "brg-frequency", &size);
|
||||
if (prop && size == 4)
|
||||
brgfreq = *prop;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче