mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-02-14 20:09:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ipq807x: Disable PCI in dts for HKV2"

Browse source 
This reverts commit 51ac77307a.
This commit is contained in:
Sham Muthayyan 2018-10-30 14:50:50 +05:30 • committed by Gerrit - the friendly Code Review server
parent f29bf1f4bd
commit 8eb2f9b3cb
2 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
board/qca/arm/common/fdt_fixup.c
View file

@ -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();

23
board/qca/arm/ipq807x/ipq807x.c
View file

@ -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;