From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758050Ab0JGGiS (ORCPT <rfc822;w@1wt.eu>);
	Thu, 7 Oct 2010 02:38:18 -0400
Received: from gate.crashing.org ([63.228.1.57]:46845 "EHLO gate.crashing.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755131Ab0JGGiR convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 7 Oct 2010 02:38:17 -0400
Subject: Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
Mime-Version: 1.0 (Apple Message framework v1081)
Content-Type: text/plain; charset=us-ascii
From: Kumar Gala <galak@kernel.crashing.org>
In-Reply-To: <20101007062909.GA27110@oksana.dev.rtsoft.ru>
Date: Thu, 7 Oct 2010 01:37:25 -0500
Cc: Andrew Morton <akpm@linux-foundation.org>,
        Scott Wood <scottwood@freescale.com>, Peter Tyser <ptyser@xes-inc.com>,
        linux-kernel@vger.kernel.org, Dave Jiang <djiang@mvista.com>,
        linuxppc-dev@ozlabs.org, Doug Thompson <dougthompson@xmission.com>
Content-Transfer-Encoding: 8BIT
Message-Id: <0778A3B9-E242-4BCC-B318-154BE9ECB2C6@kernel.crashing.org>
References: <20100715182507.GA3482@oksana.dev.rtsoft.ru> <20100716151224.21d499a3@schlenkerla.am.freescale.net> <20100721153933.64d02086.akpm@linux-foundation.org> <20100721182108.5a22c822@schlenkerla.am.freescale.net> <20100801105419.GA352@oksana.dev.rtsoft.ru> <5628792F-9A5F-4200-90B3-FB3939F02969@kernel.crashing.org> <20101007062909.GA27110@oksana.dev.rtsoft.ru>
To: Anton Vorontsov <cbouatmailru@gmail.com>
X-Mailer: Apple Mail (2.1081)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> 
> 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 <avorontsov@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 <avorontsov@mvista.com>
>    Cc: Scott Wood <scottwood@freescale.com>
>    Cc: Peter Tyser <ptyser@xes-inc.com>
>    Cc: Dave Jiang <djiang@mvista.com>
>    Cc: Doug Thompson <dougthompson@xmission.com>
>    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>    Signed-off-by: Linus Torvalds <torvalds@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);