>
> It's already in Linus' tree.
Yeah, the problem is what's merged in linus's tree has p4080 listed and it
shouldn't
>
> Thanks,
>
> - - - -
> commit cd1542c8197fc3c2eb3a8301505d5d9738fab1e4
> Author: Anton Vorontsov <avoront...@mvista.com>
> Date: Tue Aug 10 18:03:21 2010 -0700
>
> edac: mpc85xx: add support for new MPCxxx/Pxxxx EDAC controllers
>
> Simply add proper IDs into the device table.
>
> Signed-off-by: Anton Vorontsov <avoront...@mvista.com>
> Cc: Scott Wood <scottw...@freescale.com>
> Cc: Peter Tyser <pty...@xes-inc.com>
> Cc: Dave Jiang <dji...@mvista.com>
> Cc: Doug Thompson <dougthomp...@xmission.com>
> Signed-off-by: Andrew Morton <a...@linux-foundation.org>
> Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
>
> diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
> index fdbad55..af75e27 100644
> --- a/drivers/edac/mpc85xx_edac.c
> +++ b/drivers/edac/mpc85xx_edac.c
> @@ -647,7 +647,10 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
> { .compatible = "fsl,mpc8555-l2-cache-controller", },
> { .compatible = "fsl,mpc8560-l2-cache-controller", },
> { .compatible = "fsl,mpc8568-l2-cache-controller", },
> + { .compatible = "fsl,mpc8569-l2-cache-controller", },
> { .compatible = "fsl,mpc8572-l2-cache-controller", },
> + { .compatible = "fsl,p1020-l2-cache-controller", },
> + { .compatible = "fsl,p1021-l2-cache-controller", },
> { .compatible = "fsl,p2020-l2-cache-controller", },
> {},
> };
> @@ -1125,7 +1128,10 @@ static struct of_device_id mpc85xx_mc_err_of_match[] =
> {
> { .compatible = "fsl,mpc8569-memory-controller", },
> { .compatible = "fsl,mpc8572-memory-controller", },
> { .compatible = "fsl,mpc8349-memory-controller", },
> + { .compatible = "fsl,p1020-memory-controller", },
> + { .compatible = "fsl,p1021-memory-controller", },
> { .compatible = "fsl,p2020-memory-controller", },
> + { .compatible = "fsl,p4080-memory-controller", },
This line should be here ;)
> {},
> };
> MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
