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: [PATCHv2,4/5] arm64: dts: stratix10: Use new Stratix10 EDAC bindings From: thor.thayer@linux.intel.com Message-Id: <1551288445-22335-5-git-send-email-thor.thayer@linux.intel.com> Date: Wed, 27 Feb 2019 11:27:24 -0600 To: bp@alien8.de, dinguyen@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, mchehab@kernel.org Cc: thor.thayer@linux.intel.com, devicetree@vger.kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: RnJvbTogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KClVzZSB0aGUg bmV3IFN0cmF0aXgxMCBiaW5kaW5nIGZvcm1hdCBmb3IgRURBQyBub2Rlcy4KClNpZ25lZC1vZmYt Ynk6IFRob3IgVGhheWVyIDx0aG9yLnRoYXllckBsaW51eC5pbnRlbC5jb20+Ci0tLQp2MiBObyBj aGFuZ2UKLS0tCiBhcmNoL2FybTY0L2Jvb3QvZHRzL2FsdGVyYS9zb2NmcGdhX3N0cmF0aXgxMC5k dHNpIHwgMjUgKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNl cnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3Qv ZHRzL2FsdGVyYS9zb2NmcGdhX3N0cmF0aXgxMC5kdHNpIGIvYXJjaC9hcm02NC9ib290L2R0cy9h bHRlcmEvc29jZnBnYV9zdHJhdGl4MTAuZHRzaQppbmRleCA4MjUzYTFhOWU5ODUuLmRlNmYwNTA3 MzMzZCAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9ib290L2R0cy9hbHRlcmEvc29jZnBnYV9zdHJh dGl4MTAuZHRzaQorKysgYi9hcmNoL2FybTY0L2Jvb3QvZHRzL2FsdGVyYS9zb2NmcGdhX3N0cmF0 aXgxMC5kdHNpCkBAIC00NzksMTEgKzQ3OSwxMiBAQAogCQl9OwogCiAJCWVjY21nciB7Ci0JCQlj b21wYXRpYmxlID0gImFsdHIsc29jZnBnYS1hMTAtZWNjLW1hbmFnZXIiOworCQkJY29tcGF0aWJs ZSA9ICJhbHRyLHNvY2ZwZ2EtczEwLWVjYy1tYW5hZ2VyIiwKKwkJCQkgICAgICJhbHRyLHNvY2Zw Z2EtYTEwLWVjYy1tYW5hZ2VyIjsKIAkJCWFsdHIsc3lzbWdyLXN5c2NvbiA9IDwmc3lzbWdyPjsK IAkJCSNhZGRyZXNzLWNlbGxzID0gPDE+OwogCQkJI3NpemUtY2VsbHMgPSA8MT47Ci0JCQlpbnRl cnJ1cHRzID0gPDAgMTUgND4sIDwwIDk1IDQ+OworCQkJaW50ZXJydXB0cyA9IDwwIDE1IDQ+Owog CQkJaW50ZXJydXB0LWNvbnRyb2xsZXI7CiAJCQkjaW50ZXJydXB0LWNlbGxzID0gPDI+OwogCQkJ cmFuZ2VzOwpAQCAtNDkxLDMxICs0OTIsMzEgQEAKIAkJCXNkcmFtZWRhYyB7CiAJCQkJY29tcGF0 aWJsZSA9ICJhbHRyLHNkcmFtLWVkYWMtczEwIjsKIAkJCQlhbHRyLHNkci1zeXNjb24gPSA8JnNk cj47Ci0JCQkJaW50ZXJydXB0cyA9IDwxNiA0PiwgPDQ4IDQ+OworCQkJCWludGVycnVwdHMgPSA8 MTYgND47CiAJCQl9OwogCiAJCQl1c2IwLWVjY0BmZjhjNDAwMCB7Ci0JCQkJY29tcGF0aWJsZSA9 ICJhbHRyLHNvY2ZwZ2EtdXNiLWVjYyI7CisJCQkJY29tcGF0aWJsZSA9ICJhbHRyLHNvY2ZwZ2Et czEwLXVzYi1lY2MiLAorCQkJCQkgICAgICJhbHRyLHNvY2ZwZ2EtdXNiLWVjYyI7CiAJCQkJcmVn ID0gPDB4ZmY4YzQwMDAgMHgxMDA+OwogCQkJCWFsdHIsZWNjLXBhcmVudCA9IDwmdXNiMD47Ci0J CQkJaW50ZXJydXB0cyA9IDwyIDQ+LAotCQkJCQkgICAgIDwzNCA0PjsKKwkJCQlpbnRlcnJ1cHRz ID0gPDIgND47CiAJCQl9OwogCiAJCQllbWFjMC1yeC1lY2NAZmY4YzAwMDAgewotCQkJCWNvbXBh dGlibGUgPSAiYWx0cixzb2NmcGdhLWV0aC1tYWMtZWNjIjsKKwkJCQljb21wYXRpYmxlID0gImFs dHIsc29jZnBnYS1zMTAtZXRoLW1hYy1lY2MiLAorCQkJCQkgICAgICJhbHRyLHNvY2ZwZ2EtZXRo LW1hYy1lY2MiOwogCQkJCXJlZyA9IDwweGZmOGMwMDAwIDB4MTAwPjsKIAkJCQlhbHRyLGVjYy1w YXJlbnQgPSA8JmdtYWMwPjsKLQkJCQlpbnRlcnJ1cHRzID0gPDQgND4sCi0JCQkJCSAgICAgPDM2 IDQ+OworCQkJCWludGVycnVwdHMgPSA8NCA0PjsKIAkJCX07CiAKIAkJCWVtYWMwLXR4LWVjY0Bm ZjhjMDQwMCB7Ci0JCQkJY29tcGF0aWJsZSA9ICJhbHRyLHNvY2ZwZ2EtZXRoLW1hYy1lY2MiOwor CQkJCWNvbXBhdGlibGUgPSAiYWx0cixzb2NmcGdhLXMxMC1ldGgtbWFjLWVjYyIsCisJCQkJCSAg ICAgImFsdHIsc29jZnBnYS1ldGgtbWFjLWVjYyI7CiAJCQkJcmVnID0gPDB4ZmY4YzA0MDAgMHgx MDA+OwogCQkJCWFsdHIsZWNjLXBhcmVudCA9IDwmZ21hYzA+OwotCQkJCWludGVycnVwdHMgPSA8 NSA0PiwKLQkJCQkJICAgICA8MzcgND47CisJCQkJaW50ZXJydXB0cyA9IDw1IDQ+OwogCQkJfTsK IAogCQl9Owo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: thor.thayer@linux.intel.com Subject: [PATCHv2 4/5] arm64: dts: stratix10: Use new Stratix10 EDAC bindings Date: Wed, 27 Feb 2019 11:27:24 -0600 Message-ID: <1551288445-22335-5-git-send-email-thor.thayer@linux.intel.com> References: <1551288445-22335-1-git-send-email-thor.thayer@linux.intel.com> Return-path: In-Reply-To: <1551288445-22335-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, mchehab@kernel.org Cc: 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 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 8253a1a9e985..de6f0507333d 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -479,11 +479,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; @@ -491,31 +492,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