diff mbox series

[01/10] ARM: dts: uniphier: Add XDMAC node

Message ID 1584061096-23686-2-git-send-email-hayashi.kunihiko@socionext.com (mailing list archive)
State New, archived
Headers show
Series Add devicetree features and fixes for UniPhier SoCs | expand

Commit Message

Kunihiko Hayashi March 13, 2020, 12:58 a.m. UTC
Add external DMA controller support implemented in UniPhier SoCs.
This supports for Pro4, Pro5 and PXs2.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 arch/arm/boot/dts/uniphier-pro4.dtsi | 8 ++++++++
 arch/arm/boot/dts/uniphier-pro5.dtsi | 8 ++++++++
 arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 ++++++++
 3 files changed, 24 insertions(+)

Comments

Masahiro Yamada March 14, 2020, 2:14 a.m. UTC | #1
On Fri, Mar 13, 2020 at 9:58 AM Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> Add external DMA controller support implemented in UniPhier SoCs.
> This supports for Pro4, Pro5 and PXs2.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  arch/arm/boot/dts/uniphier-pro4.dtsi | 8 ++++++++
>  arch/arm/boot/dts/uniphier-pro5.dtsi | 8 ++++++++
>  arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 ++++++++
>  3 files changed, 24 insertions(+)
>
> diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
> index 2ec04d7..a1bfe0f 100644
> --- a/arch/arm/boot/dts/uniphier-pro4.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
> @@ -426,6 +426,14 @@
>                         };
>                 };
>
> +               xdmac: dma-controller@5fc10000 {
> +                       compatible = "socionext,uniphier-xdmac";
> +                       reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;



This is odd.
<0x5fc20000 0x800> causes reg overwrap with
aidet@5fc20000 below.



> +                       interrupts = <0 188 4>;
> +                       dma-channels = <16>;
> +                       #dma-cells = <2>;
> +               };
> +
>                 aidet: aidet@5fc20000 {
>                         compatible = "socionext,uniphier-pro4-aidet";
>                         reg = <0x5fc20000 0x200>;
> diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
> index ea3961f..ecab061 100644
> --- a/arch/arm/boot/dts/uniphier-pro5.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
> @@ -408,6 +408,14 @@
>                         };
>                 };
>
> +               xdmac: dma-controller@5fc10000 {
> +                       compatible = "socionext,uniphier-xdmac";
> +                       reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
> +                       interrupts = <0 188 4>;
> +                       dma-channels = <16>;
> +                       #dma-cells = <2>;
> +               };
> +
>                 aidet: aidet@5fc20000 {
>                         compatible = "socionext,uniphier-pro5-aidet";
>                         reg = <0x5fc20000 0x200>;
> diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> index 13b0d4a..6e60154 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> @@ -508,6 +508,14 @@
>                         };
>                 };
>
> +               xdmac: dma-controller@5fc10000 {
> +                       compatible = "socionext,uniphier-xdmac";
> +                       reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
> +                       interrupts = <0 188 4>;
> +                       dma-channels = <16>;
> +                       #dma-cells = <2>;
> +               };
> +
>                 aidet: aidet@5fc20000 {
>                         compatible = "socionext,uniphier-pxs2-aidet";
>                         reg = <0x5fc20000 0x200>;
> --
> 2.7.4
>


--
Best Regards

Masahiro Yamada
Kunihiko Hayashi March 16, 2020, 10:43 a.m. UTC | #2
On Sat, 14 Mar 2020 11:14:09 +0900 <yamada.masahiro@socionext.com> wrote:

> On Fri, Mar 13, 2020 at 9:58 AM Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
> >
> > Add external DMA controller support implemented in UniPhier SoCs.
> > This supports for Pro4, Pro5 and PXs2.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> >  arch/arm/boot/dts/uniphier-pro4.dtsi | 8 ++++++++
> >  arch/arm/boot/dts/uniphier-pro5.dtsi | 8 ++++++++
> >  arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 ++++++++
> >  3 files changed, 24 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
> > index 2ec04d7..a1bfe0f 100644
> > --- a/arch/arm/boot/dts/uniphier-pro4.dtsi
> > +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
> > @@ -426,6 +426,14 @@
> >                         };
> >                 };
> >
> > +               xdmac: dma-controller@5fc10000 {
> > +                       compatible = "socionext,uniphier-xdmac";
> > +                       reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
> 
> 
> 
> This is odd.
> <0x5fc20000 0x800> causes reg overwrap with
> aidet@5fc20000 below.

Thank you for pointing out.

Indeed, the address is wrong. I'll fix it.
And I'll also fix the example of dt-bindings.

Thank you,

---
Best Regards,
Kunihiko Hayashi
Masahiro Yamada March 16, 2020, 12:06 p.m. UTC | #3
On Mon, Mar 16, 2020 at 7:43 PM Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> On Sat, 14 Mar 2020 11:14:09 +0900 <yamada.masahiro@socionext.com> wrote:
>
> > On Fri, Mar 13, 2020 at 9:58 AM Kunihiko Hayashi
> > <hayashi.kunihiko@socionext.com> wrote:
> > >
> > > Add external DMA controller support implemented in UniPhier SoCs.
> > > This supports for Pro4, Pro5 and PXs2.
> > >
> > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > > ---
> > >  arch/arm/boot/dts/uniphier-pro4.dtsi | 8 ++++++++
> > >  arch/arm/boot/dts/uniphier-pro5.dtsi | 8 ++++++++
> > >  arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 ++++++++
> > >  3 files changed, 24 insertions(+)
> > >
> > > diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
> > > index 2ec04d7..a1bfe0f 100644
> > > --- a/arch/arm/boot/dts/uniphier-pro4.dtsi
> > > +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
> > > @@ -426,6 +426,14 @@
> > >                         };
> > >                 };
> > >
> > > +               xdmac: dma-controller@5fc10000 {
> > > +                       compatible = "socionext,uniphier-xdmac";
> > > +                       reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
> >
> >
> >
> > This is odd.
> > <0x5fc20000 0x800> causes reg overwrap with
> > aidet@5fc20000 below.
>
> Thank you for pointing out.
>
> Indeed, the address is wrong. I'll fix it.
> And I'll also fix the example of dt-bindings.
>
> Thank you,



You did not notice the over-wrap
because the second region is not used
from the driver.

Why did you define the unused region?


--
Best Regards
Masahiro Yamada
Kunihiko Hayashi March 17, 2020, 11:09 a.m. UTC | #4
On Mon, 16 Mar 2020 21:06:40 +0900 <masahiroy@kernel.org> wrote:

> On Mon, Mar 16, 2020 at 7:43 PM Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
> >
> > On Sat, 14 Mar 2020 11:14:09 +0900 <yamada.masahiro@socionext.com> wrote:
> >
> > > On Fri, Mar 13, 2020 at 9:58 AM Kunihiko Hayashi
> > > <hayashi.kunihiko@socionext.com> wrote:
> > > >
> > > > Add external DMA controller support implemented in UniPhier SoCs.
> > > > This supports for Pro4, Pro5 and PXs2.
> > > >
> > > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > > > ---
> > > >  arch/arm/boot/dts/uniphier-pro4.dtsi | 8 ++++++++
> > > >  arch/arm/boot/dts/uniphier-pro5.dtsi | 8 ++++++++
> > > >  arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 ++++++++
> > > >  3 files changed, 24 insertions(+)
> > > >
> > > > diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
> > > > index 2ec04d7..a1bfe0f 100644
> > > > --- a/arch/arm/boot/dts/uniphier-pro4.dtsi
> > > > +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
> > > > @@ -426,6 +426,14 @@
> > > >                         };
> > > >                 };
> > > >
> > > > +               xdmac: dma-controller@5fc10000 {
> > > > +                       compatible = "socionext,uniphier-xdmac";
> > > > +                       reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
> > >
> > >
> > >
> > > This is odd.
> > > <0x5fc20000 0x800> causes reg overwrap with
> > > aidet@5fc20000 below.
> >
> > Thank you for pointing out.
> >
> > Indeed, the address is wrong. I'll fix it.
> > And I'll also fix the example of dt-bindings.
> >
> > Thank you,
> 
> 
> 
> You did not notice the over-wrap
> because the second region is not used
> from the driver.
> 
> Why did you define the unused region?

There is an extention register area for xdmac, however, the current driver
doesn't have any features using this area.

The description of the area will be suppressed until some features that uses
the area are implemented.

Thank you,

---
Best Regards,
Kunihiko Hayashi
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index 2ec04d7..a1bfe0f 100644
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -426,6 +426,14 @@ 
 			};
 		};
 
+		xdmac: dma-controller@5fc10000 {
+			compatible = "socionext,uniphier-xdmac";
+			reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
+			interrupts = <0 188 4>;
+			dma-channels = <16>;
+			#dma-cells = <2>;
+		};
+
 		aidet: aidet@5fc20000 {
 			compatible = "socionext,uniphier-pro4-aidet";
 			reg = <0x5fc20000 0x200>;
diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index ea3961f..ecab061 100644
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -408,6 +408,14 @@ 
 			};
 		};
 
+		xdmac: dma-controller@5fc10000 {
+			compatible = "socionext,uniphier-xdmac";
+			reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
+			interrupts = <0 188 4>;
+			dma-channels = <16>;
+			#dma-cells = <2>;
+		};
+
 		aidet: aidet@5fc20000 {
 			compatible = "socionext,uniphier-pro5-aidet";
 			reg = <0x5fc20000 0x200>;
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index 13b0d4a..6e60154 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -508,6 +508,14 @@ 
 			};
 		};
 
+		xdmac: dma-controller@5fc10000 {
+			compatible = "socionext,uniphier-xdmac";
+			reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
+			interrupts = <0 188 4>;
+			dma-channels = <16>;
+			#dma-cells = <2>;
+		};
+
 		aidet: aidet@5fc20000 {
 			compatible = "socionext,uniphier-pxs2-aidet";
 			reg = <0x5fc20000 0x200>;