diff mbox

[PATCHv5,8/8] ARM: dts: Add Arria10 Ethernet EDAC devicetree entry

Message ID 1466603939-7526-9-git-send-email-tthayer@opensource.altera.com (mailing list archive)
State New, archived
Headers show

Commit Message

tthayer@opensource.altera.com June 22, 2016, 1:58 p.m. UTC 
From: Thor Thayer <tthayer@opensource.altera.com>

Add the device tree entries needed to support the Altera Ethernet
FIFO buffer EDAC on the Arria10 chip.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
---
v2  No change
v3  Add interrupts for SBERR and DBERR.
v4  No change
v5  Change "parent" phandle to "altr,ecc-parent"
---
 arch/arm/boot/dts/socfpga_arria10.dtsi |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Comments

dinguyen@opensource.altera.com June 27, 2016, 3:31 p.m. UTC | #1 
Hi Boris,

On 06/22/2016 08:58 AM, tthayer@opensource.altera.com wrote:
> From: Thor Thayer <tthayer@opensource.altera.com>
> 
> Add the device tree entries needed to support the Altera Ethernet
> FIFO buffer EDAC on the Arria10 chip.
> 
> Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
> ---
> v2  No change
> v3  Add interrupts for SBERR and DBERR.
> v4  No change
> v5  Change "parent" phandle to "altr,ecc-parent"
> ---
>  arch/arm/boot/dts/socfpga_arria10.dtsi |   16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 

I've applied this patch and will take through the arm-soc tree.

Thanks,
Dinh
dinguyen@opensource.altera.com June 27, 2016, 4:13 p.m. UTC | #2 
On 06/27/2016 11:18 AM, Borislav Petkov wrote:
> On Mon, Jun 27, 2016 at 10:31:29AM -0500, Dinh Nguyen wrote:
>> I've applied this patch and will take through the arm-soc tree.
> 
> I already took the whole branch two days ago:
> 
> http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/log/?h=for-next
> 
> So we need to sort this out as it has come up in the past. Either you
> pick up all patches and I ack them or I do and you ack the one. But
> splitting the patchset between trees is always calling for trouble.
> 
> So what are doing, wanna give me your Ack for that patch instead and I
> can carry the whole set upstream?
> 

Ok, sorry about that. Please carry the whole set:

Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>

Dinh
Borislav Petkov June 27, 2016, 4:18 p.m. UTC | #3 
On Mon, Jun 27, 2016 at 10:31:29AM -0500, Dinh Nguyen wrote:
> I've applied this patch and will take through the arm-soc tree.

I already took the whole branch two days ago:

http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/log/?h=for-next

So we need to sort this out as it has come up in the past. Either you
pick up all patches and I ack them or I do and you ack the one. But
splitting the patchset between trees is always calling for trouble.

So what are doing, wanna give me your Ack for that patch instead and I
can carry the whole set upstream?
Borislav Petkov June 27, 2016, 5:54 p.m. UTC | #4 
On Mon, Jun 27, 2016 at 11:13:05AM -0500, Dinh Nguyen wrote:
> Ok, sorry about that. Please carry the whole set:
> 
> Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>

Thanks!
diff mbox

Patch

diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index 21f6c3c..228f663 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -628,6 +628,22 @@ 
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH>,
 					     <33 IRQ_TYPE_LEVEL_HIGH>;
 			};
+
+			emac0-rx-ecc@ff8c0800 {
+				compatible = "altr,socfpga-eth-mac-ecc";
+				reg = <0xff8c0800 0x400>;
+				altr,ecc-parent = <&gmac0>;
+				interrupts = <4 IRQ_TYPE_LEVEL_HIGH>,
+					     <36 IRQ_TYPE_LEVEL_HIGH>;
+			};
+
+			emac0-tx-ecc@ff8c0c00 {
+				compatible = "altr,socfpga-eth-mac-ecc";
+				reg = <0xff8c0c00 0x400>;
+				altr,ecc-parent = <&gmac0>;
+				interrupts = <5 IRQ_TYPE_LEVEL_HIGH>,
+					     <37 IRQ_TYPE_LEVEL_HIGH>;
+			};
 		};
 
 		rst: rstmgr@ffd05000 {