From: Minghuan Lian Minghuan.Lian@freescale.com
1. The patch call ft_pcie_setup() to disable PCIe dts node if corresponding PCIe controller is disabled according to RCW. 2. Fix LS2085a PCIe compatible
Signed-off-by: Minghuan Lian Minghuan.Lian@freescale.com Signed-off-by: Prabhakar Kushwaha prabhakar@freescale.com --- board/freescale/ls2085a/ls2085a.c | 4 ++++ board/freescale/ls2085aqds/ls2085aqds.c | 4 ++++ board/freescale/ls2085ardb/ls2085ardb.c | 4 ++++ include/configs/ls2085a_common.h | 3 ++- 4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/board/freescale/ls2085a/ls2085a.c b/board/freescale/ls2085a/ls2085a.c index dd0acf2..afb99d1 100644 --- a/board/freescale/ls2085a/ls2085a.c +++ b/board/freescale/ls2085a/ls2085a.c @@ -142,6 +142,10 @@ int ft_board_setup(void *blob, bd_t *bd) fsl_mc_ldpaa_exit(bd); #endif
+#ifdef CONFIG_PCI + ft_pcie_setup(blob, bd); +#endif + return 0; } #endif diff --git a/board/freescale/ls2085aqds/ls2085aqds.c b/board/freescale/ls2085aqds/ls2085aqds.c index 6a22122..b103224 100644 --- a/board/freescale/ls2085aqds/ls2085aqds.c +++ b/board/freescale/ls2085aqds/ls2085aqds.c @@ -255,6 +255,10 @@ int ft_board_setup(void *blob, bd_t *bd) fsl_mc_ldpaa_exit(bd); #endif
+#ifdef CONFIG_PCI + ft_pci_setup(blob, bd); +#endif + return 0; } #endif diff --git a/board/freescale/ls2085ardb/ls2085ardb.c b/board/freescale/ls2085ardb/ls2085ardb.c index e0a8a41..5abf273 100644 --- a/board/freescale/ls2085ardb/ls2085ardb.c +++ b/board/freescale/ls2085ardb/ls2085ardb.c @@ -253,6 +253,10 @@ int ft_board_setup(void *blob, bd_t *bd) fsl_mc_ldpaa_exit(bd); #endif
+#ifdef CONFIG_PCI + ft_pci_setup(blob, bd); +#endif + return 0; } #endif diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index e270fc8..749c58d 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -186,7 +186,8 @@ unsigned long long get_qixis_addr(void); #define CONFIG_PCIE2 /* PCIE controler 2 */ #define CONFIG_PCIE3 /* PCIE controler 3 */ #define CONFIG_PCIE4 /* PCIE controler 4 */ -#define FSL_PCIE_COMPAT "fsl,20851a-pcie" +#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ +#define FSL_PCIE_COMPAT "fsl,ls2085a-pcie"
#define CONFIG_SYS_PCI_64BIT