From patchwork Fri Jul 12 03:49:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 11041415 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 78C7B1805 for ; Fri, 12 Jul 2019 03:51:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62F7228B92 for ; Fri, 12 Jul 2019 03:51:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D4F528BCC; Fri, 12 Jul 2019 03:51:49 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 8F22B28BCC for ; Fri, 12 Jul 2019 03:51:48 +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=dvuutC1uPV9QVVhHN6B6/gUlLZavpjIO8zjAXz/qlAQ=; b=h1oASYSCdqPSOO ZcyNo+pvutMCRCpm4KhTkjxz0DesqxIKyhpy5PuMPb+Xdy9Wk5QTSv8GsyFldChqT2CSJ2qy7mbov 1SVl9ClM3DlhfSdeQBdV6IqfDZVTrxX/t3uDQwK9OVl8xbZRDXN5BPjitAlSDQlmOnpKWARNn3F9X TN7KaimFkaP0ZvCWw5+ov5n8lm84gdjexbDYcTfLJeMEVNZUGrPXGD7IgTXj27qnZ70q1hfQrF+Nr FsKndMW3upO9HSH5jVL+RMk7h95/DI8CoPloVAcEHRARb/IgOxyfuP+tbHm0p5d2Bhpd0g5Hzxiyr BnAvakxFf9q2PRVXmp1g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hlmb5-0002Kq-QS; Fri, 12 Jul 2019 03:51:48 +0000 Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hlmYp-0007oB-DW for linux-arm-kernel@lists.infradead.org; Fri, 12 Jul 2019 03:49:30 +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 56C2C891B5; Fri, 12 Jul 2019 15:49:15 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1562903355; bh=BJ2SJfxvV+LPkP/KkZxVCosBZT+65HxPtxnVwz2cPQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wJbd1FHymZGn9JDXfHO74bsoIRhlneIm7XlZg2GupITaSg6T/cAnm3A5hkWbCzb9m lR9Y8Ykt1sQ6Us/v2exkX6P4skTKHDY2SpKFppHqYdH4+unUatB+AgSbm/088POQLx 9b4k/ogaOdrlMwYXVGPr992fSTNa5XFCHGOt2QRF98S4FFaqbPnAFQ2eiVp94vLX2B xeSthFzfmP+QO1hiW127U/Q2uzj/ZThiKVPAuNv0g+DZ7vk/Gw0l0SeJqi6RmuV+iC Egey5bzKSdhyWqhGxZvSp168p/rT7sXMmVief2D0saERAr8KghdODmTORMh7UdHXbN 09EQdOIkbW05w== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121) id ; Fri, 12 Jul 2019 15:49:14 +1200 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id 23E0213EF9E; Fri, 12 Jul 2019 15:49:16 +1200 (NZST) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 5B8351E1D82; Fri, 12 Jul 2019 15:49:14 +1200 (NZST) From: Chris Packham To: bp@alien8.de, robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, patches@armlinux.org.uk, mchehab@kernel.org, james.morse@arm.com, jlu@pengutronix.de Subject: [PATCH v9 8/8] EDAC: armada_xp: Add support for more SoCs Date: Fri, 12 Jul 2019 15:49:04 +1200 Message-Id: <20190712034904.5747-9-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712034904.5747-1-chris.packham@alliedtelesis.co.nz> References: <20190712034904.5747-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-20190711_204927_736594_B34FB793 X-CRM114-Status: GOOD ( 10.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Chris Packham , linux-kernel@vger.kernel.org, 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 Acked-by: James Morse --- 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);