spi: cadence_qspi: support DM_CLK
PATCH v2 1/1 spi: cadence_qspi: support DM_CLK
From: Simon Goldschmidt <[email protected]>
Support loading clk speed via DM instead of requiring ad-hoc code.
---
Changes in v2:
- check return value of clk_get_rate for error
drivers/spi/cadence_qspi.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/spi/cadence_qspi.c +20 -2
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clk.h> #include <dm.h> #include <fdtdec.h> #include <malloc.h>
@@ -22,12 +23,29 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz) {struct cadence_spi_platdata *plat = bus->platdata;struct cadence_spi_priv *priv =dev_get_priv (bus); +unsigned int ref_clk_hz; +struct clk clk; +int ret; + + ret =clk_get_by_index (bus,0 , &clk); +if (ret) { +#ifdef CONFIG_CQSPI_REF_CLK + ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#else +return ret; +#endif + }else { + ref_clk_hz =clk_get_rate (&clk); +clk_free (&clk); +if (IS_ERR_VALUE (ref_clk_hz)) +return ref_clk_hz; + }cadence_qspi_apb_config_baudrate_div (priv->regbase, -CONFIG_CQSPI_REF_CLK , hz); + ref_clk_hz, hz);/* Reconfigure delay timing if speed is changed. */ -cadence_qspi_apb_delay (priv->regbase,CONFIG_CQSPI_REF_CLK , hz, +cadence_qspi_apb_delay (priv->regbase, ref_clk_hz, hz, plat->tshsl_ns, plat->tsd2d_ns, plat->tchsh_ns, plat->tslch_ns);
Signature · 1 line
2.20.1
PATCH v2 1/1 spi: cadence_qspi: support DM_CLK
Am 24.10.2019 um 20:23 schrieb Simon Goldschmidt:
Quoted 6 lines
From: Simon Goldschmidt <[email protected]>
Support loading clk speed via DM instead of requiring ad-hoc code.
Signed-off-by Simon Goldschmidt <[email protected]>Signed-off-by Simon Goldschmidt <[email protected]>
That gmx adress somehow slipped in after cloning u-boot-spi. Can you remove it when applying or should I resend?
Regards,
Simon
Quoted 53 lines
---
Changes in v2:
- check return value ofclk_get_ratefor errordrivers/spi/cadence_qspi.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)drivers/spi/cadence_qspi.c +20
-2@@ -5,6 +5,7 @@*/ #include <common.h> +#include <clk.h> #include <dm.h> #include <fdtdec.h> #include <malloc.h> @@ -22,12 +23,29 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz) {struct cadence_spi_platdata *plat = bus->platdata;struct cadence_spi_priv *priv =dev_get_priv (bus); +unsigned int ref_clk_hz; +struct clk clk; +int ret; + + ret =clk_get_by_index (bus,0 , &clk); +if (ret) { +#ifdef CONFIG_CQSPI_REF_CLK + ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#else +return ret; +#endif + }else { + ref_clk_hz =clk_get_rate (&clk); +clk_free (&clk); +if (IS_ERR_VALUE (ref_clk_hz)) +return ref_clk_hz; + }cadence_qspi_apb_config_baudrate_div (priv->regbase, -CONFIG_CQSPI_REF_CLK , hz); + ref_clk_hz, hz);/* Reconfigure delay timing if speed is changed. */ -cadence_qspi_apb_delay (priv->regbase,CONFIG_CQSPI_REF_CLK , hz, +cadence_qspi_apb_delay (priv->regbase, ref_clk_hz, hz, plat->tshsl_ns, plat->tsd2d_ns, plat->tchsh_ns, plat->tslch_ns);
PATCH v2 1/1 spi: cadence_qspi: support DM_CLK
In reply to Simon GoldschmidtHi Simon,
Quoted 7 lines · Simon Goldschmidt
From: Simon Goldschmidt <[email protected]>
Support loading clk speed via DM instead of requiring ad-hoc code.
Signed-off-by Simon Goldschmidt <[email protected]>Signed-off-by Simon Goldschmidt <[email protected]>---
[...]
Quoted 12 lines
drivers/spi/cadence_qspi.c +8
-0@@ -22,12 +23,29 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz) {struct cadence_spi_platdata *plat = bus->platdata;struct cadence_spi_priv *priv =dev_get_priv (bus); +unsigned int ref_clk_hz; +struct clk clk; +int ret; + + ret =clk_get_by_index (bus,0 , &clk); +if (ret) { +#ifdef CONFIG_CQSPI_REF_CLK + ref_clk_hz =CONFIG_CQSPI_REF_CLK ;
drivers/spi/cadence_qspi.c static int cadence_spi_write_speed(struct udevice *bus, uint hz) · line 43
Quoted 10 lines
drivers/spi/cadence_qspi.c +9
-0+#else +return ret; +#endif + }else { + ref_clk_hz =clk_get_rate (&clk); +clk_free (&clk); +if (IS_ERR_VALUE (ref_clk_hz)) +return ref_clk_hz; + }
Can this be moved to probe function instead? cadence_spi_write_speed() is called multiple times from spi_calibration() and doing clk_get_by_index() and clk_get_rate() each time seems to be additional overhead.
Regards
Vignesh
Quoted 11 lines
drivers/spi/cadence_qspi.c +2
-2cadence_qspi_apb_config_baudrate_div (priv->regbase, -CONFIG_CQSPI_REF_CLK , hz); + ref_clk_hz, hz);/* Reconfigure delay timing if speed is changed. */ -cadence_qspi_apb_delay (priv->regbase,CONFIG_CQSPI_REF_CLK , hz, +cadence_qspi_apb_delay (priv->regbase, ref_clk_hz, hz, plat->tshsl_ns, plat->tsd2d_ns, plat->tchsh_ns, plat->tslch_ns);
PATCH v2 1/1 spi: cadence_qspi: support DM_CLK
Vignesh Raghavendra <[email protected]> schrieb am So., 10. Nov. 2019, 12:41:
Quoted 31 lines
Hi Simon,
Quoted 7 lines · Simon Goldschmidt
From: Simon Goldschmidt <[email protected]>
Support loading clk speed via DM instead of requiring ad-hoc code.
Signed-off-by Simon Goldschmidt <[email protected]>Signed-off-by Simon Goldschmidt <[email protected]>---
[...]
Review static int cadence_spi_write_speed(struct udevice
Quoted 1 line
(quoted diff) +0
-0@@ -22,12 +23,29 @@ static int cadence_spi_write_speed(struct udevice*bus, uint hz)
Quoted 18 lines
drivers/spi/cadence_qspi.c +15
-0{struct cadence_spi_platdata *plat = bus->platdata;struct cadence_spi_priv *priv =dev_get_priv (bus); +unsigned int ref_clk_hz; +struct clk clk; +int ret; + + ret =clk_get_by_index (bus,0 , &clk); +if (ret) { +#ifdef CONFIG_CQSPI_REF_CLK + ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#else +return ret; +#endif + }else { + ref_clk_hz =clk_get_rate (&clk); +clk_free (&clk); +if (IS_ERR_VALUE (ref_clk_hz))
Quoted 9 lines
drivers/spi/cadence_qspi.c static int cadence_spi_write_speed(struct udevice *bus, uint hz) · line 43
Quoted 3 lines
drivers/spi/cadence_qspi.c +2
-0+return ref_clk_hz; + }Can this be moved to probe function instead?
cadence_spi_write_speed()is called multiple times fromspi_calibration()and doingclk_get_by_index()andclk_get_rate()each time seems to be additional overhead.
Sure, that would indeed be better.
Regards,
Simon
Quoted 16 lines
Regards
VigneshQuoted 11 lines
drivers/spi/cadence_qspi.c +2
-2cadence_qspi_apb_config_baudrate_div (priv->regbase, -CONFIG_CQSPI_REF_CLK , hz); + ref_clk_hz, hz);/* Reconfigure delay timing if speed is changed. */ -cadence_qspi_apb_delay (priv->regbase,CONFIG_CQSPI_REF_CLK , hz, +cadence_qspi_apb_delay (priv->regbase, ref_clk_hz, hz, plat->tshsl_ns, plat->tsd2d_ns, plat->tchsh_ns, plat->tslch_ns);
PATCH v2 1/1 spi: cadence_qspi: support DM_CLK
In reply to Vignesh RaghavendraQuoted 11 lines · Vignesh Raghavendra
Hi Simon,
Quoted 7 lines · Simon Goldschmidt
From: Simon Goldschmidt <[email protected]>
Support loading clk speed via DM instead of requiring ad-hoc code.
Signed-off-by Simon Goldschmidt <[email protected]>Signed-off-by Simon Goldschmidt <[email protected]>---
[...]
Quoted 11 lines
drivers/spi/cadence_qspi.c static int cadence_spi_write_speed(struct udevice *bus, uint hz) · line 32
Quoted 11 lines
drivers/spi/cadence_qspi.c +7
-0@@ -22,12 +23,29 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz) {struct cadence_spi_platdata *plat = bus->platdata;struct cadence_spi_priv *priv =dev_get_priv (bus); +unsigned int ref_clk_hz; +struct clk clk; +int ret; + + ret =clk_get_by_index (bus,0 , &clk); +if (ret) { +#ifdef CONFIG_CQSPI_REF_CLK
We also could get rid of CONFIG_CQSPI_REF_CLK altogether. Instead pass frequency from DT or platdata using "clock-frequency" property like serial drivers do, assuming all platforms now use DT or platdata (all TI platforms using this driver support DT).
But that can be done in a separate patch series...
Quoted 11 lines
Quoted 11 lines
drivers/spi/cadence_qspi.c +10
-0+ ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#else +return ret; +#endif + }else { + ref_clk_hz =clk_get_rate (&clk); +clk_free (&clk); +if (IS_ERR_VALUE (ref_clk_hz)) +return ref_clk_hz; + }
[...]
Signature · 2 lines
Regards Vignesh
PATCH v2 1/1 spi: cadence_qspi: support DM_CLK
Vignesh Raghavendra <[email protected]> schrieb am Mo., 11. Nov. 2019, 05:22:
Quoted 16 lines · Vignesh Raghavendra
Quoted 5 lines
Hi Simon,
Quoted 2 lines · Simon Goldschmidt
From: Simon Goldschmidt <[email protected]>
Quoted 7 lines
Quoted 5 lines
Support loading clk speed via DM instead of requiring ad-hoc code.
Signed-off-by Simon Goldschmidt <[email protected]>Signed-off-by Simon Goldschmidt <[email protected]>---
[...]
Review static int cadence_spi_write_speed(struct udevice
Quoted 1 line
(quoted diff) +0
-0@@ -22,12 +23,29 @@ static int cadence_spi_write_speed(struct udevice*bus, uint hz)
Quoted 17 lines
Quoted 10 lines
drivers/spi/cadence_qspi.c static int cadence_spi_write_speed(struct udevice *bus, uint hz) · line 32
Quoted 10 lines
drivers/spi/cadence_qspi.c +7
-0{struct cadence_spi_platdata *plat = bus->platdata;struct cadence_spi_priv *priv =dev_get_priv (bus); +unsigned int ref_clk_hz; +struct clk clk; +int ret; + + ret =clk_get_by_index (bus,0 , &clk); +if (ret) { +#ifdef CONFIG_CQSPI_REF_CLK We also could get rid of
CONFIG_CQSPI_REF_CLKaltogether. Instead pass frequency from DT or platdata using "clock-frequency" property like serial drivers do, assuming all platforms now use DT or platdata (all TI platforms using this driver support DT).
But that can be done in a separate patch series...
My next step for socfpga is to provide a DM_CLK driver, so that would remove the need for this define altogether (for that platform).
Regards,
Simon
Quoted 18 lines
Quoted 12 lines
drivers/spi/cadence_qspi.c static int cadence_spi_write_speed(struct udevice *bus, uint hz) · line 43
Quoted 12 lines
drivers/spi/cadence_qspi.c +10
-0+ ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#else +return ret; +#endif + }else { + ref_clk_hz =clk_get_rate (&clk); +clk_free (&clk); +if (IS_ERR_VALUE (ref_clk_hz)) +return ref_clk_hz; + }[...]
--
Regards
Vignesh