From 8eb2f9b3cb6ff9785a81e99fa500cd075ede395d Mon Sep 17 00:00:00 2001
From: Sham Muthayyan <smuthayy@codeaurora.org>
Date: Tue, 30 Oct 2018 14:50:50 +0530
Subject: [PATCH] Revert "ipq807x: Disable PCI in dts for HKV2"

This reverts commit 51ac77307a6b5582b6e77279d68915560f11dac1.
---
 board/qca/arm/common/fdt_fixup.c | 13 -------------
 board/qca/arm/ipq807x/ipq807x.c  | 23 -----------------------
 2 files changed, 36 deletions(-)

diff --git a/board/qca/arm/common/fdt_fixup.c b/board/qca/arm/common/fdt_fixup.c
index fae655aaa7..e4b2d93f0b 100644
--- a/board/qca/arm/common/fdt_fixup.c
+++ b/board/qca/arm/common/fdt_fixup.c
@@ -491,10 +491,6 @@ __weak void fdt_fixup_cpr(void *blob)
 {
 	return;
 }
-__weak void ipq_fdt_fixup_pci_status(void *blob)
-{
-	return;
-}
 
 /*
  * For newer kernel that boot with device tree (3.14+), all of memory is
@@ -516,7 +512,6 @@ int ft_board_setup(void *blob, bd_t *bd)
 	int len = sizeof(parts_str), ret;
 	qca_smem_flash_info_t *sfi = &qca_smem_flash_info;
 	int activepart = 0;
-	uint32_t soc_version, soc_ver_major = 1 ;
 	struct flash_node_info nodes[] = {
 		{ "qcom,msm-nand", MTD_DEV_TYPE_NAND, 0 },
 		{ "qcom,qcom_nand", MTD_DEV_TYPE_NAND, 0 },
@@ -528,11 +523,6 @@ int ft_board_setup(void *blob, bd_t *bd)
 		{ NULL, 0, -1 },	/* Terminator */
 	};
 
-	ret = ipq_smem_get_socinfo_version((uint32_t *)&soc_version);
-	if (!ret) {
-		soc_ver_major = SOCINFO_VERSION_MAJOR(soc_version);
-	}
-
 	fdt_fixup_memory_banks(blob, &memory_start, &memory_size, 1);
 	ipq_fdt_fixup_version(blob);
 #ifndef CONFIG_QCA_APPSBL_DLOAD
@@ -597,9 +587,6 @@ int ft_board_setup(void *blob, bd_t *bd)
 	fdt_fixup_auto_restart(blob);
 	fdt_fixup_sd_ldo_gpios_toggle(blob);
 	fdt_fixup_cpr(blob);
-	if (soc_ver_major == 2) {
-		ipq_fdt_fixup_pci_status(blob);
-	}
 
 #ifdef CONFIG_QCA_MMC
 	board_mmc_deinit();
diff --git a/board/qca/arm/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c
index b9088e77c9..7c94b777c0 100644
--- a/board/qca/arm/ipq807x/ipq807x.c
+++ b/board/qca/arm/ipq807x/ipq807x.c
@@ -1180,29 +1180,6 @@ void fdt_fixup_cpr(void *blob)
 	return;
 }
 
-void ipq_fdt_fixup_pci_status(void *blob)
-{
-	int nodeoff, ret, node;
-	const char *pci_node[] = {"/soc/pci@20000000" , "/soc/pci@10000000",
-				"/soc/phy@84000", "/soc/phy@8e000"};
-	const char *stat = "disabled";
-
-	for (node = 0; node < ARRAY_SIZE(pci_node); node++) {
-		nodeoff = fdt_path_offset(blob, pci_node[node]);
-		if (nodeoff < 0) {
-			printf("fixup_pci: unable to find node '%s'\n",
-			       pci_node[node]);
-			return;
-		}
-		ret = fdt_setprop(blob, nodeoff, "status",
-				  stat,
-				  (strlen(stat) + 1));
-		if (ret)
-			printf("fixup_pci: 'status' cannot be set");
-
-	}
-}
-
 void set_flash_secondary_type(qca_smem_flash_info_t *smem)
 {
 	return;