From: Phil Edworthy Date: Tue, 29 Nov 2016 12:58:34 +0000 (+0000) Subject: spi: cadence_qspi: Move DT prop code to match layout X-Git-Tag: v2017.01-rc2~7^2~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d72810c6640e13b4c1e25f6c26ac8c304d5b54e;p=oweals%2Fu-boot.git spi: cadence_qspi: Move DT prop code to match layout Move the code to read the "sram-size" property into the other code that reads properties from the node, rather than the SF subnode. Signed-off-by: Phil Edworthy Reviewed-by: Jagan Teki --- diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 55192d6d49..f16f90de28 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -296,6 +296,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus) plat->regbase = (void *)data[0]; plat->ahbbase = (void *)data[2]; + plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128); /* All other paramters are embedded in the child node */ subnode = fdt_first_subnode(blob, node); @@ -315,7 +316,6 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus) plat->tsd2d_ns = fdtdec_get_int(blob, subnode, "tsd2d-ns", 255); plat->tchsh_ns = fdtdec_get_int(blob, subnode, "tchsh-ns", 20); plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20); - plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128); debug("%s: regbase=%p ahbbase=%p max-frequency=%d page-size=%d\n", __func__, plat->regbase, plat->ahbbase, plat->max_hz,