* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
@ 2013-08-26 15:45 Marek Vasut
2013-08-26 16:04 ` Stefano Babic
0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2013-08-26 15:45 UTC (permalink / raw)
To: u-boot
The chipselect must be written into the CTRL0 register after the SSP
block is reset, otherwise the block will always use ChipSelect #0.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
---
drivers/spi/mxs_spi.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
V2: Clean up a warning that "ssp_regs" are not used
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 3cf7142..2b9f395 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode)
{
struct mxs_spi_slave *mxs_slave;
- struct mxs_ssp_regs *ssp_regs;
- int reg;
if (!spi_cs_is_valid(bus, cs)) {
printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs);
@@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
mxs_slave->max_khz = max_hz / 1000;
mxs_slave->mode = mode;
mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
- ssp_regs = mxs_slave->regs;
- reg = readl(&ssp_regs->hw_ssp_ctrl0);
- reg &= ~(MXS_SSP_CHIPSELECT_MASK);
- reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
-
- writel(reg, &ssp_regs->hw_ssp_ctrl0);
return &mxs_slave->slave;
err_init:
@@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
- writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
+ writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
+ SSP_CTRL0_BUS_WIDTH_ONE_BIT,
+ &ssp_regs->hw_ssp_ctrl0);
reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-26 15:45 [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset Marek Vasut
@ 2013-08-26 16:04 ` Stefano Babic
2013-08-27 9:05 ` Marek Vasut
0 siblings, 1 reply; 10+ messages in thread
From: Stefano Babic @ 2013-08-26 16:04 UTC (permalink / raw)
To: u-boot
On 26/08/2013 17:45, Marek Vasut wrote:
> The chipselect must be written into the CTRL0 register after the SSP
> block is reset, otherwise the block will always use ChipSelect #0.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> drivers/spi/mxs_spi.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> V2: Clean up a warning that "ssp_regs" are not used
>
> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
> index 3cf7142..2b9f395 100644
> --- a/drivers/spi/mxs_spi.c
> +++ b/drivers/spi/mxs_spi.c
> @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
> unsigned int max_hz, unsigned int mode)
> {
> struct mxs_spi_slave *mxs_slave;
> - struct mxs_ssp_regs *ssp_regs;
> - int reg;
>
> if (!spi_cs_is_valid(bus, cs)) {
> printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs);
> @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
> mxs_slave->max_khz = max_hz / 1000;
> mxs_slave->mode = mode;
> mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
> - ssp_regs = mxs_slave->regs;
>
> - reg = readl(&ssp_regs->hw_ssp_ctrl0);
> - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
> - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
> -
> - writel(reg, &ssp_regs->hw_ssp_ctrl0);
> return &mxs_slave->slave;
>
> err_init:
> @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
>
> mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
>
> - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
> + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
> + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
> + &ssp_regs->hw_ssp_ctrl0);
>
> reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
> reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>
Acked-by: Stefano Babic <sbabic@denx.de>
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
=====================================================================
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-26 16:04 ` Stefano Babic
@ 2013-08-27 9:05 ` Marek Vasut
2013-08-27 9:08 ` Jagan Teki
2013-08-27 9:10 ` Stefano Babic
0 siblings, 2 replies; 10+ messages in thread
From: Marek Vasut @ 2013-08-27 9:05 UTC (permalink / raw)
To: u-boot
Dear Stefano Babic,
> On 26/08/2013 17:45, Marek Vasut wrote:
> > The chipselect must be written into the CTRL0 register after the SSP
> > block is reset, otherwise the block will always use ChipSelect #0.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
> > Cc: Otavio Salvador <otavio@ossystems.com.br>
> > Cc: Stefano Babic <sbabic@denx.de>
> > ---
> >
> > drivers/spi/mxs_spi.c | 12 +++---------
> > 1 file changed, 3 insertions(+), 9 deletions(-)
> >
> > V2: Clean up a warning that "ssp_regs" are not used
> >
> > diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
> > index 3cf7142..2b9f395 100644
> > --- a/drivers/spi/mxs_spi.c
> > +++ b/drivers/spi/mxs_spi.c
> > @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
> > unsigned int cs,
> >
> > unsigned int max_hz, unsigned int mode)
> >
> > {
> >
> > struct mxs_spi_slave *mxs_slave;
> >
> > - struct mxs_ssp_regs *ssp_regs;
> > - int reg;
> >
> > if (!spi_cs_is_valid(bus, cs)) {
> >
> > printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs);
> >
> > @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
> > unsigned int cs,
> >
> > mxs_slave->max_khz = max_hz / 1000;
> > mxs_slave->mode = mode;
> > mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
> >
> > - ssp_regs = mxs_slave->regs;
> >
> > - reg = readl(&ssp_regs->hw_ssp_ctrl0);
> > - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
> > - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
> > -
> > - writel(reg, &ssp_regs->hw_ssp_ctrl0);
> >
> > return &mxs_slave->slave;
> >
> > err_init:
> > @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
> >
> > mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
> >
> > - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
> > + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
> > + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
> > + &ssp_regs->hw_ssp_ctrl0);
> >
> > reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
> > reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>
> Acked-by: Stefano Babic <sbabic@denx.de>
Can we push this via IMX tree ?
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:05 ` Marek Vasut
@ 2013-08-27 9:08 ` Jagan Teki
2013-08-27 9:21 ` Marek Vasut
2013-08-27 9:10 ` Stefano Babic
1 sibling, 1 reply; 10+ messages in thread
From: Jagan Teki @ 2013-08-27 9:08 UTC (permalink / raw)
To: u-boot
Hi,
On Tue, Aug 27, 2013 at 2:35 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Stefano Babic,
>
>> On 26/08/2013 17:45, Marek Vasut wrote:
>> > The chipselect must be written into the CTRL0 register after the SSP
>> > block is reset, otherwise the block will always use ChipSelect #0.
>> >
>> > Signed-off-by: Marek Vasut <marex@denx.de>
>> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
>> > Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
>> > Cc: Otavio Salvador <otavio@ossystems.com.br>
>> > Cc: Stefano Babic <sbabic@denx.de>
>> > ---
>> >
>> > drivers/spi/mxs_spi.c | 12 +++---------
>> > 1 file changed, 3 insertions(+), 9 deletions(-)
>> >
>> > V2: Clean up a warning that "ssp_regs" are not used
>> >
>> > diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
>> > index 3cf7142..2b9f395 100644
>> > --- a/drivers/spi/mxs_spi.c
>> > +++ b/drivers/spi/mxs_spi.c
>> > @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>> > unsigned int cs,
>> >
>> > unsigned int max_hz, unsigned int mode)
>> >
>> > {
>> >
>> > struct mxs_spi_slave *mxs_slave;
>> >
>> > - struct mxs_ssp_regs *ssp_regs;
>> > - int reg;
>> >
>> > if (!spi_cs_is_valid(bus, cs)) {
>> >
>> > printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs);
>> >
>> > @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>> > unsigned int cs,
>> >
>> > mxs_slave->max_khz = max_hz / 1000;
>> > mxs_slave->mode = mode;
>> > mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
>> >
>> > - ssp_regs = mxs_slave->regs;
>> >
>> > - reg = readl(&ssp_regs->hw_ssp_ctrl0);
>> > - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
>> > - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
>> > -
>> > - writel(reg, &ssp_regs->hw_ssp_ctrl0);
>> >
>> > return &mxs_slave->slave;
>> >
>> > err_init:
>> > @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
>> >
>> > mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
>> >
>> > - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
>> > + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
>> > + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
>> > + &ssp_regs->hw_ssp_ctrl0);
>> >
>> > reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
>> > reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>>
>> Acked-by: Stefano Babic <sbabic@denx.de>
>
> Can we push this via IMX tree ?
I have a simple concern about commit head msg.
spi: mxs:
spi: mxs_spi:
I preferred the second one as rest are follow the same, just for unification.
Please send the v2, if your OK. then I will push it on my tree.
--
Thanks,
Jagan.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:05 ` Marek Vasut
2013-08-27 9:08 ` Jagan Teki
@ 2013-08-27 9:10 ` Stefano Babic
2013-08-27 9:13 ` Jagan Teki
1 sibling, 1 reply; 10+ messages in thread
From: Stefano Babic @ 2013-08-27 9:10 UTC (permalink / raw)
To: u-boot
On 27/08/2013 11:05, Marek Vasut wrote:
> Dear Stefano Babic,
>
>> On 26/08/2013 17:45, Marek Vasut wrote:
>>> The chipselect must be written into the CTRL0 register after the SSP
>>> block is reset, otherwise the block will always use ChipSelect #0.
>>>
>>> Signed-off-by: Marek Vasut <marex@denx.de>
>>> Cc: Fabio Estevam <fabio.estevam@freescale.com>
>>> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
>>> Cc: Otavio Salvador <otavio@ossystems.com.br>
>>> Cc: Stefano Babic <sbabic@denx.de>
>>> ---
>>>
>>> drivers/spi/mxs_spi.c | 12 +++---------
>>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>>
>>> V2: Clean up a warning that "ssp_regs" are not used
>>>
>>> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
>>> index 3cf7142..2b9f395 100644
>>> --- a/drivers/spi/mxs_spi.c
>>> +++ b/drivers/spi/mxs_spi.c
>>> @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>>> unsigned int cs,
>>>
>>> unsigned int max_hz, unsigned int mode)
>>>
>>> {
>>>
>>> struct mxs_spi_slave *mxs_slave;
>>>
>>> - struct mxs_ssp_regs *ssp_regs;
>>> - int reg;
>>>
>>> if (!spi_cs_is_valid(bus, cs)) {
>>>
>>> printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs);
>>>
>>> @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>>> unsigned int cs,
>>>
>>> mxs_slave->max_khz = max_hz / 1000;
>>> mxs_slave->mode = mode;
>>> mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
>>>
>>> - ssp_regs = mxs_slave->regs;
>>>
>>> - reg = readl(&ssp_regs->hw_ssp_ctrl0);
>>> - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
>>> - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
>>> -
>>> - writel(reg, &ssp_regs->hw_ssp_ctrl0);
>>>
>>> return &mxs_slave->slave;
>>>
>>> err_init:
>>> @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
>>>
>>> mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
>>>
>>> - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
>>> + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
>>> + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
>>> + &ssp_regs->hw_ssp_ctrl0);
>>>
>>> reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
>>> reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>>
>> Acked-by: Stefano Babic <sbabic@denx.de>
>
> Can we push this via IMX tree ?
Maybe, but correctly this should be push via 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
=====================================================================
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:10 ` Stefano Babic
@ 2013-08-27 9:13 ` Jagan Teki
0 siblings, 0 replies; 10+ messages in thread
From: Jagan Teki @ 2013-08-27 9:13 UTC (permalink / raw)
To: u-boot
On Tue, Aug 27, 2013 at 2:40 PM, Stefano Babic <sbabic@denx.de> wrote:
> On 27/08/2013 11:05, Marek Vasut wrote:
>> Dear Stefano Babic,
>>
>>> On 26/08/2013 17:45, Marek Vasut wrote:
>>>> The chipselect must be written into the CTRL0 register after the SSP
>>>> block is reset, otherwise the block will always use ChipSelect #0.
>>>>
>>>> Signed-off-by: Marek Vasut <marex@denx.de>
>>>> Cc: Fabio Estevam <fabio.estevam@freescale.com>
>>>> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
>>>> Cc: Otavio Salvador <otavio@ossystems.com.br>
>>>> Cc: Stefano Babic <sbabic@denx.de>
>>>> ---
>>>>
>>>> drivers/spi/mxs_spi.c | 12 +++---------
>>>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>>>
>>>> V2: Clean up a warning that "ssp_regs" are not used
>>>>
>>>> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
>>>> index 3cf7142..2b9f395 100644
>>>> --- a/drivers/spi/mxs_spi.c
>>>> +++ b/drivers/spi/mxs_spi.c
>>>> @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>>>> unsigned int cs,
>>>>
>>>> unsigned int max_hz, unsigned int mode)
>>>>
>>>> {
>>>>
>>>> struct mxs_spi_slave *mxs_slave;
>>>>
>>>> - struct mxs_ssp_regs *ssp_regs;
>>>> - int reg;
>>>>
>>>> if (!spi_cs_is_valid(bus, cs)) {
>>>>
>>>> printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs);
>>>>
>>>> @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>>>> unsigned int cs,
>>>>
>>>> mxs_slave->max_khz = max_hz / 1000;
>>>> mxs_slave->mode = mode;
>>>> mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
>>>>
>>>> - ssp_regs = mxs_slave->regs;
>>>>
>>>> - reg = readl(&ssp_regs->hw_ssp_ctrl0);
>>>> - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
>>>> - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
>>>> -
>>>> - writel(reg, &ssp_regs->hw_ssp_ctrl0);
>>>>
>>>> return &mxs_slave->slave;
>>>>
>>>> err_init:
>>>> @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
>>>>
>>>> mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
>>>>
>>>> - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
>>>> + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
>>>> + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
>>>> + &ssp_regs->hw_ssp_ctrl0);
>>>>
>>>> reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
>>>> reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>>>
>>> Acked-by: Stefano Babic <sbabic@denx.de>
>>
>> Can we push this via IMX tree ?
>
> Maybe, but correctly this should be push via u-boot-spi.
Yes, I sent a comment regarding commit head msg.
Will push it on my repo once i got the response.
--
Thanks,
Jagan.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:08 ` Jagan Teki
@ 2013-08-27 9:21 ` Marek Vasut
2013-08-27 9:28 ` Jagan Teki
0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2013-08-27 9:21 UTC (permalink / raw)
To: u-boot
Dear Jagan Teki,
> Hi,
>
> On Tue, Aug 27, 2013 at 2:35 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Stefano Babic,
> >
> >> On 26/08/2013 17:45, Marek Vasut wrote:
> >> > The chipselect must be written into the CTRL0 register after the SSP
> >> > block is reset, otherwise the block will always use ChipSelect #0.
> >> >
> >> > Signed-off-by: Marek Vasut <marex@denx.de>
> >> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> >> > Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
> >> > Cc: Otavio Salvador <otavio@ossystems.com.br>
> >> > Cc: Stefano Babic <sbabic@denx.de>
> >> > ---
> >> >
> >> > drivers/spi/mxs_spi.c | 12 +++---------
> >> > 1 file changed, 3 insertions(+), 9 deletions(-)
> >> >
> >> > V2: Clean up a warning that "ssp_regs" are not used
> >> >
> >> > diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
> >> > index 3cf7142..2b9f395 100644
> >> > --- a/drivers/spi/mxs_spi.c
> >> > +++ b/drivers/spi/mxs_spi.c
> >> > @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
> >> > unsigned int cs,
> >> >
> >> > unsigned int max_hz, unsigned int mode)
> >> >
> >> > {
> >> >
> >> > struct mxs_spi_slave *mxs_slave;
> >> >
> >> > - struct mxs_ssp_regs *ssp_regs;
> >> > - int reg;
> >> >
> >> > if (!spi_cs_is_valid(bus, cs)) {
> >> >
> >> > printf("mxs_spi: invalid bus %d / chip select %d\n", bus,
> >> > cs);
> >> >
> >> > @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
> >> > unsigned int cs,
> >> >
> >> > mxs_slave->max_khz = max_hz / 1000;
> >> > mxs_slave->mode = mode;
> >> > mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
> >> >
> >> > - ssp_regs = mxs_slave->regs;
> >> >
> >> > - reg = readl(&ssp_regs->hw_ssp_ctrl0);
> >> > - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
> >> > - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
> >> > -
> >> > - writel(reg, &ssp_regs->hw_ssp_ctrl0);
> >> >
> >> > return &mxs_slave->slave;
> >> >
> >> > err_init:
> >> > @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
> >> >
> >> > mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
> >> >
> >> > - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
> >> > + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
> >> > + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
> >> > + &ssp_regs->hw_ssp_ctrl0);
> >> >
> >> > reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
> >> > reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
> >>
> >> Acked-by: Stefano Babic <sbabic@denx.de>
> >
> > Can we push this via IMX tree ?
>
> I have a simple concern about commit head msg.
> spi: mxs:
> spi: mxs_spi:
>
> I preferred the second one as rest are follow the same, just for
> unification. Please send the v2, if your OK. then I will push it on my
> tree.
Can you fix that before pushing? I am fine either way.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:21 ` Marek Vasut
@ 2013-08-27 9:28 ` Jagan Teki
2013-08-27 9:34 ` Marek Vasut
0 siblings, 1 reply; 10+ messages in thread
From: Jagan Teki @ 2013-08-27 9:28 UTC (permalink / raw)
To: u-boot
Hi
On Tue, Aug 27, 2013 at 2:51 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Jagan Teki,
>
>> Hi,
>>
>> On Tue, Aug 27, 2013 at 2:35 PM, Marek Vasut <marex@denx.de> wrote:
>> > Dear Stefano Babic,
>> >
>> >> On 26/08/2013 17:45, Marek Vasut wrote:
>> >> > The chipselect must be written into the CTRL0 register after the SSP
>> >> > block is reset, otherwise the block will always use ChipSelect #0.
>> >> >
>> >> > Signed-off-by: Marek Vasut <marex@denx.de>
>> >> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
>> >> > Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
>> >> > Cc: Otavio Salvador <otavio@ossystems.com.br>
>> >> > Cc: Stefano Babic <sbabic@denx.de>
>> >> > ---
>> >> >
>> >> > drivers/spi/mxs_spi.c | 12 +++---------
>> >> > 1 file changed, 3 insertions(+), 9 deletions(-)
>> >> >
>> >> > V2: Clean up a warning that "ssp_regs" are not used
>> >> >
>> >> > diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
>> >> > index 3cf7142..2b9f395 100644
>> >> > --- a/drivers/spi/mxs_spi.c
>> >> > +++ b/drivers/spi/mxs_spi.c
>> >> > @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>> >> > unsigned int cs,
>> >> >
>> >> > unsigned int max_hz, unsigned int mode)
>> >> >
>> >> > {
>> >> >
>> >> > struct mxs_spi_slave *mxs_slave;
>> >> >
>> >> > - struct mxs_ssp_regs *ssp_regs;
>> >> > - int reg;
>> >> >
>> >> > if (!spi_cs_is_valid(bus, cs)) {
>> >> >
>> >> > printf("mxs_spi: invalid bus %d / chip select %d\n", bus,
>> >> > cs);
>> >> >
>> >> > @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
>> >> > unsigned int cs,
>> >> >
>> >> > mxs_slave->max_khz = max_hz / 1000;
>> >> > mxs_slave->mode = mode;
>> >> > mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
>> >> >
>> >> > - ssp_regs = mxs_slave->regs;
>> >> >
>> >> > - reg = readl(&ssp_regs->hw_ssp_ctrl0);
>> >> > - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
>> >> > - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
>> >> > -
>> >> > - writel(reg, &ssp_regs->hw_ssp_ctrl0);
>> >> >
>> >> > return &mxs_slave->slave;
>> >> >
>> >> > err_init:
>> >> > @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
>> >> >
>> >> > mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
>> >> >
>> >> > - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
>> >> > + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
>> >> > + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
>> >> > + &ssp_regs->hw_ssp_ctrl0);
>> >> >
>> >> > reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS;
>> >> > reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>> >>
>> >> Acked-by: Stefano Babic <sbabic@denx.de>
>> >
>> > Can we push this via IMX tree ?
>>
>> I have a simple concern about commit head msg.
>> spi: mxs:
>> spi: mxs_spi:
>>
>> I preferred the second one as rest are follow the same, just for
>> unification. Please send the v2, if your OK. then I will push it on my
>> tree.
>
> Can you fix that before pushing? I am fine either way.
OK, sure I will do that.
--
Thanks,
Jagan.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:28 ` Jagan Teki
@ 2013-08-27 9:34 ` Marek Vasut
2013-08-27 14:12 ` Jagan Teki
0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2013-08-27 9:34 UTC (permalink / raw)
To: u-boot
Dear Jagan Teki,
> Hi
>
> On Tue, Aug 27, 2013 at 2:51 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Jagan Teki,
> >
> >> Hi,
> >>
> >> On Tue, Aug 27, 2013 at 2:35 PM, Marek Vasut <marex@denx.de> wrote:
> >> > Dear Stefano Babic,
> >> >
> >> >> On 26/08/2013 17:45, Marek Vasut wrote:
> >> >> > The chipselect must be written into the CTRL0 register after the
> >> >> > SSP block is reset, otherwise the block will always use ChipSelect
> >> >> > #0.
> >> >> >
> >> >> > Signed-off-by: Marek Vasut <marex@denx.de>
> >> >> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> >> >> > Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
> >> >> > Cc: Otavio Salvador <otavio@ossystems.com.br>
> >> >> > Cc: Stefano Babic <sbabic@denx.de>
> >> >> > ---
> >> >> >
> >> >> > drivers/spi/mxs_spi.c | 12 +++---------
> >> >> > 1 file changed, 3 insertions(+), 9 deletions(-)
> >> >> >
> >> >> > V2: Clean up a warning that "ssp_regs" are not used
> >> >> >
> >> >> > diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
> >> >> > index 3cf7142..2b9f395 100644
> >> >> > --- a/drivers/spi/mxs_spi.c
> >> >> > +++ b/drivers/spi/mxs_spi.c
> >> >> > @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int
> >> >> > bus, unsigned int cs,
> >> >> >
> >> >> > unsigned int max_hz, unsigned int
> >> >> > mode)
> >> >> >
> >> >> > {
> >> >> >
> >> >> > struct mxs_spi_slave *mxs_slave;
> >> >> >
> >> >> > - struct mxs_ssp_regs *ssp_regs;
> >> >> > - int reg;
> >> >> >
> >> >> > if (!spi_cs_is_valid(bus, cs)) {
> >> >> >
> >> >> > printf("mxs_spi: invalid bus %d / chip select %d\n",
> >> >> > bus, cs);
> >> >> >
> >> >> > @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int
> >> >> > bus, unsigned int cs,
> >> >> >
> >> >> > mxs_slave->max_khz = max_hz / 1000;
> >> >> > mxs_slave->mode = mode;
> >> >> > mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
> >> >> >
> >> >> > - ssp_regs = mxs_slave->regs;
> >> >> >
> >> >> > - reg = readl(&ssp_regs->hw_ssp_ctrl0);
> >> >> > - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
> >> >> > - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
> >> >> > -
> >> >> > - writel(reg, &ssp_regs->hw_ssp_ctrl0);
> >> >> >
> >> >> > return &mxs_slave->slave;
> >> >> >
> >> >> > err_init:
> >> >> > @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
> >> >> >
> >> >> > mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
> >> >> >
> >> >> > - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
> >> >> > + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
> >> >> > + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
> >> >> > + &ssp_regs->hw_ssp_ctrl0);
> >> >> >
> >> >> > reg = SSP_CTRL1_SSP_MODE_SPI |
> >> >> > SSP_CTRL1_WORD_LENGTH_EIGHT_BITS; reg |= (mxs_slave->mode &
> >> >> > SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
> >> >>
> >> >> Acked-by: Stefano Babic <sbabic@denx.de>
> >> >
> >> > Can we push this via IMX tree ?
> >>
> >> I have a simple concern about commit head msg.
> >> spi: mxs:
> >> spi: mxs_spi:
> >>
> >> I preferred the second one as rest are follow the same, just for
> >> unification. Please send the v2, if your OK. then I will push it on my
> >> tree.
> >
> > Can you fix that before pushing? I am fine either way.
>
> OK, sure I will do that.
Thanks a lot!
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset
2013-08-27 9:34 ` Marek Vasut
@ 2013-08-27 14:12 ` Jagan Teki
0 siblings, 0 replies; 10+ messages in thread
From: Jagan Teki @ 2013-08-27 14:12 UTC (permalink / raw)
To: u-boot
On 27-08-2013 15:04, Marek Vasut wrote:
> Dear Jagan Teki,
>
>> Hi
>>
>> On Tue, Aug 27, 2013 at 2:51 PM, Marek Vasut <marex@denx.de> wrote:
>>> Dear Jagan Teki,
>>>
>>>> Hi,
>>>>
>>>> On Tue, Aug 27, 2013 at 2:35 PM, Marek Vasut <marex@denx.de> wrote:
>>>>> Dear Stefano Babic,
>>>>>
>>>>>> On 26/08/2013 17:45, Marek Vasut wrote:
>>>>>>> The chipselect must be written into the CTRL0 register after the
>>>>>>> SSP block is reset, otherwise the block will always use ChipSelect
>>>>>>> #0.
>>>>>>>
>>>>>>> Signed-off-by: Marek Vasut <marex@denx.de>
>>>>>>> Cc: Fabio Estevam <fabio.estevam@freescale.com>
>>>>>>> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
>>>>>>> Cc: Otavio Salvador <otavio@ossystems.com.br>
>>>>>>> Cc: Stefano Babic <sbabic@denx.de>
>>>>>>> ---
>>>>>>>
>>>>>>> drivers/spi/mxs_spi.c | 12 +++---------
>>>>>>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>>>>>>
>>>>>>> V2: Clean up a warning that "ssp_regs" are not used
>>>>>>>
>>>>>>> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
>>>>>>> index 3cf7142..2b9f395 100644
>>>>>>> --- a/drivers/spi/mxs_spi.c
>>>>>>> +++ b/drivers/spi/mxs_spi.c
>>>>>>> @@ -56,8 +56,6 @@ struct spi_slave *spi_setup_slave(unsigned int
>>>>>>> bus, unsigned int cs,
>>>>>>>
>>>>>>> unsigned int max_hz, unsigned int
>>>>>>> mode)
>>>>>>>
>>>>>>> {
>>>>>>>
>>>>>>> struct mxs_spi_slave *mxs_slave;
>>>>>>>
>>>>>>> - struct mxs_ssp_regs *ssp_regs;
>>>>>>> - int reg;
>>>>>>>
>>>>>>> if (!spi_cs_is_valid(bus, cs)) {
>>>>>>>
>>>>>>> printf("mxs_spi: invalid bus %d / chip select %d\n",
>>>>>>> bus, cs);
>>>>>>>
>>>>>>> @@ -74,13 +72,7 @@ struct spi_slave *spi_setup_slave(unsigned int
>>>>>>> bus, unsigned int cs,
>>>>>>>
>>>>>>> mxs_slave->max_khz = max_hz / 1000;
>>>>>>> mxs_slave->mode = mode;
>>>>>>> mxs_slave->regs = mxs_ssp_regs_by_bus(bus);
>>>>>>>
>>>>>>> - ssp_regs = mxs_slave->regs;
>>>>>>>
>>>>>>> - reg = readl(&ssp_regs->hw_ssp_ctrl0);
>>>>>>> - reg &= ~(MXS_SSP_CHIPSELECT_MASK);
>>>>>>> - reg |= cs << MXS_SSP_CHIPSELECT_SHIFT;
>>>>>>> -
>>>>>>> - writel(reg, &ssp_regs->hw_ssp_ctrl0);
>>>>>>>
>>>>>>> return &mxs_slave->slave;
>>>>>>>
>>>>>>> err_init:
>>>>>>> @@ -102,7 +94,9 @@ int spi_claim_bus(struct spi_slave *slave)
>>>>>>>
>>>>>>> mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
>>>>>>>
>>>>>>> - writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
>>>>>>> + writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) |
>>>>>>> + SSP_CTRL0_BUS_WIDTH_ONE_BIT,
>>>>>>> + &ssp_regs->hw_ssp_ctrl0);
>>>>>>>
>>>>>>> reg = SSP_CTRL1_SSP_MODE_SPI |
>>>>>>> SSP_CTRL1_WORD_LENGTH_EIGHT_BITS; reg |= (mxs_slave->mode &
>>>>>>> SPI_CPOL) ? SSP_CTRL1_POLARITY : 0;
>>>>>>
>>>>>> Acked-by: Stefano Babic <sbabic@denx.de>
>>>>>
>>>>> Can we push this via IMX tree ?
>>>>
>>>> I have a simple concern about commit head msg.
>>>> spi: mxs:
>>>> spi: mxs_spi:
>>>>
>>>> I preferred the second one as rest are follow the same, just for
>>>> unification. Please send the v2, if your OK. then I will push it on my
>>>> tree.
>>>
>>> Can you fix that before pushing? I am fine either way.
>>
>> OK, sure I will do that.
>
> Thanks a lot!
>
> Best regards,
> Marek Vasut
>
Applied to u-boot-spi/master
--
Thanks,
Jagan.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-08-27 14:12 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-26 15:45 [U-Boot] [PATCH V2] spi: mxs: Configure chipselect after block reset Marek Vasut
2013-08-26 16:04 ` Stefano Babic
2013-08-27 9:05 ` Marek Vasut
2013-08-27 9:08 ` Jagan Teki
2013-08-27 9:21 ` Marek Vasut
2013-08-27 9:28 ` Jagan Teki
2013-08-27 9:34 ` Marek Vasut
2013-08-27 14:12 ` Jagan Teki
2013-08-27 9:10 ` Stefano Babic
2013-08-27 9:13 ` Jagan Teki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox