From patchwork Tue Jul 26 05:46:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaohui xie X-Patchwork-Id: 106784 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id A1E3FB749B for ; Tue, 26 Jul 2011 16:44:56 +1000 (EST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe003.messaging.microsoft.com [216.32.181.183]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id CF448B70B1 for ; Tue, 26 Jul 2011 16:44:48 +1000 (EST) Received: from mail75-ch1-R.bigfish.com (216.32.181.170) by CH1EHSOBE015.bigfish.com (10.43.70.65) with Microsoft SMTP Server id 14.1.225.22; Tue, 26 Jul 2011 06:44:43 +0000 Received: from mail75-ch1 (localhost.localdomain [127.0.0.1]) by mail75-ch1-R.bigfish.com (Postfix) with ESMTP id 583F810581D4; Tue, 26 Jul 2011 06:44:43 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bh8275dhz2dh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail75-ch1 (localhost.localdomain [127.0.0.1]) by mail75-ch1 (MessageSwitch) id 1311662683249185_5747; Tue, 26 Jul 2011 06:44:43 +0000 (UTC) Received: from CH1EHSMHS028.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.253]) by mail75-ch1.bigfish.com (Postfix) with ESMTP id 378ED12D804B; Tue, 26 Jul 2011 06:44:43 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS028.bigfish.com (10.43.70.28) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 26 Jul 2011 06:44:42 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.289.8; Tue, 26 Jul 2011 01:44:42 -0500 Received: from localhost.localdomain (rock.ap.freescale.net [10.193.20.106]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p6Q6iZwX018278; Tue, 26 Jul 2011 01:44:37 -0500 (CDT) From: Shaohui Xie To: Subject: [PATCH] powerpc/85xx: fix memory controller compatible for edac Date: Tue, 26 Jul 2011 13:46:33 +0800 Message-ID: <1311659193-694-1-git-send-email-Shaohui.Xie@freescale.com> X-Mailer: git-send-email 1.6.4 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: mm-commits@vger.kernel.org, Shaohui Xie , kumar.gala@freescale.com, avorontsov@mvista.com, akpm@linux-foundation.org, davem@davemloft.net X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org compatible in dts has been changed, so driver need to update accordingly. Signed-off-by: Shaohui Xie --- 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", }, {}, }; MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);