From patchwork Fri Nov 9 07:03:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 10675403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03E9A15A6 for ; Fri, 9 Nov 2018 07:07:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5F4A2E656 for ; Fri, 9 Nov 2018 07:07:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8A982E659; Fri, 9 Nov 2018 07:07:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 437D32E656 for ; Fri, 9 Nov 2018 07:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hQeHM/50U7/HBZSFe7PX2VnKWJNdeqbB22CQa7vKr2I=; b=kQQCKcQRouFghB /LiXsBPCWpE1m1LnxZLIPdT7DE24OlwLvEyNg5yEM+iN6Y63GmGuQKws0fZRPacjeU1/wa8DJoUkV kL8bSlHD4z/3+P3ts6z6Ea13fCPIWcAzRLazrxFvo0V28J6usmtz7LycSMdQtWlG/OqTLXtBdti1R 3E5UHeqKxB14bnVZ4Y3mnNdja8NHUDFf/BvHWE1uRpFPYRR+wlRaTxflty2i9wHMHP7Pvmt/UY0s0 2+0v8HL3BqjlCQ/WznEc0s8IVYt1EvjkobONR3gmd7JbAeXsnqqYdif3nUEOrtUmXF/Lnm5uNYtk0 3TDGQy5hyzAtl86tR4vw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL0se-0001Mf-32; Fri, 09 Nov 2018 07:07:00 +0000 Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL0qr-0006fo-2N for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 07:05:12 +0000 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 64D9989156; Fri, 9 Nov 2018 20:04:24 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1541747064; bh=7pBgkn6yqsFB/7HrIpaxbvTidNEiKjOKcblyTutVUkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SR3oIBcTj/CBuRed9FoidjCFl4yTIxJzlxG+RPm6slrV0frRqQ9VAYfs0G9d47qRK RvkBaF3to0Ihxv4M+EMw1pu4smikNZWphZBWXYq/W3LhGqn4/SAzmLViKa4zDvLWqf w+rwBB1NDYwufEXp3gmx3teZSbOoyIPe5hPrHPhkNgQ5+RMamz9KhZKK79+ajthgvR tZG3qRUWZXxPzl2rX1Un7unzteAf1l4zXHZDs2lvU0DBaVdlqPQ02mMXQfYTf0277C Shu3XUn+4C30RC2XsqzncOtsFfms4S+12vmEyBYclq+6wKUHZEIIjCHcje2qogH+bI S00VkZJMCaOZA== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121) id ; Fri, 09 Nov 2018 20:04:00 +1300 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id 4849213EEA1; Fri, 9 Nov 2018 20:04:05 +1300 (NZDT) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 24E961E0BC9; Fri, 9 Nov 2018 20:04:00 +1300 (NZDT) From: Chris Packham To: linux@armlinux.org.uk, bp@alien8.de, arnd@arndb.de, jlu@pengutronix.de, gregory.clement@bootlin.com Subject: [PATCH v6 9/9] EDAC: armada_xp: Add support for more SoCs Date: Fri, 9 Nov 2018 20:03:49 +1300 Message-Id: <20181109070349.20464-10-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109070349.20464-1-chris.packham@alliedtelesis.co.nz> References: <20181109070349.20464-1-chris.packham@alliedtelesis.co.nz> MIME-Version: 1.0 x-atlnz-ls: pat X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_230509_606579_A57F595F X-CRM114-Status: GOOD ( 10.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Packham , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The Armada 38x and other integrated SoCs use a reduced pin count so the width of the SDRAM interface is smaller than the Armada XP SoCs. This means that the definition of "full" and "half" width is reduced from 64/32 to 32/16. Signed-off-by: Chris Packham --- drivers/edac/armada_xp_edac.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/edac/armada_xp_edac.c b/drivers/edac/armada_xp_edac.c index 3759a4fbbdee..7f227bdcbc84 100644 --- a/drivers/edac/armada_xp_edac.c +++ b/drivers/edac/armada_xp_edac.c @@ -332,6 +332,11 @@ static int axp_mc_probe(struct platform_device *pdev) axp_mc_read_config(mci); + /* These SoCs have a reduced width bus */ + if (of_machine_is_compatible("marvell,armada380") || + of_machine_is_compatible("marvell,armadaxp-98dx3236")) + drvdata->width /= 2; + /* configure SBE threshold */ /* it seems that SBEs are not captured otherwise */ writel(1 << SDRAM_ERR_CTRL_THR_OFFSET, drvdata->base + SDRAM_ERR_CTRL_REG);