SPI: mxc_spi: slave initialisation fixes
Subsystems (2)
cover SPI: mxc_spi: slave initialisation fixes
From: Markus Niebel <[email protected]>
current implementation of the mxc_spi host driver gives issues, if using more than one slave on the same bus. These patches try to improve this use case.
They were tested on a TQMa6S (i.MC6S) with a custom mainboard using two slave devices in SPI MODE 0 and 3, on of the devices uses gpio based chip select the other hardware base chip select.
Markus Niebel (2):
SPI: mxc_spi: remove second reset from ECSPI config handler
SPI: mxc_spi: delay initialisation until claim bus
drivers/spi/mxc_spi.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/2 SPI: mxc_spi: remove second reset from ECSPI config handler
From: Markus Niebel <[email protected]>
the second reset prevents other registers to be written. This will prevent to have the correct signal levels for SCLK before writing to the config reg in spi_xchg_single.
Tested with GPIO based chipselect and SPI_MODE_3 on i.MX6S
--- drivers/spi/mxc_spi.c | 3 --- 1 file changed, 3 deletions(-)
drivers/spi/mxc_spi.c +0 -3
@@ -163,9 +163,6 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, reg_ctrl = (reg_ctrl & ~MXC_CSPICTRL_POSTDIV (0x0F )) |MXC_CSPICTRL_POSTDIV (post_div); -/* We need to disable SPI before changing registers */ - reg_ctrl &= ~MXC_CSPICTRL_EN ; -if (mode &SPI_CS_HIGH ) ss_pol =1 ;
Signature · 1 line
2.1.0
PATCH 1/2 SPI: mxc_spi: remove second reset from ECSPI config handler
Hi Markus,
Quoted 19 lines · Markus Niebel
From: Markus Niebel <[email protected]>
the second reset prevents other registers to be written. This will prevent to have the correct signal levels for SCLK before writing to the config reg in
spi_xchg_single.Tested with GPIO based chipselect and
SPI_MODE_3on i.MX6SSigned-off-by Markus Niebel <[email protected]>--- drivers/spi/mxc_spi.c | 3 --- 1 file changed, 3 deletions(-)drivers/spi/mxc_spi.c +0
-0
drivers/spi/mxc_spi.c static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, · line 168
Quoted 9 lines
drivers/spi/mxc_spi.c +0
-3@@ -163,9 +163,6 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, reg_ctrl = (reg_ctrl & ~MXC_CSPICTRL_POSTDIV (0x0F )) |MXC_CSPICTRL_POSTDIV (post_div); -/* We need to disable SPI before changing registers */ - reg_ctrl &= ~MXC_CSPICTRL_EN ; -if (mode &SPI_CS_HIGH ) ss_pol =1 ;
Jagannadha, this series is currently assigned to me in patchwork. Should I merge into u-boot-imx or do you prefer to merge the two patches into u-boot-spi ?
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/2 SPI: mxc_spi: remove second reset from ECSPI config handler
I will pick!
Quoted 47 lines · Stefano Babic
Hi Markus,
Quoted 19 lines · Markus Niebel
From: Markus Niebel <[email protected]>
the second reset prevents other registers to be written. This will prevent to have the correct signal levels for SCLK before writing to the config reg in
spi_xchg_single.Tested with GPIO based chipselect and
SPI_MODE_3on i.MX6SSigned-off-by Markus Niebel <[email protected]>--- drivers/spi/mxc_spi.c | 3 --- 1 file changed, 3 deletions(-)drivers/spi/mxc_spi.c +0
-0drivers/spi/mxc_spi.c static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, · line 168
Quoted 9 lines
drivers/spi/mxc_spi.c +0
-3@@ -163,9 +163,6 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs, reg_ctrl = (reg_ctrl & ~MXC_CSPICTRL_POSTDIV (0x0F )) |MXC_CSPICTRL_POSTDIV (post_div); -/* We need to disable SPI before changing registers */ - reg_ctrl &= ~MXC_CSPICTRL_EN ; -if (mode &SPI_CS_HIGH ) ss_pol =1 ;Acked-by Stefano Babic <[email protected]>Jagannadha, this series is currently assigned to me in patchwork. Should I merge into u-boot-imx or do you prefer to merge the two patches into u-boot-spi ?
Best regards,
Stefano Babic--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
Signature · 1 line
Jagan.
PATCH 2/2 SPI: mxc_spi: delay initialisation until claim bus
In reply to Markus NiebelFrom: Markus Niebel <[email protected]>
it is not correct to init for a specific slave in spi_setup_slave. instead buffer the values and delay init until spi_claim_bus.
--- drivers/spi/mxc_spi.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/spi/mxc_spi.c +21 -16
@@ -43,6 +43,8 @@ struct mxc_spi_slave {#endif int gpio;int ss_pol; +unsigned int max_hz; +unsigned int mode; };static inline struct mxc_spi_slave *to_mxc_spi_slave (struct spi_slave *slave)
@@ -77,12 +79,13 @@ u32 get_cspi_div(u32 div) }#ifdef MXC_CSPI -static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs) {unsigned int ctrl_reg;u32 clk_src;u32 div; +unsigned int max_hz = mxcs->max_hz; +unsigned int mode = mxcs->mode; clk_src =mxc_get_clock (MXC_CSPI_CLK );
@@ -114,19 +117,15 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs,#endif #ifdef MXC_ECSPI -static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs) {u32 clk_src =mxc_get_clock (MXC_CSPI_CLK );s32 reg_ctrl, reg_config;u32 ss_pol =0 , sclkpol =0 , sclkpha =0 , sclkctl =0 ;u32 pre_div =0 , post_div =0 ;struct cspi_regs *regs = (struct cspi_regs *)mxcs->base; - -if (max_hz ==0 ) { -printf ("Error: desired clock is 0\n" ); -return -1 ; - } +unsigned int max_hz = mxcs->max_hz; +unsigned int mode = mxcs->mode;/* * Reset SPI and set all CSs to master mode, if toggling
@@ -404,6 +403,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,if (bus >=ARRAY_SIZE (spi_bases))return NULL ; +if (max_hz ==0 ) { +printf ("Error: desired clock is 0\n" ); +return NULL ; + } + mxcs = spi_alloc_slave(struct mxc_spi_slave, bus, cs);if (!mxcs) {puts ("mxc_spi: SPI Slave not allocated !\n" );
@@ -421,13 +425,9 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, cs = ret; mxcs->base = spi_bases[bus]; + mxcs->max_hz = max_hz; + mxcs->mode = mode; - ret =spi_cfg_mxc (mxcs, cs, max_hz, mode); -if (ret) { -printf ("mxc_spi: cannot setup SPI controller\n" ); -free (mxcs); -return NULL ; - }return &mxcs->slave; }
@@ -440,12 +440,17 @@ void spi_free_slave(struct spi_slave *slave)int spi_claim_bus (struct spi_slave *slave) { +int ret;struct mxc_spi_slave *mxcs =to_mxc_spi_slave (slave);struct cspi_regs *regs = (struct cspi_regs *)mxcs->base;reg_write (®s->rxdata,1 );udelay (1 ); -reg_write (®s->ctrl, mxcs->ctrl_reg); + ret =spi_cfg_mxc (mxcs, slave->cs); +if (ret) { +printf ("mxc_spi: cannot setup SPI controller\n" ); +return ret; + }reg_write (®s->period,MXC_CSPIPERIOD_32KHZ );reg_write (®s->intr,0 );
Signature · 1 line
2.1.0
PATCH 2/2 SPI: mxc_spi: delay initialisation until claim bus
Quoted 110 lines · Markus Niebel
From: Markus Niebel <[email protected]>
it is not correct to init for a specific slave in
spi_setup_slave. instead buffer the values and delay init untilspi_claim_bus.Signed-off-by Markus Niebel <[email protected]>--- drivers/spi/mxc_spi.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)drivers/spi/mxc_spi.c +21
-17@@ -43,6 +43,8 @@ struct mxc_spi_slave {#endif int gpio;int ss_pol; +unsigned int max_hz; +unsigned int mode; };static inline struct mxc_spi_slave *to_mxc_spi_slave (struct spi_slave *slave)@@ -77,12 +79,13 @@ u32 get_cspi_div(u32 div) }#ifdef MXC_CSPI -static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs) {unsigned int ctrl_reg;u32 clk_src;u32 div; +unsigned int max_hz = mxcs->max_hz; +unsigned int mode = mxcs->mode; clk_src =mxc_get_clock (MXC_CSPI_CLK );@@ -114,19 +117,15 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs,#endif #ifdef MXC_ECSPI -static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs) {u32 clk_src =mxc_get_clock (MXC_CSPI_CLK );s32 reg_ctrl, reg_config;u32 ss_pol =0 , sclkpol =0 , sclkpha =0 , sclkctl =0 ;u32 pre_div =0 , post_div =0 ;struct cspi_regs *regs = (struct cspi_regs *)mxcs->base; - -if (max_hz ==0 ) { -printf ("Error: desired clock is 0\n" ); -return -1 ; - } +unsigned int max_hz = mxcs->max_hz; +unsigned int mode = mxcs->mode;/* * Reset SPI and set all CSs to master mode, if toggling @@ -404,6 +403,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,if (bus >=ARRAY_SIZE (spi_bases))return NULL ; +if (max_hz ==0 ) { +printf ("Error: desired clock is 0\n" ); +return NULL ; + } + mxcs = spi_alloc_slave(struct mxc_spi_slave, bus, cs);if (!mxcs) {puts ("mxc_spi: SPI Slave not allocated !\n" );@@ -421,13 +425,9 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, cs = ret; mxcs->base = spi_bases[bus]; + mxcs->max_hz = max_hz; + mxcs->mode = mode; - ret =spi_cfg_mxc (mxcs, cs, max_hz, mode); -if (ret) { -printf ("mxc_spi: cannot setup SPI controller\n" ); -free (mxcs); -return NULL ; - }return &mxcs->slave; }@@ -440,12 +440,17 @@ void spi_free_slave(struct spi_slave *slave)int spi_claim_bus (struct spi_slave *slave) { +int ret;struct mxc_spi_slave *mxcs =to_mxc_spi_slave (slave);struct cspi_regs *regs = (struct cspi_regs *)mxcs->base;reg_write (®s->rxdata,1 );udelay (1 ); -reg_write (®s->ctrl, mxcs->ctrl_reg); + ret =spi_cfg_mxc (mxcs, slave->cs); +if (ret) { +printf ("mxc_spi: cannot setup SPI controller\n" ); +return ret; + }reg_write (®s->period,MXC_CSPIPERIOD_32KHZ );reg_write (®s->intr,0 ); --
Quoted 2 lines
2.1.0
In fact this driver is using spi_cfg_mxc() for configuring SPI clock,polarities and frequency
in spi_setup_slave() time, but usually spi_setup_slave() will require only basic controller reg
initialization. So while in spi_claim_bus() clock, polarities and frequencies will handle.
Please think on that direction and will be good if you fix those and send the patches for next time.
thanks!
Signature · 1 line
Jagan.
PATCH 2/2 SPI: mxc_spi: delay initialisation until claim bus
Quoted 121 lines · Jagan Teki
Quoted 110 lines · Markus Niebel
From: Markus Niebel <[email protected]>
it is not correct to init for a specific slave in
spi_setup_slave. instead buffer the values and delay init untilspi_claim_bus.Signed-off-by Markus Niebel <[email protected]>--- drivers/spi/mxc_spi.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)drivers/spi/mxc_spi.c +21
-17@@ -43,6 +43,8 @@ struct mxc_spi_slave {#endif int gpio;int ss_pol; +unsigned int max_hz; +unsigned int mode; };static inline struct mxc_spi_slave *to_mxc_spi_slave (struct spi_slave *slave)@@ -77,12 +79,13 @@ u32 get_cspi_div(u32 div) }#ifdef MXC_CSPI -static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs) {unsigned int ctrl_reg;u32 clk_src;u32 div; +unsigned int max_hz = mxcs->max_hz; +unsigned int mode = mxcs->mode; clk_src =mxc_get_clock (MXC_CSPI_CLK );@@ -114,19 +117,15 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs,#endif #ifdef MXC_ECSPI -static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs, -unsigned int max_hz,unsigned int mode) +static s32 spi_cfg_mxc (struct mxc_spi_slave *mxcs,unsigned int cs) {u32 clk_src =mxc_get_clock (MXC_CSPI_CLK );s32 reg_ctrl, reg_config;u32 ss_pol =0 , sclkpol =0 , sclkpha =0 , sclkctl =0 ;u32 pre_div =0 , post_div =0 ;struct cspi_regs *regs = (struct cspi_regs *)mxcs->base; - -if (max_hz ==0 ) { -printf ("Error: desired clock is 0\n" ); -return -1 ; - } +unsigned int max_hz = mxcs->max_hz; +unsigned int mode = mxcs->mode;/* * Reset SPI and set all CSs to master mode, if toggling @@ -404,6 +403,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,if (bus >=ARRAY_SIZE (spi_bases))return NULL ; +if (max_hz ==0 ) { +printf ("Error: desired clock is 0\n" ); +return NULL ; + } + mxcs = spi_alloc_slave(struct mxc_spi_slave, bus, cs);if (!mxcs) {puts ("mxc_spi: SPI Slave not allocated !\n" );@@ -421,13 +425,9 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, cs = ret; mxcs->base = spi_bases[bus]; + mxcs->max_hz = max_hz; + mxcs->mode = mode; - ret =spi_cfg_mxc (mxcs, cs, max_hz, mode); -if (ret) { -printf ("mxc_spi: cannot setup SPI controller\n" ); -free (mxcs); -return NULL ; - }return &mxcs->slave; }@@ -440,12 +440,17 @@ void spi_free_slave(struct spi_slave *slave)int spi_claim_bus (struct spi_slave *slave) { +int ret;struct mxc_spi_slave *mxcs =to_mxc_spi_slave (slave);struct cspi_regs *regs = (struct cspi_regs *)mxcs->base;reg_write (®s->rxdata,1 );udelay (1 ); -reg_write (®s->ctrl, mxcs->ctrl_reg); + ret =spi_cfg_mxc (mxcs, slave->cs); +if (ret) { +printf ("mxc_spi: cannot setup SPI controller\n" ); +return ret; + }reg_write (®s->period,MXC_CSPIPERIOD_32KHZ );reg_write (®s->intr,0 ); --Quoted 2 lines
2.1.0
In fact this driver is using
spi_cfg_mxc()for configuring SPI clock,polarities and frequency
inspi_setup_slave()time, but usuallyspi_setup_slave()will require only basic controller reg
initialization. So while inspi_claim_bus()clock, polarities and frequencies will handle.
Quoted 2 lines
Please think on that direction and will be good if you fix those and send the patches for next time.
I think you did the same, what I mentioned above, could you rebase this patch on master, I have seen patch failed error while applying.
thanks!
Signature · 1 line
Jagan.