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: ipq50xx: Initialize qpic nand only if rdp's has nand support."

Browse source
This commit is contained in:
Linux Build Service Account 2020-05-08 16:43:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8a67c4a29d
10 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/ipq5018-db-mp03.1-c2.dts
View file

@ -20,7 +20,7 @@
mmc: sdhci@7804000 {
compatible = "qcom,sdhci-msm";
status = "ok";
status = "okay";
mmc_gpio {
emmc_dat3 {
gpio = <4>;

3
arch/arm/dts/ipq5018-db-mp03.1.dts
View file

@ -27,6 +27,7 @@
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
pci1 = "/pci@a0000000";
nand = "/nand-controller@79B0000";
};
console: serial@78AF000 {
@ -50,7 +51,7 @@
};
nand: nand-controller@79B0000 {
status = "ok";
status = "okay";
nand_gpio {
qspi_dat3 {
gpio = <4>;

2
arch/arm/dts/ipq5018-db-mp03.3-c2.dts
View file

@ -20,7 +20,7 @@
mmc: sdhci@7804000 {
compatible = "qcom,sdhci-msm";
status = "ok";
status = "okay";
mmc_gpio {
emmc_dat3 {
gpio = <4>;

3
arch/arm/dts/ipq5018-db-mp03.3.dts
View file

@ -26,6 +26,7 @@
gmac_gpio = "/gmac_gpio";
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
nand = "/nand-controller@79B0000";
};
console: serial@78AF000 {
@ -51,7 +52,7 @@
};
nand: nand-controller@79B0000 {
status = "ok";
status = "okay";
nand_gpio {
qspi_dat3 {
gpio = <4>;

3
arch/arm/dts/ipq5018-emulation.dts
View file

@ -26,6 +26,7 @@
gmac_gpio = "/gmac_gpio";
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
nand = "/nand-controller@79B0000";
};
mmc: sdhci@7804000 {
@ -55,7 +56,7 @@
};
nand: nand-controller@79B0000 {
status = "ok";
status = "okay";
nand_gpio {
qspi_dat3 {
gpio = <4>;

2
arch/arm/dts/ipq5018-mp03.1-c2.dts
View file

@ -20,7 +20,7 @@
mmc: sdhci@7804000 {
compatible = "qcom,sdhci-msm";
status = "ok";
status = "okay";
mmc_gpio {
emmc_dat3 {
gpio = <4>;

3
arch/arm/dts/ipq5018-mp03.1.dts
View file

@ -27,6 +27,7 @@
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
pci1 = "/pci@a0000000";
nand = "/nand-controller@79B0000";
};
console: serial@78AF000 {
@ -50,7 +51,7 @@
};
nand: nand-controller@79B0000 {
status = "ok";
status = "okay";
nand_gpio {
qspi_dat3 {
gpio = <4>;

2
arch/arm/dts/ipq5018-mp03.3-c2.dts
View file

@ -19,7 +19,7 @@
mmc: sdhci@7804000 {
compatible = "qcom,sdhci-msm";
status = "ok";
status = "okay";
mmc_gpio {
emmc_dat3 {
gpio = <4>;

3
arch/arm/dts/ipq5018-mp03.3.dts
View file

@ -27,6 +27,7 @@
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
pcie1 = "/pci@a0000000";
nand = "/nand-controller@79B0000";
};
console: serial@78AF000 {
@ -52,7 +53,7 @@
};
nand: nand-controller@79B0000 {
status = "ok";
status = "okay";
nand_gpio {
qspi_dat3 {
gpio = <4>;

14
board/qca/arm/ipq5018/ipq5018.c
View file

@ -570,7 +570,19 @@ void qpic_set_clk_rate(unsigned int clk_rate, int blk_type, int req_clk_src_type
void board_nand_init(void)
{
#ifdef CONFIG_QPIC_SERIAL
qpic_nand_init(NULL);
/* check for nand node in dts
* if nand node in dts is disabled then
* simply return from here without
* initializing
*/
int node;
node = fdt_path_offset(gd->fdt_blob, "/nand-controller");
if (!fdtdec_get_is_enabled(gd->fdt_blob, node)) {
printf("QPIC: disabled, skipping initialization\n");
} else {
qpic_nand_init(NULL);
}
#endif
#ifdef CONFIG_QCA_SPI