Patchwork [U-Boot,IXP42x,series,v4,02/17] add support for IXP42x Rev. B1 and newer

login
register
mail settings
Submitter Michael Schwingen
Date April 6, 2011, 9:49 p.m.
Message ID <1302126558-1318-3-git-send-email-michael@schwingen.org>
Download mbox | patch
Permalink /patch/90089/
State Superseded
Delegated to: Marek Vasut
Headers show

Comments

Michael Schwingen - April 6, 2011, 9:49 p.m.
Signed-off-by: Michael Schwingen <michael@schwingen.org>
---
Changes for V2:

Changes for V3:
 - reformat to wrap long lines
Changes for V4:
 - add changelog

 arch/arm/cpu/ixp/npe/npe.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Marek Vasut - May 20, 2011, 11:53 p.m.
On Wednesday, April 06, 2011 11:49:03 PM Michael Schwingen wrote:
> Signed-off-by: Michael Schwingen <michael@schwingen.org>
> ---
> Changes for V2:
> 
> Changes for V3:
>  - reformat to wrap long lines
> Changes for V4:
>  - add changelog
> 
>  arch/arm/cpu/ixp/npe/npe.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/ixp/npe/npe.c b/arch/arm/cpu/ixp/npe/npe.c
> index 857bcad..6d92c53 100644
> --- a/arch/arm/cpu/ixp/npe/npe.c
> +++ b/arch/arm/cpu/ixp/npe/npe.c
> @@ -621,9 +621,12 @@ int npe_initialize(bd_t * bis)
>  			if (ixFeatureCtrlDeviceRead() == 
IX_FEATURE_CTRL_DEVICE_TYPE_IXP42X) {
>  				switch (ixFeatureCtrlProductIdRead() &
> IX_FEATURE_CTRL_SILICON_STEPPING_MASK) { case
> IX_FEATURE_CTRL_SILICON_TYPE_B0:
> +				default: /* newer than B0 */
>  					/*
> -					 * If it is B0 Silicon, we only enable port when its 
corresponding
> -					 * Eth Coprocessor is available.
> +					 * If it is B0 or newer Silicon, we
> +					 * only enable port when its
> +					 * corresponding Eth Coprocessor is
> +					 * available.
>  					 */
>  					if (ixFeatureCtrlComponentCheck(IX_FEATURECTRL_ETH0) ==
>  					    IX_FEATURE_CTRL_COMPONENT_ENABLED)

Acked-by: Marek Vasut <marek.vasut@gmail.com>
Wolfgang Denk - May 21, 2011, 6:31 p.m.
Dear Marek Vasut,

In message <201105210153.32456.marek.vasut@gmail.com> you wrote:
> On Wednesday, April 06, 2011 11:49:03 PM Michael Schwingen wrote:
> > Signed-off-by: Michael Schwingen <michael@schwingen.org>
> > ---
> > Changes for V2:
> > 
> > Changes for V3:
> >  - reformat to wrap long lines
> > Changes for V4:
> >  - add changelog
> > 
> >  arch/arm/cpu/ixp/npe/npe.c |    7 +++++--
> >  1 files changed, 5 insertions(+), 2 deletions(-)
...
> Acked-by: Marek Vasut <marek.vasut@gmail.com>

I'm not sure what this ACK means.  I would expect that you apply this
patch to your tree and send me a pull request?

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/arm/cpu/ixp/npe/npe.c b/arch/arm/cpu/ixp/npe/npe.c
index 857bcad..6d92c53 100644
--- a/arch/arm/cpu/ixp/npe/npe.c
+++ b/arch/arm/cpu/ixp/npe/npe.c
@@ -621,9 +621,12 @@  int npe_initialize(bd_t * bis)
 			if (ixFeatureCtrlDeviceRead() == IX_FEATURE_CTRL_DEVICE_TYPE_IXP42X) {
 				switch (ixFeatureCtrlProductIdRead() & IX_FEATURE_CTRL_SILICON_STEPPING_MASK) {
 				case IX_FEATURE_CTRL_SILICON_TYPE_B0:
+				default: /* newer than B0 */
 					/*
-					 * If it is B0 Silicon, we only enable port when its corresponding
-					 * Eth Coprocessor is available.
+					 * If it is B0 or newer Silicon, we
+					 * only enable port when its
+					 * corresponding Eth Coprocessor is
+					 * available.
 					 */
 					if (ixFeatureCtrlComponentCheck(IX_FEATURECTRL_ETH0) ==
 					    IX_FEATURE_CTRL_COMPONENT_ENABLED)