Skip to contentSkip to conversation

spi: cadence_qspi: Fix fdt read of spi-max-frequency

PATCH Superseded Chin Liang See 3 participants 3 messages Sep 10, 2015 SPI

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 2/5 spi: cadence_qspi: Fix fdt read of spi-max-frequency

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.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>

---
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(-)
drivers/spi/cadence_qspi.c +5 -4
index 0e7450c..95236a3 100644
@@ -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

#1 lore raw

PATCH v3 2/5 spi: cadence_qspi: Fix fdt read of spi-max-frequency

Quoted 4 lines · 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.

Quoted 8 lines
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Cc Pavel Machek <[email protected]>

Best regards,
Marek Vasut

#2 lore raw

PATCH v3 2/5 spi: cadence_qspi: Fix fdt read of spi-max-frequency

In reply to Chin Liang See
Quoted 11 lines · 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.

Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Vikas Manocha <[email protected]>
Cc Jagannadh Teki <[email protected]>
Quoted 32 lines

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(-)
drivers/spi/cadence_qspi.c +1 -4
index 0e7450c..95236a3 100644
@@ -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) {

drivers/spi/cadence_qspi.c static int cadence_spi_ofdata_to_platdata(struct udevice *bus) · line 306

Quoted 4 lines
drivers/spi/cadence_qspi.c +1 -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

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html