85xx: clean up the io_sel for PCI express of P1022

clean up the wrong io_sel for PCI express according to latest manual.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/cpu/mpc8xxx/pci_cfg.c b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
index 9b7181d5b6ff09443c6aafb137fb7ec715326fa0..85995cac95edc39a22c1cd5eecbcb9eb3feb29d0 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
+++ b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
@@ -176,15 +176,14 @@ static struct pci_info pci_config_info[] =
                         (1 << 0x1d) | (1 << 0x1e) | (1 << 0x1f),
        },
        [LAW_TRGT_IF_PCIE_2] = {
-               .cfg =   (1 << 0) | (1 << 1) | (1 << 6) | (1 << 7) |
-                        (1 << 9) | (1 << 0xa) | (1 << 0xb) | (1 << 0xd) |
-                        (1 << 0x15) | (1 << 0x16) | (1 << 0x17) |
-                        (1 << 0x18) | (1 << 0x1c),
+               .cfg =   (1 << 1) | (1 << 6) | (1 << 7) | (1 << 9) |
+                        (1 << 0xd) | (1 << 0x15) | (1 << 0x16) | (1 << 0x17) |
+                        (1 << 0x18) | (1 << 0x19) | (1 << 0x1a) | (1 << 0x1b),
        },
        [LAW_TRGT_IF_PCIE_3] = {
-               .cfg =   (1 << 6) | (1 << 7) | (1 << 9) | (1 << 0xd) |
-                        (1 << 0x15) | (1 << 0x16) | (1 << 0x17) | (1 << 0x18) |
-                        (1 << 0x19) | (1 << 0x1a) | (1 << 0x1b),
+               .cfg =   (1 << 0) | (1 << 1) | (1 << 6) | (1 << 7) | (1 << 9) |
+                        (1 << 0xa) | (1 << 0xb) | (1 << 0xd) | (1 << 0x15) |
+                        (1 << 0x16) | (1 << 0x17) | (1 << 0x18) | (1 << 0x1c),
        },
 };
 #elif defined(CONFIG_P2010) || defined(CONFIG_P2020)

diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index ef3a1e1c03fe3df24a1c62284e85d925d99a4028..e7954e657ca343af26e89234e3fd13a2006e7ef4 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -1873,8 +1873,13 @@ typedef struct ccsr_gur {
 #define MPC85xx_PORDEVSR_SGMII4_DIS    0x04000000
 #define MPC85xx_PORDEVSR_SRDS2_IO_SEL  0x38000000
 #define MPC85xx_PORDEVSR_PCI1          0x00800000
+#if defined(CONFIG_P1013) || defined(CONFIG_P1022)
+#define MPC85xx_PORDEVSR_IO_SEL                0x007c0000
+#define MPC85xx_PORDEVSR_IO_SEL_SHIFT  18
+#else
 #define MPC85xx_PORDEVSR_IO_SEL                0x00780000
 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT  19
+#endif
 #define MPC85xx_PORDEVSR_PCI2_ARB      0x00040000
 #define MPC85xx_PORDEVSR_PCI1_ARB      0x00020000
 #define MPC85xx_PORDEVSR_PCI1_PCI32    0x00010000