85xx/mpc8536ds: Use is_serdes_configured() to determine of PCIe enabled

[u-boot] / arch / powerpc / cpu / mpc8xxx / pci_cfg.c

diff --git a/arch/powerpc/cpu/mpc8xxx/pci_cfg.c b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
index 9b7181d5b6ff09443c6aafb137fb7ec715326fa0..186936f23e830b189e6c350433b1f02496f67847 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
+++ b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
@@ -56,18 +56,6 @@ static struct pci_info pci_config_info[] =
 #elif defined(CONFIG_MPC8536)
 static struct pci_info pci_config_info[] =
 {
-       [LAW_TRGT_IF_PCI] = {
-               .cfg =   0,
-       },
-       [LAW_TRGT_IF_PCIE_1] = {
-               .cfg =   (1 << 2) | (1 << 3) | (1 << 5) | (1 << 7),
-       },
-       [LAW_TRGT_IF_PCIE_2] = {
-               .cfg =   (1 << 5) | (1 << 7),
-       },
-       [LAW_TRGT_IF_PCIE_3] = {
-               .cfg =   (1 << 7),
-       },
 };
 #elif defined(CONFIG_MPC8544)
 static struct pci_info pci_config_info[] =
@@ -176,15 +164,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)