On Mon, Sep 17, 2007 at 11:57:28AM -0500, Scott Wood wrote:
> 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 <[EMAIL PROTECTED]>
[snip]
> diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
> index d028e8d..3052366 100644
> --- a/arch/powerpc/sysdev/fsl_soc.c
> +++ b/arch/powerpc/sysdev/fsl_soc.c
> @@ -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);
Shouldn't you check for "fsl,brg-frequency" here, in case of old
device trees?
> if (prop && size == 4)
> brgfreq = *prop;
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
