[U-Boot] [PATCH v3 2/5] spi: cadence_qspi: Fix fdt read of spi-max-frequency

[U-Boot] [PATCH v3 2/5] spi: cadence_qspi: Fix fdt read of spi-max-frequency

[Chin Liang See]

Fix the fdt read for spi-max-frequency as it's contained
in the child node. Current state of code is always
returning default value.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Vikas Manocha <vikas.manocha@st.com>
Cc: Jagannadh Teki <jteki@openedev.com>
Cc: Pavel Machek <pavel@denx.de>
---
Changes for v3
- Use of fdt_getprop_u32_default_node instead casting
Changes for v2
- Add unsigned casting for plat->max_hz
---
 drivers/spi/cadence_qspi.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 0e7450c..95236a3 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -12,6 +12,7 @@
 #include <spi.h>
 #include <asm/errno.h>
 #include "cadence_qspi.h"
+#include <fdt_support.h>

 #define CQSPI_STIG_READ			0
 #define CQSPI_STIG_WRITE		1
@@ -295,10 +296,6 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	plat->regbase = (void *)data[0];
 	plat->ahbbase = (void *)data[2];

-	/* Use 500KHz as a suitable default */
-	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
-				      500000);
-
 	/* All other paramters are embedded in the child node */
 	subnode = fdt_first_subnode(blob, node);
 	if (subnode < 0) {
@@ -306,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 		return -ENODEV;
 	}

+	/* Use 500 KHz as a suitable default */
+	plat->max_hz = fdt_getprop_u32_default_node(blob, subnode, 0,
+						"spi-max-frequency", 500000);
+
 	/* Read other parameters from DT */
 	plat->page_size = fdtdec_get_int(blob, subnode, "page-size", 256);
 	plat->block_size = fdtdec_get_int(blob, subnode, "block-size", 16);
--
1.7.7.4

[U-Boot] [PATCH v3 2/5] spi: cadence_qspi: Fix fdt read of spi-max-frequency

[Marek Vasut]

On Thursday, September 10, 2015 at 07:01:28 AM, Chin Liang See wrote:
> Fix the fdt read for spi-max-frequency as it's contained
> in the child node. Current state of code is always
> returning default value.
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Vikas Manocha <vikas.manocha@st.com>
> Cc: Jagannadh Teki <jteki@openedev.com>
> Cc: Pavel Machek <pavel@denx.de>

Acked-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut

[U-Boot] [PATCH v3 2/5] spi: cadence_qspi: Fix fdt read of spi-max-frequency

[Pavel Machek]

On Thu 2015-09-10 00:01:28, Chin Liang See wrote:
> Fix the fdt read for spi-max-frequency as it's contained
> in the child node. Current state of code is always
> returning default value.
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Vikas Manocha <vikas.manocha@st.com>
> Cc: Jagannadh Teki <jteki@openedev.com>

Acked-by: Pavel Machek <pavel@denx.de>

> Changes for v3
> - Use of fdt_getprop_u32_default_node instead casting
> Changes for v2
> - Add unsigned casting for plat->max_hz
> ---
>  drivers/spi/cadence_qspi.c |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
> index 0e7450c..95236a3 100644
> --- a/drivers/spi/cadence_qspi.c
> +++ b/drivers/spi/cadence_qspi.c
> @@ -12,6 +12,7 @@
>  #include <spi.h>
>  #include <asm/errno.h>
>  #include "cadence_qspi.h"
> +#include <fdt_support.h>
> 
>  #define CQSPI_STIG_READ			0
>  #define CQSPI_STIG_WRITE		1
> @@ -295,10 +296,6 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
>  	plat->regbase = (void *)data[0];
>  	plat->ahbbase = (void *)data[2];
> 
> -	/* Use 500KHz as a suitable default */
> -	plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
> -				      500000);
> -
>  	/* All other paramters are embedded in the child node */
>  	subnode = fdt_first_subnode(blob, node);
>  	if (subnode < 0) {
> @@ -306,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
>  		return -ENODEV;
>  	}
> 
> +	/* Use 500 KHz as a suitable default */

Hmm. Halfway there. Its "kHz" not "KHz" :-).

But never mind, that's nitpicking.
   								Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html