Re: [PATCH 2/4] [POWERPC] Update device tree binding for mpc5200 gpt

["Grant Likely" <grant.likely@secretlab.ca>]

On 10/17/07, Marian Balakowicz <m8@semihalf.com> 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.
grant.likely@secretlab.ca
(403) 399-0195