kconfig: move FSL_PCIE_COMPAT to platform Kconfig

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index 9ffb90eff945279927fc1c6ace3dc5dc25571824..b61f3cdcded1ece1b8a8af7b5973fb79dc674cc6 100644 (file)
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -18,6 +18,14 @@ config ARCH_LS1021A
 menu "LS102xA architecture"
        depends on ARCH_LS1021A
 
+config FSL_PCIE_COMPAT
+       string "PCIe compatible of Kernel DT"
+       depends on PCIE_LAYERSCAPE
+       default "fsl,ls1021a-pcie" if ARCH_LS1021A
+       help
+         This compatible is used to find pci controller node in Kernel DT
+         to complete fixup.
+
 config LS1_DEEP_SLEEP
        bool "Deep sleep"
        depends on ARCH_LS1021A

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index de0b580e964391af2d3ff471b2a49582ecf4f65c..9d37b2ff25fb679c79574b2a0c862b3084f8d5a5 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -75,6 +75,17 @@ config FSL_LSCH3
 menu "Layerscape architecture"
        depends on FSL_LSCH2 || FSL_LSCH3
 
+config FSL_PCIE_COMPAT
+       string "PCIe compatible of Kernel DT"
+       depends on PCIE_LAYERSCAPE
+       default "fsl,ls1012a-pcie" if ARCH_LS1012A
+       default "fsl,ls1043a-pcie" if ARCH_LS1043A
+       default "fsl,ls1046a-pcie" if ARCH_LS1046A
+       default "fsl,ls2080a-pcie" if ARCH_LS2080A
+       help
+         This compatible is used to find pci controller node in Kernel DT
+         to complete fixup.
+
 menu "Layerscape PPA"
 config FSL_LS_PPA
        bool "FSL Layerscape PPA firmware support"

diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 47e621f7b5fcc6c9e3c898c64e15c4aa1a7bfd77..19ede2f104d36484bbdf056cd7e5ad694954fb5b 100644 (file)
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -77,9 +77,9 @@ static void fdt_pcie_set_msi_map_entry(void *blob, struct ls_pcie *pcie,
        nodeoffset = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie",
                                                   pcie->dbi_res.start);
        if (nodeoffset < 0) {
-#ifdef FSL_PCIE_COMPAT /* Compatible with older version of dts node */
+#ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */
                nodeoffset = fdt_node_offset_by_compat_reg(blob,
-                               FSL_PCIE_COMPAT, pcie->dbi_res.start);
+                               CONFIG_FSL_PCIE_COMPAT, pcie->dbi_res.start);
                if (nodeoffset < 0)
                        return;
 #else
@@ -150,9 +150,9 @@ static void ft_pcie_ls_setup(void *blob, struct ls_pcie *pcie)
        off = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie",
                                            pcie->dbi_res.start);
        if (off < 0) {
-#ifdef FSL_PCIE_COMPAT /* Compatible with older version of dts node */
+#ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */
                off = fdt_node_offset_by_compat_reg(blob,
-                                                   FSL_PCIE_COMPAT,
+                                                   CONFIG_FSL_PCIE_COMPAT,
                                                    pcie->dbi_res.start);
                if (off < 0)
                        return;

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 4d9a8141e7628da0713cbecbc3088ab42aa94f71..45da2af26fb28db2820c4ccc5b21dbf5b6b5095c 100644 (file)
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -154,7 +154,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                                CONFIG_SYS_SCSI_MAX_LUN)
 #define CONFIG_PCIE1           /* PCIE controller 1 */
-#define FSL_PCIE_COMPAT "fsl,ls1043a-pcie"
 
 #define CONFIG_NET_MULTI
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 23214e753234bf45cc3e88821fd251ff6983234c..7e4e480dc3fe62ffc5a191be51512d07b3978c5b 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -67,7 +67,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                                CONFIG_SYS_SCSI_MAX_LUN)
 #define CONFIG_PCIE1           /* PCIE controller 1 */
-#define FSL_PCIE_COMPAT "fsl,ls1043a-pcie"
 
 #define CONFIG_NET_MULTI
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index f1d197592ba0f1269bdcb2afb7284d30fb62e8dd..1b4b4471482c47b80333064f0d49a112e18981e9 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -500,7 +500,6 @@ unsigned long get_board_ddr_clk(void);
 /* PCIe */
 #define CONFIG_PCIE1           /* PCIE controller 1 */
 #define CONFIG_PCIE2           /* PCIE controller 2 */
-#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie"
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 6aff6b5276ba5e68989a2efc39bb393a84feba87..b54c4d3ce1f2f8e16bc3e6ac41d051bd8cfa8607 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -370,7 +370,6 @@
 /* PCIe */
 #define CONFIG_PCIE1           /* PCIE controller 1 */
 #define CONFIG_PCIE2           /* PCIE controller 2 */
-#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie"
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index ff521ab5cc252b877e85e340c1704757f5d72165..740d2d63b9e3d2695ad0f49e308301d2872fea8b 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -118,7 +118,6 @@
 #define CONFIG_PCIE1           /* PCIE controller 1 */
 #define CONFIG_PCIE2           /* PCIE controller 2 */
 #define CONFIG_PCIE3           /* PCIE controller 3 */
-#define FSL_PCIE_COMPAT "fsl,ls1043a-pcie"
 
 #ifdef CONFIG_PCI
 #define CONFIG_NET_MULTI

diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 805457d89ab5f4213d248a06b2c1e3d0798a9127..eb628fd495b6d5e9bc47f3d763d0144e50fad59b 100644 (file)
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -170,9 +170,6 @@ unsigned long long get_qixis_addr(void);
 #define CONFIG_SYS_MC_RSV_MEM_ALIGN                    (512UL * 1024 * 1024)
 #endif
 
-/* PCIe */
-#define FSL_PCIE_COMPAT "fsl,ls2080a-pcie"
-
 /* Command line configuration */
 #define CONFIG_CMD_ENV