* Patch by Denis Peter, 04 June 2003:

[u-boot.git] / cpu / ppc4xx / 405gp_pci.c

diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c
index 728952312ea2b644f138af6064c83b8abc512ab6..82142a2ccb4f24cd7eb7edb6be8bb367de741298 100644 (file)
--- a/cpu/ppc4xx/405gp_pci.c
+++ b/cpu/ppc4xx/405gp_pci.c
@@ -177,7 +177,7 @@ void pci_405gp_init(struct pci_controller *hose)
         * PLB address 0x80000000-0xBFFFFFFF ==> PCI address 0x80000000-0xBFFFFFFF
         * Use byte reversed out routines to handle endianess.
         *--------------------------------------------------------------------------*/
-       out32r(PMM0MA,    pmmma[0]);          /* ensure disabled b4 setting PMM0LA */
+       out32r(PMM0MA,    (pmmma[0]&~0x1)); /* disable, configure PMMxLA, PMMxPCILA first */
        out32r(PMM0LA,    pmmla[0]);
        out32r(PMM0PCILA, pmmpcila[0]);
        out32r(PMM0PCIHA, pmmpciha[0]);
@@ -186,7 +186,7 @@ void pci_405gp_init(struct pci_controller *hose)
        /*--------------------------------------------------------------------------+
         * PMM1 is not used.  Initialize them to zero.
         *--------------------------------------------------------------------------*/
-       out32r(PMM1MA,    pmmma[1]);          /* ensure disabled b4 setting PMM2LA */
+       out32r(PMM1MA,    (pmmma[1]&~0x1));
        out32r(PMM1LA,    pmmla[1]);
        out32r(PMM1PCILA, pmmpcila[1]);
        out32r(PMM1PCIHA, pmmpciha[1]);
@@ -195,7 +195,7 @@ void pci_405gp_init(struct pci_controller *hose)
        /*--------------------------------------------------------------------------+
         * PMM2 is not used.  Initialize them to zero.
         *--------------------------------------------------------------------------*/
-       out32r(PMM2MA,    pmmma[2]);          /* ensure disabled b4 setting PMM2LA */
+       out32r(PMM2MA,    (pmmma[2]&~0x1)); 
        out32r(PMM2LA,    pmmla[2]);
        out32r(PMM2PCILA, pmmpcila[2]);
        out32r(PMM2PCIHA, pmmpciha[2]);