[PATCH] [POWERPC] 4xx: Fix Haleakala PCIe compatibility problem in dts

[PATCH] [POWERPC] 4xx: Fix Haleakala PCIe compatibility problem in dts

[Stefan Roese]

Since the 4xx PCIe driver checks for 405ex compatibility, the
PCIe interface was not detected as it is currently defined as
"405exr" compatible. This patch changes it to "405ex".

The 405EX and 405EXr are identical exept that the 2nd PCIe and the
2nd EMAC interfaces are missing.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 arch/powerpc/boot/dts/haleakala.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index 5dd3d15..ae68fef 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -235,7 +235,7 @@
 			#interrupt-cells = <1>;
 			#size-cells = <2>;
 			#address-cells = <3>;
-			compatible = "ibm,plb-pciex-405exr", "ibm,plb-pciex";
+			compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
 			primary;
 			port = <0>; /* port number */
 			reg = <a0000000 20000000	/* Config space access */
-- 
1.5.4.2

Re: [PATCH] [POWERPC] 4xx: Fix Haleakala PCIe compatibility problem in dts

[Josh Boyer]

On Wed, 20 Feb 2008 11:45:58 +0100
Stefan Roese <sr@denx.de> wrote:

> Since the 4xx PCIe driver checks for 405ex compatibility, the
> PCIe interface was not detected as it is currently defined as
> "405exr" compatible. This patch changes it to "405ex".
> 
> The 405EX and 405EXr are identical exept that the 2nd PCIe and the
> 2nd EMAC interfaces are missing.

Does ppc405ex_pciex_core_init need to grow some logic to detect 405ex
from 405exr and return the correct number of ports then?  It
unconditionally returns 2 today.

josh

Re: [PATCH] [POWERPC] 4xx: Fix Haleakala PCIe compatibility problem in dts

[Stefan Roese]

On Wednesday 20 February 2008, Josh Boyer wrote:
> > Since the 4xx PCIe driver checks for 405ex compatibility, the
> > PCIe interface was not detected as it is currently defined as
> > "405exr" compatible. This patch changes it to "405ex".
> >
> > The 405EX and 405EXr are identical exept that the 2nd PCIe and the
> > 2nd EMAC interfaces are missing.
>
> Does ppc405ex_pciex_core_init need to grow some logic to detect 405ex
> from 405exr and return the correct number of ports then?  It
> unconditionally returns 2 today.

Yes, this could be done. Right now it works because the 405EXr board 
(Haleakala) only instantiates one PCIe device in the dts.

A simple solution would be to just do a PVR check. Would this be acceptable?

Best regards,
Stefan

Re: [PATCH] [POWERPC] 4xx: Fix Haleakala PCIe compatibility problem in dts

[Josh Boyer]

On Wed, 20 Feb 2008 14:16:53 +0100
Stefan Roese <sr@denx.de> wrote:

> > > The 405EX and 405EXr are identical exept that the 2nd PCIe and the
> > > 2nd EMAC interfaces are missing.
> >
> > Does ppc405ex_pciex_core_init need to grow some logic to detect 405ex
> > from 405exr and return the correct number of ports then?  It
> > unconditionally returns 2 today.
> 
> Yes, this could be done. Right now it works because the 405EXr board 
> (Haleakala) only instantiates one PCIe device in the dts.
> 
> A simple solution would be to just do a PVR check. Would this be acceptable?

Looking more at the code, it seems like it's really not needed.
Essentially the only thing that is "wrong" is that we allocate an extra
structure that goes unused.

As long as the DTS file doesn't list a second bogus port, things work
fine.  So I'm inclined to take your patch as-is.

josh