* [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing
@ 2014-02-18 1:31 Axel Lin
2014-02-18 8:27 ` Alexander Shiyan
0 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2014-02-18 1:31 UTC (permalink / raw)
To: Mark Brown; +Cc: Alexander Shiyan, linux-spi-u79uwXL29TY76Z2rM5mHXA
Convert to use default implementation of transfer_one_message() which provides
standard handling of delays and chip select management.
Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
---
v2: Remove spi_clps711x_set_cs() as it is done by spi core
drivers/spi/spi-clps711x.c | 82 +++++++++++++++++-----------------------------
1 file changed, 30 insertions(+), 52 deletions(-)
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index f973e97..e07d1b0 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -24,8 +24,6 @@
#define DRIVER_NAME "spi-clps711x"
struct spi_clps711x_data {
- struct completion done;
-
struct clk *spi_clk;
u32 max_speed_hz;
@@ -43,15 +41,6 @@ static int spi_clps711x_setup(struct spi_device *spi)
return 0;
}
-static void spi_clps711x_setup_mode(struct spi_device *spi)
-{
- /* Setup edge for transfer */
- if (spi->mode & SPI_CPHA)
- clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3);
- else
- clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3);
-}
-
static void spi_clps711x_setup_xfer(struct spi_device *spi,
struct spi_transfer *xfer)
{
@@ -73,55 +62,44 @@ static void spi_clps711x_setup_xfer(struct spi_device *spi,
SYSCON1_ADCKSEL(0), SYSCON1);
}
-static int spi_clps711x_transfer_one_message(struct spi_master *master,
- struct spi_message *msg)
+static int spi_clps711x_prepare_message(struct spi_master *master,
+ struct spi_message *msg)
{
- struct spi_clps711x_data *hw = spi_master_get_devdata(master);
struct spi_device *spi = msg->spi;
- struct spi_transfer *xfer;
-
- spi_clps711x_setup_mode(spi);
-
- list_for_each_entry(xfer, &msg->transfers, transfer_list) {
- u8 data;
-
- spi_clps711x_setup_xfer(spi, xfer);
- gpio_set_value(spi->cs_gpio, !!(spi->mode & SPI_CS_HIGH));
-
- reinit_completion(&hw->done);
-
- hw->len = xfer->len;
- hw->bpw = xfer->bits_per_word ? : spi->bits_per_word;
- hw->tx_buf = (u8 *)xfer->tx_buf;
- hw->rx_buf = (u8 *)xfer->rx_buf;
-
- /* Initiate transfer */
- data = hw->tx_buf ? *hw->tx_buf++ : 0;
- clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
- SYNCIO);
-
- wait_for_completion(&hw->done);
+ /* Setup edge for transfer */
+ if (spi->mode & SPI_CPHA)
+ clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3);
+ else
+ clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3);
- if (xfer->delay_usecs)
- udelay(xfer->delay_usecs);
+ return 0;
+}
- if (xfer->cs_change ||
- list_is_last(&xfer->transfer_list, &msg->transfers))
- gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
+static int spi_clps711x_transfer_one(struct spi_master *master,
+ struct spi_device *spi,
+ struct spi_transfer *xfer)
+{
+ struct spi_clps711x_data *hw = spi_master_get_devdata(master);
+ u8 data;
- msg->actual_length += xfer->len;
- }
+ spi_clps711x_setup_xfer(spi, xfer);
- msg->status = 0;
- spi_finalize_current_message(master);
+ hw->len = xfer->len;
+ hw->bpw = xfer->bits_per_word ? : spi->bits_per_word;
+ hw->tx_buf = (u8 *)xfer->tx_buf;
+ hw->rx_buf = (u8 *)xfer->rx_buf;
- return 0;
+ /* Initiate transfer */
+ data = hw->tx_buf ? *hw->tx_buf++ : 0;
+ clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN, SYNCIO);
+ return 1;
}
static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
{
- struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
+ struct spi_master *master = dev_id;
+ struct spi_clps711x_data *hw = spi_master_get_devdata(master);
u8 data;
/* Handle RX */
@@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
SYNCIO);
} else
- complete(&hw->done);
+ complete(&master->xfer_completion);
return IRQ_HANDLED;
}
@@ -173,7 +151,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 8);
master->num_chipselect = pdata->num_chipselect;
master->setup = spi_clps711x_setup;
- master->transfer_one_message = spi_clps711x_transfer_one_message;
+ master->prepare_message = spi_clps711x_prepare_message;
+ master->transfer_one = spi_clps711x_transfer_one;
hw = spi_master_get_devdata(master);
@@ -199,7 +178,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
}
hw->max_speed_hz = clk_get_rate(hw->spi_clk);
- init_completion(&hw->done);
platform_set_drvdata(pdev, master);
/* Disable extended mode due hardware problems */
@@ -209,7 +187,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
clps_readl(SYNCIO);
ret = devm_request_irq(&pdev->dev, IRQ_SSEOTI, spi_clps711x_isr, 0,
- dev_name(&pdev->dev), hw);
+ dev_name(&pdev->dev), master);
if (ret) {
dev_err(&pdev->dev, "Can't request IRQ\n");
goto err_out;
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing
2014-02-18 1:31 [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing Axel Lin
@ 2014-02-18 8:27 ` Alexander Shiyan
[not found] ` <1392712030.410354049-ah3gxum9muhsdVUOrk1QfQ@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Alexander Shiyan @ 2014-02-18 8:27 UTC (permalink / raw)
To: Axel Lin; +Cc: Mark Brown, linux-spi-u79uwXL29TY76Z2rM5mHXA
Вторник, 18 февраля 2014, 9:31 +08:00 от Axel Lin <axel.lin@ingics.com>:
> Convert to use default implementation of transfer_one_message() which provides
> standard handling of delays and chip select management.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
...
> static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
> {
> - struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
> + struct spi_master *master = dev_id;
> + struct spi_clps711x_data *hw = spi_master_get_devdata(master);
> u8 data;
>
> /* Handle RX */
> @@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
> clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
> SYNCIO);
> } else
> - complete(&hw->done);
> + complete(&master->xfer_completion);
spi_finalize_current_transfer(master);
---
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing
[not found] ` <1392712030.410354049-ah3gxum9muhsdVUOrk1QfQ@public.gmane.org>
@ 2014-02-18 8:52 ` Axel Lin
[not found] ` <CAFRkauCQkyDFixt-t1Oe9L8eJBdhCeAFMeEBn7KimfcFRcP_ag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2014-02-18 8:52 UTC (permalink / raw)
To: Alexander Shiyan; +Cc: Mark Brown, linux-spi-u79uwXL29TY76Z2rM5mHXA
2014-02-18 16:27 GMT+08:00 Alexander Shiyan <shc_work-JGs/UdohzUI@public.gmane.org>:
> Вторник, 18 февраля 2014, 9:31 +08:00 от Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>:
>> Convert to use default implementation of transfer_one_message() which provides
>> standard handling of delays and chip select management.
>>
>> Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
>> ---
> ...
>> static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
>> {
>> - struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
>> + struct spi_master *master = dev_id;
>> + struct spi_clps711x_data *hw = spi_master_get_devdata(master);
>> u8 data;
>>
>> /* Handle RX */
>> @@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
>> clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
>> SYNCIO);
>> } else
>> - complete(&hw->done);
>> + complete(&master->xfer_completion);
>
> spi_finalize_current_transfer(master);
It's done by spi core. see spi_transfer_one_message() in spi.c
Regards,
Axel
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing
[not found] ` <CAFRkauCQkyDFixt-t1Oe9L8eJBdhCeAFMeEBn7KimfcFRcP_ag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2014-02-18 8:56 ` Alexander Shiyan
[not found] ` <1392713792.597739775-e68EWkKP98BsdVUOrk1QfQ@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Alexander Shiyan @ 2014-02-18 8:56 UTC (permalink / raw)
To: Axel Lin; +Cc: Mark Brown, linux-spi-u79uwXL29TY76Z2rM5mHXA
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 1530 bytes --]
ÐÑоÑник, 18 ÑевÑÐ°Ð»Ñ 2014, 16:52 +08:00 Ð¾Ñ Axel Lin <axel.lin@ingics.com>:
> 2014-02-18 16:27 GMT+08:00 Alexander Shiyan <shc_work@mail.ru>:
> > ÐÑоÑник, 18 ÑевÑÐ°Ð»Ñ 2014, 9:31 +08:00 Ð¾Ñ Axel Lin <axel.lin@ingics.com>:
> >> Convert to use default implementation of transfer_one_message() which provides
> >> standard handling of delays and chip select management.
> >>
> >> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> >> ---
> > ...
> >> static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
> >> {
> >> - struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
> >> + struct spi_master *master = dev_id;
> >> + struct spi_clps711x_data *hw = spi_master_get_devdata(master);
> >> u8 data;
> >>
> >> /* Handle RX */
> >> @@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
> >> clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
> >> SYNCIO);
> >> } else
> >> - complete(&hw->done);
> >> + complete(&master->xfer_completion);
> >
> > spi_finalize_current_transfer(master);
>
> It's done by spi core. see spi_transfer_one_message() in spi.c
spi_finalize_current_transfer() != spi_finalize_current_message()
I just suggest to replace complete(&master->xfer_completion) to
spi_finalize_current_transfer(master).
---
N§²æìr¸yúèØb²X¬¶Ç§vØ^)Þº{.nÇ+·¥{±²¢Ø^nr¡ö¦zË\x1aëh¨èÚ&¢îý»\x05ËÛÔØï¦v¬Îf\x1dp)¹¹br ê+Ê+zf£¢·h§~Ûiÿûàz¹\x1e®w¥¢¸?¨èÚ&¢)ߢ^[f
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing
[not found] ` <1392713792.597739775-e68EWkKP98BsdVUOrk1QfQ@public.gmane.org>
@ 2014-02-18 8:59 ` Axel Lin
0 siblings, 0 replies; 5+ messages in thread
From: Axel Lin @ 2014-02-18 8:59 UTC (permalink / raw)
To: Alexander Shiyan; +Cc: Mark Brown, linux-spi-u79uwXL29TY76Z2rM5mHXA
2014-02-18 16:56 GMT+08:00 Alexander Shiyan <shc_work-JGs/UdohzUI@public.gmane.org>:
> Вторник, 18 февраля 2014, 16:52 +08:00 от Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>:
>> 2014-02-18 16:27 GMT+08:00 Alexander Shiyan <shc_work-JGs/UdohzUI@public.gmane.org>:
>> > Вторник, 18 февраля 2014, 9:31 +08:00 от Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>:
>> >> Convert to use default implementation of transfer_one_message() which provides
>> >> standard handling of delays and chip select management.
>> >>
>> >> Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
>> >> ---
>> > ...
>> >> static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
>> >> {
>> >> - struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
>> >> + struct spi_master *master = dev_id;
>> >> + struct spi_clps711x_data *hw = spi_master_get_devdata(master);
>> >> u8 data;
>> >>
>> >> /* Handle RX */
>> >> @@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
>> >> clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
>> >> SYNCIO);
>> >> } else
>> >> - complete(&hw->done);
>> >> + complete(&master->xfer_completion);
>> >
>> > spi_finalize_current_transfer(master);
>>
>> It's done by spi core. see spi_transfer_one_message() in spi.c
>
> spi_finalize_current_transfer() != spi_finalize_current_message()
>
> I just suggest to replace complete(&master->xfer_completion) to
> spi_finalize_current_transfer(master).
Ok. Got your point now.
Will send v3 soon.
Thanks for the review.
Axel
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-18 8:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-18 1:31 [RFT][PATCH v2] spi: clps711x: refactor to use core message parsing Axel Lin
2014-02-18 8:27 ` Alexander Shiyan
[not found] ` <1392712030.410354049-ah3gxum9muhsdVUOrk1QfQ@public.gmane.org>
2014-02-18 8:52 ` Axel Lin
[not found] ` <CAFRkauCQkyDFixt-t1Oe9L8eJBdhCeAFMeEBn7KimfcFRcP_ag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-02-18 8:56 ` Alexander Shiyan
[not found] ` <1392713792.597739775-e68EWkKP98BsdVUOrk1QfQ@public.gmane.org>
2014-02-18 8:59 ` Axel Lin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.