On 10/17/07, Marian Balakowicz <[EMAIL PROTECTED]> wrote:
>
> Add 'fsl,' prefix to 'compatible' property for gpt nodes.
> Add 'fsl,' prefix to empty, GPT0 specific 'has-wdt' property.
>
> diff --git a/drivers/char/watchdog/mpc5200_wdt.c
> b/drivers/char/watchdog/mpc5200_wdt.c
> index 564143d..9aaba7a 100644
> --- a/drivers/char/watchdog/mpc5200_wdt.c
> +++ b/drivers/char/watchdog/mpc5200_wdt.c
> @@ -174,7 +174,7 @@ static int mpc5200_wdt_probe(struct of_d
> const void *has_wdt;
> int size;
>
> - has_wdt = of_get_property(op->node, "has-wdt", NULL);
> + has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL);
> if (!has_wdt)
> return -ENODEV;
Do this instead:
has_wdt = of_get_property(op->node, "has-wdt", NULL);
+ if (!has_wdt)
+ has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL);
if (!has_wdt)
return -ENODEV;
This will allow it to still work with older device trees.
>
> @@ -253,7 +253,7 @@ static int mpc5200_wdt_shutdown(struct o
> }
>
> static struct of_device_id mpc5200_wdt_match[] = {
> - { .compatible = "mpc5200-gpt", },
> + { .compatible = "fsl,mpc5200-gpt", },
Keep both the old and new in the match table for now for the same reason.
Otherwise, looks good. Thanks.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
[EMAIL PROTECTED]
(403) 399-0195
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
