| Message ID | 1524854238-19394-4-git-send-email-thor.thayer@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 27, 2018 at 01:37:18PM -0500, thor.thayer@linux.intel.com wrote: > From: Thor Thayer <thor.thayer@linux.intel.com> > > Add the Stratix10 ECC Manager and SDRAM EDAC nodes to the > device tree. > > Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> > --- > v2 Remove unused SysMan syscon > Remove unused SDRAM ECC register defines > Remove unused address, size and range from device tree. > --- > arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi > index c89d0c307f8d..688391f3bf78 100644 > --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi > +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi > @@ -387,5 +387,17 @@ > resets = <&rst WATCHDOG3_RESET>; > status = "disabled"; > }; > + > + eccmgr { > + compatible = "altr,socfpga-s10-ecc-manager"; > + interrupts = <0 15 4>, <0 95 4>; > + interrupt-controller; > + #interrupt-cells = <2>; > + > + sdramedac { > + compatible = "altr,sdram-edac-s10"; > + interrupts = <16 4>, <48 4>; > + }; > + }; > }; > }; > -- > 2.7.4 > > -- Hey Rob, ACK here too? Also, this one: https://lkml.kernel.org/r/1525203036-21774-1-git-send-email-thor.thayer@linux.intel.com ? Thx.
On Mon, May 7, 2018 at 11:59 AM, Borislav Petkov <bp@alien8.de> wrote: > On Fri, Apr 27, 2018 at 01:37:18PM -0500, thor.thayer@linux.intel.com wrote: >> From: Thor Thayer <thor.thayer@linux.intel.com> >> >> Add the Stratix10 ECC Manager and SDRAM EDAC nodes to the >> device tree. >> >> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> >> --- >> v2 Remove unused SysMan syscon >> Remove unused SDRAM ECC register defines >> Remove unused address, size and range from device tree. >> --- >> arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi >> index c89d0c307f8d..688391f3bf78 100644 >> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi >> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi >> @@ -387,5 +387,17 @@ >> resets = <&rst WATCHDOG3_RESET>; >> status = "disabled"; >> }; >> + >> + eccmgr { >> + compatible = "altr,socfpga-s10-ecc-manager"; >> + interrupts = <0 15 4>, <0 95 4>; >> + interrupt-controller; >> + #interrupt-cells = <2>; >> + >> + sdramedac { >> + compatible = "altr,sdram-edac-s10"; >> + interrupts = <16 4>, <48 4>; >> + }; >> + }; >> }; >> }; >> -- >> 2.7.4 >> >> -- > > Hey Rob, > > ACK here too? > > Also, this one: > > https://lkml.kernel.org/r/1525203036-21774-1-git-send-email-thor.thayer@linux.intel.com > > ? > Just in case you need mine, since the edits here match what was in the in the bindings doc. Acked-by: Dinh Nguyen <dinguyen@kernel.org> Thanks, Dinh
Hi Boris, On Mon, May 7, 2018 at 3:50 PM, Dinh Nguyen <dinh.linux@gmail.com> wrote: > On Mon, May 7, 2018 at 11:59 AM, Borislav Petkov <bp@alien8.de> wrote: >> On Fri, Apr 27, 2018 at 01:37:18PM -0500, thor.thayer@linux.intel.com wrote: >>> From: Thor Thayer <thor.thayer@linux.intel.com> >>> >>> Add the Stratix10 ECC Manager and SDRAM EDAC nodes to the >>> device tree. >>> >>> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> >>> --- >>> v2 Remove unused SysMan syscon >>> Remove unused SDRAM ECC register defines >>> Remove unused address, size and range from device tree. >>> --- >>> arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 ++++++++++++ >>> 1 file changed, 12 insertions(+) >>> >>> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi >>> index c89d0c307f8d..688391f3bf78 100644 >>> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi >>> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi >>> @@ -387,5 +387,17 @@ >>> resets = <&rst WATCHDOG3_RESET>; >>> status = "disabled"; >>> }; >>> + >>> + eccmgr { >>> + compatible = "altr,socfpga-s10-ecc-manager"; >>> + interrupts = <0 15 4>, <0 95 4>; >>> + interrupt-controller; >>> + #interrupt-cells = <2>; >>> + >>> + sdramedac { >>> + compatible = "altr,sdram-edac-s10"; >>> + interrupts = <16 4>, <48 4>; >>> + }; >>> + }; >>> }; >>> }; >>> -- >>> 2.7.4 >>> >>> -- >> >> Hey Rob, >> >> ACK here too? >> >> Also, this one: >> >> https://lkml.kernel.org/r/1525203036-21774-1-git-send-email-thor.thayer@linux.intel.com >> >> ? >> > > Just in case you need mine, since the edits here match what was in the > in the bindings doc. > > Acked-by: Dinh Nguyen <dinguyen@kernel.org> > Do you mind if I take this patch through arm-soc? I have a pull request to arm-soc that is pending. http://lists.infradead.org/pipermail/linux-arm-kernel/2018-April/573133.html In that pull request, there is a patch: https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git/commit/?h=socfpga_for_next_v4.18_dts_v1&id=d93101abe41e9596555a0f7f6f775e543b71c441 This patch has some major changes to the socfpga_stratix10.dtsi file that will conflict with this patch. If it's okay with you. Thanks, Dinh
On Mon, May 07, 2018 at 04:10:01PM -0500, Dinh Nguyen wrote:
> Do you mind if I take this patch through arm-soc?
Sure, but you have to give me an immutable branch which I can merge into
my tree so that the functionality in 2/3 can get used when it lands in
linux-next and later in mainline.
So please take it and give me the tag (I see you're using tags) which
you're sending up.
Thx.
Hi Boris, On Tue, May 8, 2018 at 3:53 AM, Borislav Petkov <bp@alien8.de> wrote: > On Mon, May 07, 2018 at 04:10:01PM -0500, Dinh Nguyen wrote: >> Do you mind if I take this patch through arm-soc? > > Sure, but you have to give me an immutable branch which I can merge into > my tree so that the functionality in 2/3 can get used when it lands in > linux-next and later in mainline. > > So please take it and give me the tag (I see you're using tags) which > you're sending up. > Please this tag socfpga_updates_for_v4.18_part2 at : git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git Thanks, Dinh
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi index c89d0c307f8d..688391f3bf78 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -387,5 +387,17 @@ resets = <&rst WATCHDOG3_RESET>; status = "disabled"; }; + + eccmgr { + compatible = "altr,socfpga-s10-ecc-manager"; + interrupts = <0 15 4>, <0 95 4>; + interrupt-controller; + #interrupt-cells = <2>; + + sdramedac { + compatible = "altr,sdram-edac-s10"; + interrupts = <16 4>, <48 4>; + }; + }; }; };