edac: fix mpc85xx and add mpc8536 mpc8560
All other compatibles that are uniquely identifying the processor use a prefix of the form fsl,mpc85...'. We add support for it so we can deprecate the older 'fsl,85...' that was improperly used here. Additionally added mpc8536 & mpc8560 to the compatible lists. This patch is based on Nate's 8572 patch. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Doug Thompson <dougthompson@xmission.com> Acked-by: Dave Jiang <djiang@mvista.com> Cc: Nate Case <ncase@xes-inc.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
281efb17d8
Коммит
29d6cf26a7
|
@ -630,27 +630,22 @@ static int mpc85xx_l2_err_remove(struct of_device *op)
|
|||
}
|
||||
|
||||
static struct of_device_id mpc85xx_l2_err_of_match[] = {
|
||||
{
|
||||
.compatible = "fsl,8540-l2-cache-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8541-l2-cache-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8544-l2-cache-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8548-l2-cache-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8555-l2-cache-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8568-l2-cache-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,mpc8572-l2-cache-controller",
|
||||
},
|
||||
/* deprecate the fsl,85.. forms in the future, 2.6.30? */
|
||||
{ .compatible = "fsl,8540-l2-cache-controller", },
|
||||
{ .compatible = "fsl,8541-l2-cache-controller", },
|
||||
{ .compatible = "fsl,8544-l2-cache-controller", },
|
||||
{ .compatible = "fsl,8548-l2-cache-controller", },
|
||||
{ .compatible = "fsl,8555-l2-cache-controller", },
|
||||
{ .compatible = "fsl,8568-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8536-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8540-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8541-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8544-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8548-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8555-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8560-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8568-l2-cache-controller", },
|
||||
{ .compatible = "fsl,mpc8572-l2-cache-controller", },
|
||||
{},
|
||||
};
|
||||
|
||||
|
@ -967,27 +962,22 @@ static int mpc85xx_mc_err_remove(struct of_device *op)
|
|||
}
|
||||
|
||||
static struct of_device_id mpc85xx_mc_err_of_match[] = {
|
||||
{
|
||||
.compatible = "fsl,8540-memory-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8541-memory-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8544-memory-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8548-memory-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8555-memory-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,8568-memory-controller",
|
||||
},
|
||||
{
|
||||
.compatible = "fsl,mpc8572-memory-controller",
|
||||
},
|
||||
/* deprecate the fsl,85.. forms in the future, 2.6.30? */
|
||||
{ .compatible = "fsl,8540-memory-controller", },
|
||||
{ .compatible = "fsl,8541-memory-controller", },
|
||||
{ .compatible = "fsl,8544-memory-controller", },
|
||||
{ .compatible = "fsl,8548-memory-controller", },
|
||||
{ .compatible = "fsl,8555-memory-controller", },
|
||||
{ .compatible = "fsl,8568-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8536-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8540-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8541-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8544-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8548-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8555-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8560-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8568-memory-controller", },
|
||||
{ .compatible = "fsl,mpc8572-memory-controller", },
|
||||
{},
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче