mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "board: qca: arm: ipq5332: fdt fixup for flash"

Browse source
This commit is contained in:
Linux Build Service Account 2022-11-22 09:11:24 -08:00 • committed by Gerrit - the friendly Code Review server
commit 664ec3b720
4 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/dts/ipq5332-mi01.2.dts
View file

@ -68,7 +68,6 @@
};
nand: nand-controller@79B0000 {
status = "disabled";
nand_gpio {
qspi_dat3 {
gpio = <8>;

1
arch/arm/dts/ipq5332-mi01.4.dts
View file

@ -67,7 +67,6 @@
};
nand: nand-controller@79B0000 {
status = "disabled";
nand_gpio {
qspi_dat3 {
gpio = <8>;

2
arch/arm/dts/ipq5332-soc.dtsi
View file

@ -51,7 +51,7 @@
#size-cells = <0>;
compatible = "qcom,qpic-nand-v2.1.1";
reg = <0x79B0000 0x10000>;
status = "disabled";
status = "okay";
};
mmc: sdhci@7804000 {

50
board/qca/arm/ipq5332/ipq5332.c
View file

@ -37,6 +37,11 @@
#endif
#define FLASH_SEL_BIT 7
#define LINUX_NAND_DTS "/soc/nand@79b0000/"
#define LINUX_MMC_DTS "/soc/sdhci@7804000/"
#define STATUS_OK "status%?okay"
#define STATUS_DISABLED "status%?disabled"
DECLARE_GLOBAL_DATA_PTR;
static int aq_phy_initialised = 0;
@ -120,23 +125,13 @@ int dump_entries_s = ARRAY_SIZE(dumpinfo_s);
void fdt_fixup_flash(void *blob)
{
int node_off, ret;
char *flash = "/soc/nand@79b0000";
if (gd->bd->bi_arch_number == MACH_TYPE_IPQ5332_EMULATION)
return;
node_off = fdt_path_offset(gd->fdt_blob, "nand");
if (!fdtdec_get_is_enabled(gd->fdt_blob, node_off))
flash = "/soc/sdhci@7804000";
if ((gd->bd->bi_arch_number >> FLASH_SEL_BIT) & 0x1) {
parse_fdt_fixup(LINUX_NAND_DTS"%"STATUS_DISABLED, blob);
parse_fdt_fixup(LINUX_MMC_DTS"%"STATUS_OK, blob);
node_off = fdt_path_offset(blob, flash);
if (node_off >= 0) {
ret = fdt_setprop_string(blob, node_off, "status", "okay");
if (ret < 0)
printf("Unable to set status of %s\n", flash);
} else {
printf("%s: unable to find node %d\n", __func__, node_off);
}
return;
}
@ -154,17 +149,28 @@ void ipq_uboot_fdt_fixup(void)
/* fix peripherals required for basic board bring up
* like flash etc.
*/
flash = ((machid >> FLASH_SEL_BIT) & 0x1) ? "mmc" : "nand";
node = fdt_path_offset(gd->fdt_blob, flash);
if (node >= 0) {
ret = fdt_setprop_string(blob, node, "status", "okay");
if (ret < 0 && ret != -FDT_ERR_NOSPACE)
printf("Unable to set status of %s\n", flash);
} else {
printf("%s node not available\n", flash);
if ((machid >> FLASH_SEL_BIT) & 0x1) {
flash = "mmc";
node = fdt_path_offset(gd->fdt_blob, flash);
if (node >= 0) {
ret = fdt_setprop_string(blob, node, "status", "okay");
if (ret < 0 && ret != -FDT_ERR_NOSPACE)
printf("Unable to set status of %s\n", flash);
} else {
printf("%s node not available\n", flash);
}
flash = "nand";
node = fdt_path_offset(gd->fdt_blob, flash);
if (node >= 0) {
ret = fdt_setprop_string(blob, node, "status", "disabled");
if (ret < 0 && ret != -FDT_ERR_NOSPACE)
printf("Unable to set status of %s\n", flash);
} else {
printf("%s node not available\n", flash);
}
}
return;
}