diff mbox

[v2] powerpc/4xx: Add 16K FIFO size DTS entries on supported platforms

Message ID 1255019609-2033-1-git-send-email-dmitchell@appliedmicro.com (mailing list archive)
State Not Applicable
Delegated to: Josh Boyer
Headers show

Commit Message

Dave Mitchell Oct. 8, 2009, 4:33 p.m. UTC
Adding tx/rx-fifo-size-gige to EMAC fields for evaluation kit DTS
files where appropriate.

Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com>
Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com>
Acked-by: Victor Gallardo <vgallardo@appliedmicro.com>
Acked-by: Loc Ho <lho@appliedmicro.com>
---
 v1->v2: local date/time was out-of-sync and thus mail was as well

 arch/powerpc/boot/dts/canyonlands.dts |    2 ++
 arch/powerpc/boot/dts/eiger.dts       |    6 ++++++
 arch/powerpc/boot/dts/glacier.dts     |    6 ++++++
 arch/powerpc/boot/dts/haleakala.dts   |    2 ++
 arch/powerpc/boot/dts/kilauea.dts     |    4 ++++
 arch/powerpc/boot/dts/makalu.dts      |    4 ++++
 arch/powerpc/boot/dts/redwood.dts     |    1 +
 7 files changed, 25 insertions(+), 0 deletions(-)

Comments

Benjamin Herrenschmidt Oct. 9, 2009, 2:15 a.m. UTC | #1
On Thu, 2009-10-08 at 11:33 -0500, Dave Mitchell wrote:
> Adding tx/rx-fifo-size-gige to EMAC fields for evaluation kit DTS
> files where appropriate.
> 
> Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com>
> Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com>
> Acked-by: Victor Gallardo <vgallardo@appliedmicro.com>
> Acked-by: Loc Ho <lho@appliedmicro.com>
> ---
>  v1->v2: local date/time was out-of-sync and thus mail was as well

I'll have to wait for the EMAC patch to go in, so ping me if you don't
see me take that one after that happens.

Cheers,
Ben.

>  arch/powerpc/boot/dts/canyonlands.dts |    2 ++
>  arch/powerpc/boot/dts/eiger.dts       |    6 ++++++
>  arch/powerpc/boot/dts/glacier.dts     |    6 ++++++
>  arch/powerpc/boot/dts/haleakala.dts   |    2 ++
>  arch/powerpc/boot/dts/kilauea.dts     |    4 ++++
>  arch/powerpc/boot/dts/makalu.dts      |    4 ++++
>  arch/powerpc/boot/dts/redwood.dts     |    1 +
>  7 files changed, 25 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
> index c920170..cd56bb5 100644
> --- a/arch/powerpc/boot/dts/canyonlands.dts
> +++ b/arch/powerpc/boot/dts/canyonlands.dts
> @@ -352,6 +352,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> @@ -381,6 +382,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> diff --git a/arch/powerpc/boot/dts/eiger.dts b/arch/powerpc/boot/dts/eiger.dts
> index c4a934f..48bcf71 100644
> --- a/arch/powerpc/boot/dts/eiger.dts
> +++ b/arch/powerpc/boot/dts/eiger.dts
> @@ -316,6 +316,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> @@ -345,6 +346,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> @@ -375,6 +377,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>; /* emac2&3 only */
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII1>;
> @@ -403,6 +407,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>; /* emac2&3 only */
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII1>;
> diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
> index f3787a2..f6f6189 100644
> --- a/arch/powerpc/boot/dts/glacier.dts
> +++ b/arch/powerpc/boot/dts/glacier.dts
> @@ -292,6 +292,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> @@ -321,6 +322,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> @@ -351,6 +353,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>; /* emac2&3 only */
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII1>;
> @@ -379,6 +383,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>; /* emac2&3 only */
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII1>;
> diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
> index 5b2a494..2b25669 100644
> --- a/arch/powerpc/boot/dts/haleakala.dts
> +++ b/arch/powerpc/boot/dts/haleakala.dts
> @@ -226,6 +226,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
> index c465614..083e68e 100644
> --- a/arch/powerpc/boot/dts/kilauea.dts
> +++ b/arch/powerpc/boot/dts/kilauea.dts
> @@ -272,6 +272,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> @@ -300,6 +302,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
> index ffc246e..63d48b6 100644
> --- a/arch/powerpc/boot/dts/makalu.dts
> +++ b/arch/powerpc/boot/dts/makalu.dts
> @@ -227,6 +227,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
> +				tx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x0000003f>;	/* Start at 6 */
>  				rgmii-device = <&RGMII0>;
> @@ -255,6 +257,8 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +                                rx-fifo-size-gige = <16384>;
> +                                tx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
> diff --git a/arch/powerpc/boot/dts/redwood.dts b/arch/powerpc/boot/dts/redwood.dts
> index ad402c4..d2af32e 100644
> --- a/arch/powerpc/boot/dts/redwood.dts
> +++ b/arch/powerpc/boot/dts/redwood.dts
> @@ -226,6 +226,7 @@
>  				max-frame-size = <9000>;
>  				rx-fifo-size = <4096>;
>  				tx-fifo-size = <2048>;
> +				rx-fifo-size-gige = <16384>;
>  				phy-mode = "rgmii";
>  				phy-map = <0x00000000>;
>  				rgmii-device = <&RGMII0>;
Josh Boyer Oct. 9, 2009, 11:50 a.m. UTC | #2
On Fri, Oct 09, 2009 at 01:15:54PM +1100, Benjamin Herrenschmidt wrote:
>On Thu, 2009-10-08 at 11:33 -0500, Dave Mitchell wrote:
>> Adding tx/rx-fifo-size-gige to EMAC fields for evaluation kit DTS
>> files where appropriate.
>> 
>> Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com>
>> Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com>
>> Acked-by: Victor Gallardo <vgallardo@appliedmicro.com>
>> Acked-by: Loc Ho <lho@appliedmicro.com>
>> ---
>>  v1->v2: local date/time was out-of-sync and thus mail was as well
>
>I'll have to wait for the EMAC patch to go in, so ping me if you don't
>see me take that one after that happens.

I have some other DTS changes I'll be making soon.  Mind if I pick it up
in my tree to avoid headaches?  I will, of course, wait until the EMAC
patch is merged.

josh
Benjamin Herrenschmidt Oct. 9, 2009, 9:22 p.m. UTC | #3
On Fri, 2009-10-09 at 07:50 -0400, Josh Boyer wrote:
> On Fri, Oct 09, 2009 at 01:15:54PM +1100, Benjamin Herrenschmidt wrote:
> >On Thu, 2009-10-08 at 11:33 -0500, Dave Mitchell wrote:
> >> Adding tx/rx-fifo-size-gige to EMAC fields for evaluation kit DTS
> >> files where appropriate.
> >> 
> >> Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com>
> >> Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com>
> >> Acked-by: Victor Gallardo <vgallardo@appliedmicro.com>
> >> Acked-by: Loc Ho <lho@appliedmicro.com>
> >> ---
> >>  v1->v2: local date/time was out-of-sync and thus mail was as well
> >
> >I'll have to wait for the EMAC patch to go in, so ping me if you don't
> >see me take that one after that happens.
> 
> I have some other DTS changes I'll be making soon.  Mind if I pick it up
> in my tree to avoid headaches?  I will, of course, wait until the EMAC
> patch is merged.

Sure. Just assign it to yourself in PW

Cheers,
Ben.
diff mbox

Patch

diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index c920170..cd56bb5 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -352,6 +352,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
@@ -381,6 +382,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
diff --git a/arch/powerpc/boot/dts/eiger.dts b/arch/powerpc/boot/dts/eiger.dts
index c4a934f..48bcf71 100644
--- a/arch/powerpc/boot/dts/eiger.dts
+++ b/arch/powerpc/boot/dts/eiger.dts
@@ -316,6 +316,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
@@ -345,6 +346,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
@@ -375,6 +377,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>; /* emac2&3 only */
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII1>;
@@ -403,6 +407,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>; /* emac2&3 only */
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII1>;
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index f3787a2..f6f6189 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -292,6 +292,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
@@ -321,6 +322,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
@@ -351,6 +353,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>; /* emac2&3 only */
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII1>;
@@ -379,6 +383,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>; /* emac2&3 only */
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII1>;
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index 5b2a494..2b25669 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -226,6 +226,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index c465614..083e68e 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -272,6 +272,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
@@ -300,6 +302,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index ffc246e..63d48b6 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -227,6 +227,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
+				tx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x0000003f>;	/* Start at 6 */
 				rgmii-device = <&RGMII0>;
@@ -255,6 +257,8 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+                                rx-fifo-size-gige = <16384>;
+                                tx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;
diff --git a/arch/powerpc/boot/dts/redwood.dts b/arch/powerpc/boot/dts/redwood.dts
index ad402c4..d2af32e 100644
--- a/arch/powerpc/boot/dts/redwood.dts
+++ b/arch/powerpc/boot/dts/redwood.dts
@@ -226,6 +226,7 @@ 
 				max-frame-size = <9000>;
 				rx-fifo-size = <4096>;
 				tx-fifo-size = <2048>;
+				rx-fifo-size-gige = <16384>;
 				phy-mode = "rgmii";
 				phy-map = <0x00000000>;
 				rgmii-device = <&RGMII0>;