| Message ID | 1311659193-694-1-git-send-email-Shaohui.Xie@freescale.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 86f9a4330580b4ed3d5f7d5b0989ae69518c90f5 |
| Delegated to: | Kumar Gala |
| Headers | show |
On Tue, Jul 26, 2011 at 01:46:33PM +0800, Shaohui Xie wrote: > compatible in dts has been changed, so driver need to update accordingly. > > Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> > --- > apply for http://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git > 'next' branch. > > drivers/edac/mpc85xx_edac.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c > index 13f6cc5..94c064a 100644 > --- a/drivers/edac/mpc85xx_edac.c > +++ b/drivers/edac/mpc85xx_edac.c > @@ -1253,7 +1253,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { > { .compatible = "fsl,p1020-memory-controller", }, > { .compatible = "fsl,p1021-memory-controller", }, > { .compatible = "fsl,p2020-memory-controller", }, > - { .compatible = "fsl,p4080-memory-controller", }, > + { .compatible = "fsl,qoriq-memory-controller", }, Are there any implementations in the field that depend on the p4080 value? g.
>From: Grant Likely [mailto:glikely@secretlab.ca] On Behalf Of Grant Likely >Sent: Sunday, July 31, 2011 12:03 PM >To: Xie Shaohui-B21989 >Cc: linuxppc-dev@lists.ozlabs.org; Gala Kumar-B11780; mm- >commits@vger.kernel.org; avorontsov@mvista.com; davem@davemloft.net; >akpm@linux-foundation.org >Subject: Re: [PATCH] powerpc/85xx: fix memory controller compatible for >edac > >On Tue, Jul 26, 2011 at 01:46:33PM +0800, Shaohui Xie wrote: >> compatible in dts has been changed, so driver need to update accordingly. >> >> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> >> --- >> apply for >> http://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git >> 'next' branch. >> >> drivers/edac/mpc85xx_edac.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c >> index 13f6cc5..94c064a 100644 >> --- a/drivers/edac/mpc85xx_edac.c >> +++ b/drivers/edac/mpc85xx_edac.c >> @@ -1253,7 +1253,7 @@ static struct of_device_id >mpc85xx_mc_err_of_match[] = { >> { .compatible = "fsl,p1020-memory-controller", }, >> { .compatible = "fsl,p1021-memory-controller", }, >> { .compatible = "fsl,p2020-memory-controller", }, >> - { .compatible = "fsl,p4080-memory-controller", }, >> + { .compatible = "fsl,qoriq-memory-controller", }, > >Are there any implementations in the field that depend on the p4080 value? > [Xie Shaohui] The 'p4080' is introduced by commit cd1542c8197 edac: mpc85xx: add support for new MPCxxx/Pxxxx EDAC controllers Simply add proper IDs into the device table. My patch intended for fix the compliance of dts and driver. Best Regards, Shaohui Xie
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 13f6cc5..94c064a 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -1253,7 +1253,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { { .compatible = "fsl,p1020-memory-controller", }, { .compatible = "fsl,p1021-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", }, - { .compatible = "fsl,p4080-memory-controller", }, + { .compatible = "fsl,qoriq-memory-controller", }, {}, }; MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);
compatible in dts has been changed, so driver need to update accordingly. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> --- apply for http://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git 'next' branch. drivers/edac/mpc85xx_edac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)