Skip to contentSkip to conversation

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

PATCH New Chin Liang See 4 participants 8 messages Sep 8, 2015 – Sep 10, 2015 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 2/4 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 v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +4 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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) {
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 		return -ENODEV;
 	}
 
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+						"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);
Signature · 1 line
1.7.7.4
#1 lore raw

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

Quoted 35 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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 309

Quoted 7 lines
drivers/spi/cadence_qspi.c +4 -0
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
                return -ENODEV;
        }
 
+       /* Use 500KHz as a suitable default */
+       plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+                                               "spi-max-frequency", 500000);
+

fdtdec_get_int will return default_val (say 500000 here) or property value from dts which is usually "unsigned", unless wrongly set as -ve value ie reason there is no typecasting used in rest of the code.

But, if still worried, better to add unsigned fdtdec_get_* instead of type casting.

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

thanks!

Signature · 1 line
Jagan | openedev.
#2 lore raw

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

Hi,

Quoted 48 lines · Jagan Teki
Quoted 35 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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 309

Quoted 7 lines
drivers/spi/cadence_qspi.c +4 -0
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
                return -ENODEV;
        }
 
+       /* Use 500KHz as a suitable default */
+       plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+                                               "spi-max-frequency", 500000);
+

fdtdec_get_int will return default_val (say 500000 here) or property value from dts which is usually "unsigned", unless wrongly set as -ve value ie reason there is no typecasting used in rest of the code.

Quoted 2 lines

But, if still worried, better to add unsigned fdtdec_get_* instead of type casting.

Thanks to Marek, I will use fdt_getprop_u32_default_node to achieve this :)

Thanks
Chin Liang

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

thanks!

#3 lore raw

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

In reply to Chin Liang See
Quoted 35 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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 · line 309

Quoted 7 lines
drivers/spi/cadence_qspi.c +4 -0
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) return -ENODEV;
 	}
 
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+						"spi-max-frequency", 500000);
+

fdt_getprop_u32() might be the right thing to do here :)

Best regards,
Marek Vasut

#4 lore raw

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

Hi,

Quoted 39 lines · marex at denx.de
Quoted 38 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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) {
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) return -ENODEV;
 	}
 
Quoted 6 lines

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

Quoted 4 lines
drivers/spi/cadence_qspi.c +4 -0
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+						"spi-max-frequency", 500000);
+

fdt_getprop_u32() might be the right thing to do here :)

Cool, yup, I am using fdt_getprop_u32_default_node. But need additional patch to enable this and more FDT related function in SPL

Thanks
Chin Liang

Quoted 3 lines

Best regards,
Marek Vasut

#5 lore raw

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

Quoted 54 lines · Chin Liang See

Hi,

Quoted 42 lines · marex at denx.de
Quoted 41 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz
---

 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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 */
drivers/spi/cadence_qspi.c +0 -0
 	subnode = fdt_first_subnode(blob, node);
 	if (subnode < 0) {
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct
 udevice *bus) return -ENODEV;
 
Quoted 8 lines

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

Quoted 6 lines
drivers/spi/cadence_qspi.c +4 -0
 	}
 
+	/* Use 500KHz as a suitable default */
+	plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+						"spi-max-frequency", 500000);
+

fdt_getprop_u32() might be the right thing to do here :)

Quoted 2 lines

Cool, yup, I am using fdt_getprop_u32_default_node. But need additional patch to enable this and more FDT related function in SPL

All right, be careful not to blow the SPL size too much btw.

Best regards,
Marek Vasut

#6 lore raw

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

In reply to Chin Liang See
Quoted 35 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 		return -ENODEV;
 	}
 
+	/* Use 500KHz as a suitable default */

And as you'll be updating it... it should be "500 kHz", AFAICT.

Quoted 7 lines
drivers/spi/cadence_qspi.c +3 -0
+	plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+						"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);

Pavel

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

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

Hi,

Quoted 39 lines · ZY - pavel
Quoted 38 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]>
Cc Pavel Machek <[email protected]>

---
Changes for v2
- Add unsigned casting for plat->max_hz

---
 drivers/spi/cadence_qspi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/cadence_qspi.c +0 -4
index 23c88d5..8c0f7dd 100644
@@ -296,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) {
@@ -307,6 +303,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 		return -ENODEV;
 	}
 
Quoted 3 lines

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

Quoted 1 line
drivers/spi/cadence_qspi.c +1 -0
+	/* Use 500KHz as a suitable default */

And as you'll be updating it... it should be "500 kHz", AFAICT.

That sounds easy fix :)

Thanks
Chin Liang

Quoted 12 lines
Quoted 9 lines
drivers/spi/cadence_qspi.c +3 -0
+	plat->max_hz = (unsigned int)fdtdec_get_int(blob, subnode,
+						"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);

Pavel