From patchwork Wed May 13 21:49:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tthayer@opensource.altera.com X-Patchwork-Id: 6400481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 09184BEEE1 for ; Wed, 13 May 2015 21:53:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21AB620270 for ; Wed, 13 May 2015 21:53:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46C9D20220 for ; Wed, 13 May 2015 21:53:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YseYA-0001oQ-Om; Wed, 13 May 2015 21:50:46 +0000 Received: from mail-bn1bon0076.outbound.protection.outlook.com ([157.56.111.76] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YseWt-0008L0-6o for linux-arm-kernel@lists.infradead.org; Wed, 13 May 2015 21:49:28 +0000 Received: from BN3PR0301CA0066.namprd03.prod.outlook.com (10.160.152.162) by BN1PR03MB037.namprd03.prod.outlook.com (10.255.225.145) with Microsoft SMTP Server (TLS) id 15.1.154.19; Wed, 13 May 2015 21:49:04 +0000 Received: from BY2FFO11OLC012.protection.gbl (2a01:111:f400:7c0c::158) by BN3PR0301CA0066.outlook.office365.com (2a01:111:e400:401e::34) with Microsoft SMTP Server (TLS) id 15.1.160.19 via Frontend Transport; Wed, 13 May 2015 21:49:04 +0000 Authentication-Results: spf=fail (sender IP is 66.35.236.227) smtp.mailfrom=opensource.altera.com; vger.kernel.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of opensource.altera.com does not designate 66.35.236.227 as permitted sender) receiver=protection.outlook.com; client-ip=66.35.236.227; helo=sj-itexedge03.altera.priv.altera.com; Received: from sj-itexedge03.altera.priv.altera.com (66.35.236.227) by BY2FFO11OLC012.mail.protection.outlook.com (10.1.15.23) with Microsoft SMTP Server (TLS) id 15.1.160.8 via Frontend Transport; Wed, 13 May 2015 21:49:03 +0000 Received: from na01-by2-obe.outbound.protection.outlook.com (207.46.163.244) by webmail.altera.com (66.35.236.227) with Microsoft SMTP Server (TLS) id 14.3.174.1; Wed, 13 May 2015 14:46:58 -0700 Received: from DM2PR03MB430.namprd03.prod.outlook.com (10.141.85.14) by DM2PR03MB365.namprd03.prod.outlook.com (10.141.55.12) with Microsoft SMTP Server (TLS) id 15.1.160.10; Wed, 13 May 2015 21:49:02 +0000 Authentication-Results: alien8.de; dkim=none (message not signed) header.d=none; Received: from tthayer-HP-Z620-Ubuntu.altera.com (64.129.157.38) by DM2PR03MB430.namprd03.prod.outlook.com (10.141.85.14) with Microsoft SMTP Server (TLS) id 15.1.166.19; Wed, 13 May 2015 21:49:01 +0000 From: To: , , , , , , , , , , Subject: [PATCH 4/4] dts, altera: Arria10 SDRAM EDAC DTS additions. Date: Wed, 13 May 2015 16:49:47 -0500 Message-ID: <1431553787-27741-5-git-send-email-tthayer@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1431553787-27741-1-git-send-email-tthayer@opensource.altera.com> References: <1431553787-27741-1-git-send-email-tthayer@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: SN1PR12CA0028.namprd12.prod.outlook.com (25.162.96.166) To DM2PR03MB430.namprd03.prod.outlook.com (10.141.85.14) X-Microsoft-Exchange-Diagnostics-untrusted: 1; DM2PR03MB430; 2:cpTWFO+Z0zbnU7f1DX8D7zXB2xHgm5EOsjOfUeJClicvdWK74KXwrDEHBeeEuBLp; 2:lxMPYXtECymE7hEdCiqRpxnxoIyxhrmkD8uDkykJW8e7V42oRHlXDxQc65DVfx2yZNTDpnz+2qw1Un8x9GdF087K2qfQauB2WAb6jEIH4pYXx1ur+4IHzbotiCm0/IlIV1cC3qOQYmjBwv8Vq/VtEA==; 6:nTaVNG3487QXmumvdQLMsoPd+wTSxGX2mKhk+Bda50M2jv7AdxYoVH4b5eyZuPNxlcARDyfjZJfQSM/UCYitT4QCriinuzIiJVMPcJGHnWlzKXVEynA/nwxs7WpsBzfgM+c087j71Li63zDkLorPfg==; 3:8MW9NoRW+OWT4qlso/1N0fG27cGf/rl5HbOExZChK1m3PnfiWEQowN7La0468hSyJH6B7Cl58ntAfX3PkLsbs6R8iPtFrjoDUpk+EDcSnjODVKIy9mcsfNRQCx5IE9X5ZXtk/dYM8Hhd5CK9uidOvduM0YJPs3bwZsc0qpTRj2o8s7Qc/Ns7tx25V6aC/z8VpFAD/UzJvssF3XCoErx9xAZXoWCvErRe1+br87CyV9qrxzB8X7OMKoRZgjsquJCXhJtESNZowmLmPmbhYmh7+r1T/UcV372k1GUkPYL68ZA= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB430; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB365; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BN1PR03MB037; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DM2PR03MB430; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB430; BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BN1PR03MB037; BCL:0; PCL:0; RULEID:; SRVR:BN1PR03MB037; X-Forefront-PRVS: 0575F81B58 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(6009001)(76176999)(47776003)(189998001)(33646002)(50226001)(50466002)(46102003)(87976001)(86152002)(2201001)(92566002)(575784001)(86362001)(62966003)(2950100001)(77156002)(107886002)(5001960100002)(50986999)(122386002)(19580405001)(40100003)(19580395003)(5001770100001)(48376002)(66066001)(229853001)(77096005)(42186005)(53416004)(921003)(217873001)(1121003)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR03MB430; H:tthayer-HP-Z620-Ubuntu.altera.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: 1; DM2PR03MB430; 9:+2y9htLDfe7bL7bW7UJcVJZCfI7HPiXF3EE6cCquigmUVr0ymxOg+kJkUWEMbvm5ZwqHEGwyGEbLhQHXOiI/6CWvUOpS/AQnBm6xGs68aD6lbAhK6jWeYbnbuhSXKLa/0NYieeXpLj1+xJlQI9YGrMtTVnAawGRo08oWhQhsk5eRitAzPCHVstJytcD5JSbyPmCmw708qJ0Q2EAn1ieZhzgNZXGSq1dijeA1t+K2kz+teuXiGYzBUfdA47bpU1KWy+aKG+hT7VnnP6xzdFQ+AtV5sJrSmRIUCRaibToe/kEz228u7wnO5XgZoc2fVlZoTiKGHYFD33YXIvZB3Ri8QUK0rDkjSvBSQYMEe7SVBJZMxVK5YNL6PpZFwCZtc3lBiGoyhREnnbKyn441tE3x2Gb5BoBIrVIIm33C0bLsA0KtZS+beVs3ZnudWhMW3roAdthLpF5LQ+zKfe/OC+18w1oECDCuagTW7+Rcx5CeYD+FxRa6cvxrBjONV191yWI0xcO9aQZYxjNiMRheEUYwf+bl1s0KJcI+PV8dttjM8KIpbZOAHbxnd1Kqvls1z5W3eQLBLnQmjghb8lqoBolpJ2UAYOm5GcHRCqc7H6ZpMO3rgpAyKb3nHPnxKhpy5NMdDxQtZS/rENUAoqqtXTeh3DxlA/mwttPFiIjuOpNn0orALqffXEIFP8TTzzk9i/Uk786WEMHYugFw5OTGd9nt7v3pAI95A7ZCu0/U9pHzgoNKidhdzWKMxSkRii020aLtPsjYsI7Mei8xxmtIeA3k+1j8G5K7ixMwUquq8ruQzlZN4nRwkYUsdz9faNrQnPLLU6d9fWZQnnAKBe+b+jukJjTyQAasR3iVxjSGqkBMyo4cHiarLxKS+NI8nP07lFWGHa9+upxaBKQUlmPM/mMzije201QUuJVnk2IJlXS/1ROOO6+VtyeD9tIORbR5I2vx X-Microsoft-Exchange-Diagnostics-untrusted: 1; DM2PR03MB430; 3:8esMSpkgQeMb5HJhWa2HEuQ784aVhdtq6nLBPoUt9sP3xmwdRUCtULPNgepEUF+mOpJRCk+UVJmtY/MqEJ6Gjz2mqn7FYgD48IN0OuQLaDrXhSl2AVcCEZXa6qHjm+uQu193a1IqkxcV0iEWjEDBzw==; 10:DjlWurlwbZwYBcI8LqWSePoR6j0+C60BqNbrxSNRVtAweno14I+Temi6saBFNU5r7+7HL+et82MN5DIpC6ptAcRS1yIQJSBWY44YI/B/jGM=; 6:ShLlBW5IGaz3a/sg6oudUHIROOuf9SKGe5NDkmzOlQiZZay/AP++drFCx2iO94KS80We16JBgTAX2efE8MSEO3BCr0upRxM3T7ASF3hlcLkJTc/MBvuAm2mKQ33tfDlmOgPiFKGAKuhKo/LHFYYy0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB430 X-Microsoft-Exchange-Diagnostics-untrusted: 1; DM2PR03MB365; 2:kxFoTJFm1BeuQR+JKrPjLs1AC76LXx9C+dlVP3KvrUIu6KY577IPghwIaj7DzF/Q; 2:WPhMeytSFIqIWnTfTuoBvhq3DPIyu3AoSUvoSXaLmUlYxU5vBrhhB9sQO/Y9ccqdItaETyzaFhWeysCYlWPxBuSxKNklOMMbdPR91+bxvpOofLOyCzVX09RUW/jCBDlIbeFYKC69jHWGnhE+4hF3Fw==; 9:DNaHfHb7Kl4a5bRj5p1wvgHniXhFe3VNBhnBmeBszkRj9CA+5MR/LA5tiQfNb213ZzorQrE60tYjLhmZopQvwa/CGGZH48/g0u87aVgjFsTsD8jLDHfW44QMEsrjAsWSpG0o1ZpvrZwdpHIJ8Kq0VQ== X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11OLC012.protection.gbl X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC012; 1:ErMNVVmT+ZVWIKYKg9bH8SmuJ0PAu+l9KHQBnrLn6en5/pyHpDR+KErP3HqGANuS/1UMjpST5IRJSFu6zjM4sOXqIcThNF6Sii7q4pwPhevzHKTlaqU6LSaxkAg4vqv/tnLqLzC7TKPvmRbDxjFj2gm+BDSptiUQmZt/ebMIp/FGKppPY/1KyrtxWBd8CuAxW6kkLxSY+TjoPHuxIKDgKNmqXKL1XBeBDcr18RRbcpgsv2v2FtVvJGYGOwWt5vkpLt2dLbT3Yz6lAd8KtCHT6X4yI7ShKq7kkBnUZ6hzaMxSRGqPpv5JiALQWNN23LHT X-Forefront-Antispam-Report: CIP:66.35.236.227; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(199003)(189002)(6806004)(76176999)(85426001)(47776003)(189998001)(33646002)(50226001)(50466002)(87936001)(46102003)(86152002)(2201001)(92566002)(575784001)(86362001)(62966003)(2950100001)(77156002)(107886002)(5001960100002)(50986999)(122386002)(105606002)(19580405001)(40100003)(19580395003)(5001770100001)(48376002)(106466001)(66066001)(81156007)(229853001)(77096005)(53416004)(7099028)(921003)(217873001)(1121003)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR03MB037; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:Fail; MLV:ovrnspm; A:0; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Forefront-PRVS: 0575F81B58 X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2015 21:49:03.5012 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a; Ip=[66.35.236.227]; Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR03MB037 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150513_144927_511214_E8EB074B X-CRM114-Status: UNSURE ( 6.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, tthayer.linux@gmail.com, tthayer@opensource.altera.com, linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thor Thayer Support for the Arria10 SDRAM EDAC is added to the device tree. Update the bindings document for the new match string. Signed-off-by: Thor Thayer --- .../bindings/arm/altera/socfpga-sdram-edac.txt | 2 +- arch/arm/boot/dts/socfpga_arria10.dtsi | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt b/Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt index d0ce01d..f5ad0ff 100644 --- a/Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt +++ b/Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt @@ -2,7 +2,7 @@ Altera SOCFPGA SDRAM Error Detection & Correction [EDAC] The EDAC accesses a range of registers in the SDRAM controller. Required properties: -- compatible : should contain "altr,sdram-edac"; +- compatible : should contain "altr,sdram-edac" or "altr,sdram-edac-a10" - altr,sdr-syscon : phandle of the sdr module - interrupts : Should contain the SDRAM ECC IRQ in the appropriate format for the IRQ controller. diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi index e121661..70da147 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi @@ -524,6 +524,17 @@ status = "disabled"; }; + sdr: sdr@ffc25000 { + compatible = "syscon"; + reg = <0xffcfb100 0x80>; + }; + + sdramedac { + compatible = "altr,sdram-edac-a10"; + altr,sdr-syscon = <&sdr>; + interrupts = <0 2 4>, <0 0 4>; + }; + L2: l2-cache@fffff000 { compatible = "arm,pl310-cache"; reg = <0xfffff000 0x1000>;