From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [PATCHv3,3/3] arm64: dts: stratix10: Use new Stratix10 EDAC bindings From: thor.thayer@linux.intel.com Message-Id: <1553529476-26181-4-git-send-email-thor.thayer@linux.intel.com> Date: Mon, 25 Mar 2019 10:57:56 -0500 To: bp@alien8.de, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: mchehab@kernel.org, james.morse@arm.com, thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: RnJvbTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KClVzZSB0aGUg bmV3IFN0cmF0aXgxMCBiaW5kaW5nIGZvcm1hdCBmb3IgRURBQyBub2Rlcy4KClNpZ25lZC1vZmYt Ynk6IFRob3IgVGhheWVyIDx0aG9yLnRoYXllckBsaW51eC5pbnRlbC5jb20+Ci0tLQp2Mi0zIE5v IGNoYW5nZQotLS0KIGFyY2gvYXJtNjQvYm9vdC9kdHMvYWx0ZXJhL3NvY2ZwZ2Ffc3RyYXRpeDEw LmR0c2kgfCAyNSArKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGlu c2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQvYm9v dC9kdHMvYWx0ZXJhL3NvY2ZwZ2Ffc3RyYXRpeDEwLmR0c2kgYi9hcmNoL2FybTY0L2Jvb3QvZHRz L2FsdGVyYS9zb2NmcGdhX3N0cmF0aXgxMC5kdHNpCmluZGV4IGUzZjVlYWEzNjU3ZC4uNDExMDk5 OTU1NjNjIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2Jvb3QvZHRzL2FsdGVyYS9zb2NmcGdhX3N0 cmF0aXgxMC5kdHNpCisrKyBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvYWx0ZXJhL3NvY2ZwZ2Ffc3Ry YXRpeDEwLmR0c2kKQEAgLTUzMSwxMSArNTMxLDEyIEBACiAJCX07CiAKIAkJZWNjbWdyIHsKLQkJ CWNvbXBhdGlibGUgPSAiYWx0cixzb2NmcGdhLWExMC1lY2MtbWFuYWdlciI7CisJCQljb21wYXRp YmxlID0gImFsdHIsc29jZnBnYS1zMTAtZWNjLW1hbmFnZXIiLAorCQkJCSAgICAgImFsdHIsc29j ZnBnYS1hMTAtZWNjLW1hbmFnZXIiOwogCQkJYWx0cixzeXNtZ3Itc3lzY29uID0gPCZzeXNtZ3I+ OwogCQkJI2FkZHJlc3MtY2VsbHMgPSA8MT47CiAJCQkjc2l6ZS1jZWxscyA9IDwxPjsKLQkJCWlu dGVycnVwdHMgPSA8MCAxNSA0PiwgPDAgOTUgND47CisJCQlpbnRlcnJ1cHRzID0gPDAgMTUgND47 CiAJCQlpbnRlcnJ1cHQtY29udHJvbGxlcjsKIAkJCSNpbnRlcnJ1cHQtY2VsbHMgPSA8Mj47CiAJ CQlyYW5nZXM7CkBAIC01NDMsMzEgKzU0NCwzMSBAQAogCQkJc2RyYW1lZGFjIHsKIAkJCQljb21w YXRpYmxlID0gImFsdHIsc2RyYW0tZWRhYy1zMTAiOwogCQkJCWFsdHIsc2RyLXN5c2NvbiA9IDwm c2RyPjsKLQkJCQlpbnRlcnJ1cHRzID0gPDE2IDQ+LCA8NDggND47CisJCQkJaW50ZXJydXB0cyA9 IDwxNiA0PjsKIAkJCX07CiAKIAkJCXVzYjAtZWNjQGZmOGM0MDAwIHsKLQkJCQljb21wYXRpYmxl ID0gImFsdHIsc29jZnBnYS11c2ItZWNjIjsKKwkJCQljb21wYXRpYmxlID0gImFsdHIsc29jZnBn YS1zMTAtdXNiLWVjYyIsCisJCQkJCSAgICAgImFsdHIsc29jZnBnYS11c2ItZWNjIjsKIAkJCQly ZWcgPSA8MHhmZjhjNDAwMCAweDEwMD47CiAJCQkJYWx0cixlY2MtcGFyZW50ID0gPCZ1c2IwPjsK LQkJCQlpbnRlcnJ1cHRzID0gPDIgND4sCi0JCQkJCSAgICAgPDM0IDQ+OworCQkJCWludGVycnVw dHMgPSA8MiA0PjsKIAkJCX07CiAKIAkJCWVtYWMwLXJ4LWVjY0BmZjhjMDAwMCB7Ci0JCQkJY29t cGF0aWJsZSA9ICJhbHRyLHNvY2ZwZ2EtZXRoLW1hYy1lY2MiOworCQkJCWNvbXBhdGlibGUgPSAi YWx0cixzb2NmcGdhLXMxMC1ldGgtbWFjLWVjYyIsCisJCQkJCSAgICAgImFsdHIsc29jZnBnYS1l dGgtbWFjLWVjYyI7CiAJCQkJcmVnID0gPDB4ZmY4YzAwMDAgMHgxMDA+OwogCQkJCWFsdHIsZWNj LXBhcmVudCA9IDwmZ21hYzA+OwotCQkJCWludGVycnVwdHMgPSA8NCA0PiwKLQkJCQkJICAgICA8 MzYgND47CisJCQkJaW50ZXJydXB0cyA9IDw0IDQ+OwogCQkJfTsKIAogCQkJZW1hYzAtdHgtZWNj QGZmOGMwNDAwIHsKLQkJCQljb21wYXRpYmxlID0gImFsdHIsc29jZnBnYS1ldGgtbWFjLWVjYyI7 CisJCQkJY29tcGF0aWJsZSA9ICJhbHRyLHNvY2ZwZ2EtczEwLWV0aC1tYWMtZWNjIiwKKwkJCQkJ ICAgICAiYWx0cixzb2NmcGdhLWV0aC1tYWMtZWNjIjsKIAkJCQlyZWcgPSA8MHhmZjhjMDQwMCAw eDEwMD47CiAJCQkJYWx0cixlY2MtcGFyZW50ID0gPCZnbWFjMD47Ci0JCQkJaW50ZXJydXB0cyA9 IDw1IDQ+LAotCQkJCQkgICAgIDwzNyA0PjsKKwkJCQlpbnRlcnJ1cHRzID0gPDUgND47CiAJCQl9 OwogCiAJCX07Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: thor.thayer@linux.intel.com Subject: [PATCHv3 3/3] arm64: dts: stratix10: Use new Stratix10 EDAC bindings Date: Mon, 25 Mar 2019 10:57:56 -0500 Message-ID: <1553529476-26181-4-git-send-email-thor.thayer@linux.intel.com> References: <1553529476-26181-1-git-send-email-thor.thayer@linux.intel.com> Return-path: In-Reply-To: <1553529476-26181-1-git-send-email-thor.thayer@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: bp@alien8.de, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: mchehab@kernel.org, james.morse@arm.com, thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org From: Thor Thayer Use the new Stratix10 binding format for EDAC nodes. Signed-off-by: Thor Thayer --- v2-3 No change --- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi index e3f5eaa3657d..41109995563c 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -531,11 +531,12 @@ }; eccmgr { - compatible = "altr,socfpga-a10-ecc-manager"; + compatible = "altr,socfpga-s10-ecc-manager", + "altr,socfpga-a10-ecc-manager"; altr,sysmgr-syscon = <&sysmgr>; #address-cells = <1>; #size-cells = <1>; - interrupts = <0 15 4>, <0 95 4>; + interrupts = <0 15 4>; interrupt-controller; #interrupt-cells = <2>; ranges; @@ -543,31 +544,31 @@ sdramedac { compatible = "altr,sdram-edac-s10"; altr,sdr-syscon = <&sdr>; - interrupts = <16 4>, <48 4>; + interrupts = <16 4>; }; usb0-ecc@ff8c4000 { - compatible = "altr,socfpga-usb-ecc"; + compatible = "altr,socfpga-s10-usb-ecc", + "altr,socfpga-usb-ecc"; reg = <0xff8c4000 0x100>; altr,ecc-parent = <&usb0>; - interrupts = <2 4>, - <34 4>; + interrupts = <2 4>; }; emac0-rx-ecc@ff8c0000 { - compatible = "altr,socfpga-eth-mac-ecc"; + compatible = "altr,socfpga-s10-eth-mac-ecc", + "altr,socfpga-eth-mac-ecc"; reg = <0xff8c0000 0x100>; altr,ecc-parent = <&gmac0>; - interrupts = <4 4>, - <36 4>; + interrupts = <4 4>; }; emac0-tx-ecc@ff8c0400 { - compatible = "altr,socfpga-eth-mac-ecc"; + compatible = "altr,socfpga-s10-eth-mac-ecc", + "altr,socfpga-eth-mac-ecc"; reg = <0xff8c0400 0x100>; altr,ecc-parent = <&gmac0>; - interrupts = <5 4>, - <37 4>; + interrupts = <5 4>; }; }; -- 2.7.4