spi: lpspi: Fix bugs and Add some functions support
Subsystems (3)
v2 cover spi: lpspi: Fix bugs and Add some functions support
Hi Mark,
Sorry for replying so late. This patchset contains changes based on your and other reviewers' comments.
As subject, these fucntions support, including:
- Support i.MX8 series boards;
- Support cs-gpio fucntion;
- Support DMA mode for both master and salve mode.
These are some notes about cs-gpio and DMA:
- cs-gpio:
Because LPSPI driver don't use default implementation of transfer_one_message(), I do the cs-gpio control way as same as the way used in spi core;
- DMA:
Any frame length longer than half txfifosize will be sent by DMA mode. For now, there are some limits:
1. The maximum transfer speed in master mode depends on the slave device, at least 40MHz on i.MX8 series (tested by spi-nor on 8qm-lpddr4-arm2 base board);
2. The maximum transfer speed I test in slave mode is 15MHz(i.MX7ULP), 20MHz(i.MX8 series). In order to reach the maximum speed which is mentioned in datasheet, the load of connect wires between master and slave should be less than 15pF.
Each patch in this patchset should base on the previous one when applied.
Thank you!
Clark Wang (7):
spi: lpspi: Add i.MX8 boards support for lpspi
doc: lpspi: Document DT bindings for LPSPI clocks
spi: lpspi: add the error info of transfer speed setting
spi: lpspi: use the core way to implement cs-gpio function
spi: lpspi: add dma mode support
spi: lpspi: Add the missing NULL check
spi: lpspi: Code cleanup
Han Xu (1):
spi: lpspi: enable runtime pm for lpspi
.../devicetree/bindings/spi/spi-fsl-lpspi.txt | 10 +- drivers/spi/spi-fsl-lpspi.c | 543 ++++++++++++++++-- 2 files changed, 495 insertions(+), 58 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/8 spi: lpspi: Add i.MX8 boards support for lpspi
Add both ipg and per clock for lpspi to support i.MX8QM/QXP boards.
---
V2:
- No change. But add DT-bindings string at the next patch.
--- drivers/spi/spi-fsl-lpspi.c | 52 +++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 11 deletions(-)
drivers/spi/spi-fsl-lpspi.c +41 -11
@@ -84,7 +84,8 @@ struct lpspi_config {struct fsl_lpspi_data {struct device *dev;void __iomem *base; -struct clk *clk; +struct clk *clk_ipg; +struct clk *clk_per;bool is_slave;void *rx_buf;
@@ -151,8 +152,19 @@ static int lpspi_prepare_xfer_hardware(struct spi_controller *controller) {struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (controller); +int ret; + + ret =clk_prepare_enable (fsl_lpspi->clk_ipg); +if (ret) +return ret; + + ret =clk_prepare_enable (fsl_lpspi->clk_per); +if (ret) { +clk_disable_unprepare (fsl_lpspi->clk_ipg); +return ret; + } -return clk_prepare_enable (fsl_lpspi->clk); +return 0 ; }static int lpspi_unprepare_xfer_hardware (struct spi_controller *controller)
@@ -160,7 +172,8 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (controller); -clk_disable_unprepare (fsl_lpspi->clk); +clk_disable_unprepare (fsl_lpspi->clk_ipg); +clk_disable_unprepare (fsl_lpspi->clk_per);return 0 ; }
@@ -241,7 +254,7 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)unsigned int perclk_rate, scldiv;u8 prescale; - perclk_rate =clk_get_rate (fsl_lpspi->clk); + perclk_rate =clk_get_rate (fsl_lpspi->clk_per);for (prescale =0 ; prescale <8 ; prescale++) { scldiv = perclk_rate / (clkdivs[prescale] * config.speed_hz) -2 ;
@@ -526,15 +539,30 @@ static int fsl_lpspi_probe(struct platform_device *pdev) goto out_controller_put; } - fsl_lpspi->clk =devm_clk_get (&pdev->dev,"ipg" ); -if (IS_ERR (fsl_lpspi->clk)) { - ret =PTR_ERR (fsl_lpspi->clk); + fsl_lpspi->clk_per =devm_clk_get (&pdev->dev,"per" ); +if (IS_ERR (fsl_lpspi->clk_per)) { + ret =PTR_ERR (fsl_lpspi->clk_per); + goto out_controller_put; + } + + fsl_lpspi->clk_ipg =devm_clk_get (&pdev->dev,"ipg" ); +if (IS_ERR (fsl_lpspi->clk_ipg)) { + ret =PTR_ERR (fsl_lpspi->clk_ipg); + goto out_controller_put; + } + + ret =clk_prepare_enable (fsl_lpspi->clk_ipg); +if (ret) { +dev_err (&pdev->dev, +"can't enable lpspi ipg clock, ret=%d\n" , ret); goto out_controller_put; } - ret =clk_prepare_enable (fsl_lpspi->clk); + ret =clk_prepare_enable (fsl_lpspi->clk_per);if (ret) { -dev_err (&pdev->dev,"can't enable lpspi clock, ret=%d\n" , ret); +dev_err (&pdev->dev, +"can't enable lpspi per clock, ret=%d\n" , ret); +clk_disable_unprepare (fsl_lpspi->clk_ipg); goto out_controller_put; }
@@ -542,7 +570,8 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->txfifosize =1 << (temp &0x0f ); fsl_lpspi->rxfifosize =1 << ((temp >>8 ) &0x0f ); -clk_disable_unprepare (fsl_lpspi->clk); +clk_disable_unprepare (fsl_lpspi->clk_per); +clk_disable_unprepare (fsl_lpspi->clk_ipg); ret =devm_spi_register_controller (&pdev->dev, controller);if (ret <0 ) {
@@ -564,7 +593,8 @@ static int fsl_lpspi_remove(struct platform_device *pdev)struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (controller); -clk_disable_unprepare (fsl_lpspi->clk); +clk_disable_unprepare (fsl_lpspi->clk_per); +clk_disable_unprepare (fsl_lpspi->clk_ipg);return 0 ; }
Signature · 1 line
2.17.1
PATCH v2 2/8 doc: lpspi: Document DT bindings for LPSPI clocks
In reply to Clark WangAdd introductions of clocks and clock-names strings.
---
V2:
- Add this DT-bindings string in this version.
--- .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt +8 -2
@@ -7,7 +7,11 @@ Required properties: - reg : address and length of the lpspi master registers - interrupt-parent : core interrupt controller - interrupts : lpspi interrupt -- clocks : lpspi clock specifier +- clocks : lpspi clock specifier. Its number and order need to correspond to the + value in clock-names. +- clock-names : Corresponding to per clock and ipg clock in "clocks" + respectively. In i.MX7ULP, it only has per clk, so use CLK_DUMMY + to fill the "ipg" blank. - spi-slave : spi slave mode support. In slave mode, add this attribute without value. In master mode, remove it.
@@ -18,6 +22,8 @@ lpspi2: lpspi@40290000 { reg = <0x40290000 0x10000>; interrupt-parent = <&intc>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks IMX7ULP_CLK_LPSPI2>; + clocks = <&clks IMX7ULP_CLK_LPSPI2>, + <&clks IMX7ULP_CLK_DUMMY>; + clock-names = "per", "ipg"; spi-slave; };
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "doc: lpspi: Document DT bindings for LPSPI clocks" to the spi tree
The patch
doc: lpspi: Document DT bindings for LPSPI clocks
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
addb32866d99068307f8eddb282ebb325d18446fMon Sep 17 00:00:00 2001
From: Clark Wang <[email protected]>
Date: Wed, 6 Mar 2019 06:30:36 +0000
Subject: [PATCH] doc: lpspi: Document DT bindings for LPSPI clocks
Add introductions of clocks and clock-names strings.
--- .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt +8 -2
@@ -7,7 +7,11 @@ Required properties: - reg : address and length of the lpspi master registers - interrupt-parent : core interrupt controller - interrupts : lpspi interrupt -- clocks : lpspi clock specifier +- clocks : lpspi clock specifier. Its number and order need to correspond to the + value in clock-names. +- clock-names : Corresponding to per clock and ipg clock in "clocks" + respectively. In i.MX7ULP, it only has per clk, so use CLK_DUMMY + to fill the "ipg" blank. - spi-slave : spi slave mode support. In slave mode, add this attribute without value. In master mode, remove it.
@@ -18,6 +22,8 @@ lpspi2: lpspi@40290000 { reg = <0x40290000 0x10000>; interrupt-parent = <&intc>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks IMX7ULP_CLK_LPSPI2>; + clocks = <&clks IMX7ULP_CLK_LPSPI2>, + <&clks IMX7ULP_CLK_DUMMY>; + clock-names = "per", "ipg"; spi-slave; };
Signature · 1 line
2.20.1
PATCH v2 3/8 spi: lpspi: enable runtime pm for lpspi
In reply to Clark WangFrom: Han Xu <[email protected]>
Enable the runtime power management for lpspi module.
Do some adaptation work from kernel 4.9 to 4.14.
---
V2:
- Fix the comment format.
--- drivers/spi/spi-fsl-lpspi.c | 117 ++++++++++++++++++++++++++++-------- 1 file changed, 92 insertions(+), 25 deletions(-)
drivers/spi/spi-fsl-lpspi.c +92 -25
@@ -16,7 +16,9 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/spi/spi_bitbang.h>
@@ -24,6 +26,8 @@#define DRIVER_NAME "fsl_lpspi" +#define FSL_LPSPI_RPM_TIMEOUT 50/* 50ms */ +/* i.MX7ULP LPSPI registers */ #define IMX7ULP_VERID 0x0#define IMX7ULP_PARAM 0x4
@@ -154,13 +158,9 @@ static int lpspi_prepare_xfer_hardware(struct spi_controller *controller)spi_controller_get_devdata (controller);int ret; - ret =clk_prepare_enable (fsl_lpspi->clk_ipg); -if (ret) -return ret; - - ret =clk_prepare_enable (fsl_lpspi->clk_per); -if (ret) { -clk_disable_unprepare (fsl_lpspi->clk_ipg); + ret =pm_runtime_get_sync (fsl_lpspi->dev); +if (ret <0 ) { +dev_err (fsl_lpspi->dev,"failed to enable clock\n" );return ret; }
@@ -172,8 +172,8 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (controller); -clk_disable_unprepare (fsl_lpspi->clk_ipg); -clk_disable_unprepare (fsl_lpspi->clk_per); +pm_runtime_mark_last_busy (fsl_lpspi->dev); +pm_runtime_put_autosuspend (fsl_lpspi->dev);return 0 ; }
@@ -480,6 +480,45 @@ static irqreturn_t fsl_lpspi_isr(int irq, void *dev_id)return IRQ_NONE ; } +int fsl_lpspi_runtime_resume (struct device *dev) +{ +struct fsl_lpspi_data *fsl_lpspi =dev_get_drvdata (dev); +int ret; + + ret =clk_prepare_enable (fsl_lpspi->clk_per); +if (ret) +return ret; + + ret =clk_prepare_enable (fsl_lpspi->clk_ipg); +if (ret) { +clk_disable_unprepare (fsl_lpspi->clk_per); +return ret; + } + +return 0 ; +} + +int fsl_lpspi_runtime_suspend (struct device *dev) +{ +struct fsl_lpspi_data *fsl_lpspi =dev_get_drvdata (dev); + +clk_disable_unprepare (fsl_lpspi->clk_per); +clk_disable_unprepare (fsl_lpspi->clk_ipg); + +return 0 ; +} + +static int fsl_lpspi_init_rpm (struct fsl_lpspi_data *fsl_lpspi) +{ +struct device *dev = fsl_lpspi->dev; + +pm_runtime_enable (dev); +pm_runtime_set_autosuspend_delay (dev,FSL_LPSPI_RPM_TIMEOUT ); +pm_runtime_use_autosuspend (dev); + +return 0 ; +} +static int fsl_lpspi_probe (struct platform_device *pdev) {struct fsl_lpspi_data *fsl_lpspi;
@@ -505,6 +544,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi =spi_controller_get_devdata (controller); fsl_lpspi->dev = &pdev->dev; +dev_set_drvdata (&pdev->dev, fsl_lpspi); fsl_lpspi->is_slave =of_property_read_bool ((&pdev->dev)->of_node,"spi-slave" );
@@ -551,28 +591,21 @@ static int fsl_lpspi_probe(struct platform_device *pdev) goto out_controller_put; } - ret =clk_prepare_enable (fsl_lpspi->clk_ipg); -if (ret) { -dev_err (&pdev->dev, -"can't enable lpspi ipg clock, ret=%d\n" , ret); +/* enable the clock */ + ret =fsl_lpspi_init_rpm (fsl_lpspi); +if (ret) goto out_controller_put; - } - ret =clk_prepare_enable (fsl_lpspi->clk_per); -if (ret) { -dev_err (&pdev->dev, -"can't enable lpspi per clock, ret=%d\n" , ret); -clk_disable_unprepare (fsl_lpspi->clk_ipg); - goto out_controller_put; + ret =pm_runtime_get_sync (fsl_lpspi->dev); +if (ret <0 ) { +dev_err (fsl_lpspi->dev,"failed to enable clock\n" ); +return ret; } temp =readl (fsl_lpspi->base +IMX7ULP_PARAM ); fsl_lpspi->txfifosize =1 << (temp &0x0f ); fsl_lpspi->rxfifosize =1 << ((temp >>8 ) &0x0f ); -clk_disable_unprepare (fsl_lpspi->clk_per); -clk_disable_unprepare (fsl_lpspi->clk_ipg); - ret =devm_spi_register_controller (&pdev->dev, controller);if (ret <0 ) {dev_err (&pdev->dev,"spi_register_controller error.\n" );
@@ -593,16 +626,50 @@ static int fsl_lpspi_remove(struct platform_device *pdev)struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (controller); -clk_disable_unprepare (fsl_lpspi->clk_per); -clk_disable_unprepare (fsl_lpspi->clk_ipg); +pm_runtime_disable (fsl_lpspi->dev); + +spi_master_put (controller); + +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int fsl_lpspi_suspend (struct device *dev) +{ +int ret; + +pinctrl_pm_select_sleep_state (dev); + ret =pm_runtime_force_suspend (dev); +return ret; +} + +static int fsl_lpspi_resume (struct device *dev) +{ +int ret; + + ret =pm_runtime_force_resume (dev); +if (ret) { +dev_err (dev,"Error in resume: %d\n" , ret); +return ret; + } + +pinctrl_pm_select_default_state (dev);return 0 ; } +#endif /* CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops fsl_lpspi_pm_ops = { + SET_RUNTIME_PM_OPS(fsl_lpspi_runtime_suspend, + fsl_lpspi_runtime_resume, NULL) +SET_SYSTEM_SLEEP_PM_OPS (fsl_lpspi_suspend, fsl_lpspi_resume) +};static struct platform_driver fsl_lpspi_driver = { .driver = { .name =DRIVER_NAME , .of_match_table = fsl_lpspi_dt_ids, + .pm = &fsl_lpspi_pm_ops, }, .probe = fsl_lpspi_probe, .remove = fsl_lpspi_remove,
Signature · 1 line
2.17.1
PATCH v2 4/8 spi: lpspi: add the error info of transfer speed setting
In reply to Clark WangAdd a error info when set a speed which greater than half of per-clk of spi module.
The minimum SCK period is 2 cycles(CCR[SCKDIV]). So the maximum transfer speed is half of spi per-clk.
---
V2:
- No change. Resend for applying.
--- drivers/spi/spi-fsl-lpspi.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/spi/spi-fsl-lpspi.c +13 -3
@@ -255,6 +255,13 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)u8 prescale; perclk_rate =clk_get_rate (fsl_lpspi->clk_per); + +if (config.speed_hz > perclk_rate /2 ) { +dev_err (fsl_lpspi->dev, +"per-clk should be at least two times of transfer speed" ); +return -EINVAL ; + } +for (prescale =0 ; prescale <8 ; prescale++) { scldiv = perclk_rate / (clkdivs[prescale] * config.speed_hz) -2 ;
@@ -304,7 +311,7 @@ static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } -static void fsl_lpspi_setup_transfer (struct spi_device *spi, +static int fsl_lpspi_setup_transfer (struct spi_device *spi,struct spi_transfer *t) { struct fsl_lpspi_data *fsl_lpspi =
@@ -337,7 +344,7 @@ static void fsl_lpspi_setup_transfer(struct spi_device *spi,else fsl_lpspi->watermark = fsl_lpspi->txfifosize; -fsl_lpspi_config (fsl_lpspi); +return fsl_lpspi_config (fsl_lpspi); }static int fsl_lpspi_slave_abort (struct spi_controller *controller)
@@ -429,7 +436,10 @@ static int fsl_lpspi_transfer_one_msg(struct spi_controller *controller, msg->actual_length =0 ;list_for_each_entry (xfer, &msg->transfers, transfer_list) { -fsl_lpspi_setup_transfer (spi, xfer); + ret =fsl_lpspi_setup_transfer (spi, xfer); +if (ret <0 ) + goto complete; +fsl_lpspi_set_cmd (fsl_lpspi, is_first_xfer); is_first_xfer = false;
Signature · 1 line
2.17.1
PATCH v2 5/8 spi: lpspi: use the core way to implement cs-gpio function
In reply to Clark WangUse the default implementation of transfer_one_msg/chipselect/setup functions in spi core to implement cs-gpio control.
Use fsl_lpspi_prepare_message to init the cs_gpio pin.
---
V2:
- use core way to implement cs-gpio control. Removed the redundant code in the driver.
--- drivers/spi/spi-fsl-lpspi.c | 101 +++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 35 deletions(-)
drivers/spi/spi-fsl-lpspi.c +66 -35
@@ -9,6 +9,7 @@#include <linux/completion.h> #include <linux/delay.h> #include <linux/err.h> +#include <linux/gpio.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/irq.h>
@@ -16,8 +17,10 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_gpio.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/platform_data/spi-imx.h> #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/spi/spi.h>
@@ -91,6 +94,7 @@ struct fsl_lpspi_data {struct clk *clk_ipg;struct clk *clk_per;bool is_slave; +bool is_first_byte;void *rx_buf;const void *tx_buf;
@@ -106,6 +110,8 @@ struct fsl_lpspi_data {struct completion xfer_done;bool slave_aborted; + +int chipselect[0 ]; };static const struct of_device_id fsl_lpspi_dt_ids[] = {
@@ -178,6 +184,20 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)return 0 ; } +static int fsl_lpspi_prepare_message (struct spi_controller *controller, +struct spi_message *msg) +{ +struct fsl_lpspi_data *fsl_lpspi = +spi_controller_get_devdata (controller); +struct spi_device *spi = msg->spi; +int gpio = fsl_lpspi->chipselect[spi->chip_select]; + +if (gpio_is_valid (gpio)) +gpio_direction_output (gpio, spi->mode &SPI_CS_HIGH ?0 :1 ); + +return 0 ; +} +static void fsl_lpspi_write_tx_fifo (struct fsl_lpspi_data *fsl_lpspi) {u8 txfifo_cnt;
@@ -210,8 +230,7 @@ static void fsl_lpspi_read_rx_fifo(struct fsl_lpspi_data *fsl_lpspi) fsl_lpspi->rx (fsl_lpspi); } -static void fsl_lpspi_set_cmd (struct fsl_lpspi_data *fsl_lpspi, -bool is_first_xfer) +static void fsl_lpspi_set_cmd (struct fsl_lpspi_data *fsl_lpspi) {u32 temp =0 ;
@@ -227,7 +246,7 @@ static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi,* For subsequent transfer, set TCR_CONTC to keep SS asserted. */ temp |=TCR_CONT ; -if (is_first_xfer) +if (fsl_lpspi->is_first_byte) temp &= ~TCR_CONTC ;else temp |=TCR_CONTC ;
@@ -396,8 +415,7 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } -static int fsl_lpspi_transfer_one (struct spi_controller *controller, -struct spi_device *spi, +static int fsl_lpspi_pio_transfer (struct spi_controller *controller,struct spi_transfer *t) { struct fsl_lpspi_data *fsl_lpspi =
@@ -422,40 +440,27 @@ static int fsl_lpspi_transfer_one(struct spi_controller *controller,return 0 ; } -static int fsl_lpspi_transfer_one_msg (struct spi_controller *controller, -struct spi_message *msg) +static int fsl_lpspi_transfer_one (struct spi_controller *controller, +struct spi_device *spi, +struct spi_transfer *t) {struct fsl_lpspi_data *fsl_lpspi = -spi_controller_get_devdata (controller); -struct spi_device *spi = msg->spi; -struct spi_transfer *xfer; -bool is_first_xfer = true; -int ret =0 ; - - msg->status =0 ; - msg->actual_length =0 ; - -list_for_each_entry (xfer, &msg->transfers, transfer_list) { - ret =fsl_lpspi_setup_transfer (spi, xfer); -if (ret <0 ) - goto complete; - -fsl_lpspi_set_cmd (fsl_lpspi, is_first_xfer); - - is_first_xfer = false; +spi_controller_get_devdata (controller); +int ret; - ret =fsl_lpspi_transfer_one (controller, spi, xfer); -if (ret <0 ) - goto complete; + fsl_lpspi->is_first_byte = true; + ret =fsl_lpspi_setup_transfer (spi, t); +if (ret <0 ) +return ret; - msg->actual_length += xfer->len; - } +fsl_lpspi_set_cmd (fsl_lpspi); + fsl_lpspi->is_first_byte = false; -complete: - msg->status = ret; -spi_finalize_current_message (controller); + ret =fsl_lpspi_pio_transfer (controller, t); +if (ret <0 ) +return ret; -return ret; +return 0 ; }static irqreturn_t fsl_lpspi_isr (int irq,void *dev_id)
@@ -531,10 +536,13 @@ static int fsl_lpspi_init_rpm(struct fsl_lpspi_data *fsl_lpspi)static int fsl_lpspi_probe (struct platform_device *pdev) { +struct device_node *np = pdev->dev.of_node;struct fsl_lpspi_data *fsl_lpspi;struct spi_controller *controller; +struct spi_imx_master *lpspi_platform_info = +dev_get_platdata (&pdev->dev);struct resource *res; -int ret, irq; +int i, ret, irq;u32 temp;if (of_property_read_bool ((&pdev->dev)->of_node,"spi-slave" ))
@@ -558,7 +566,30 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->is_slave =of_property_read_bool ((&pdev->dev)->of_node,"spi-slave" ); - controller->transfer_one_message = fsl_lpspi_transfer_one_msg; +if (!fsl_lpspi->is_slave) { +for (i =0 ; i < controller->num_chipselect; i++) { +int cs_gpio =of_get_named_gpio (np,"cs-gpios" , i); + +if (!gpio_is_valid (cs_gpio) && lpspi_platform_info) + cs_gpio = lpspi_platform_info->chipselect[i]; + + fsl_lpspi->chipselect[i] = cs_gpio; +if (!gpio_is_valid (cs_gpio)) +continue ; + + ret =devm_gpio_request (&pdev->dev, + fsl_lpspi->chipselect[i], +DRIVER_NAME ); +if (ret) { +dev_err (&pdev->dev,"can't get cs gpios\n" ); + goto out_controller_put; + } + } + controller->cs_gpios = fsl_lpspi->chipselect; + controller->prepare_message = fsl_lpspi_prepare_message; + } + + controller->transfer_one = fsl_lpspi_transfer_one; controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware; controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware; controller->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ;
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "spi: lpspi: use the core way to implement cs-gpio function" to the spi tree
The patch
spi: lpspi: use the core way to implement cs-gpio function
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c7a402599504384efe0e5232a4c78cb8eb7cb3d0Mon Sep 17 00:00:00 2001
From: Clark Wang <[email protected]>
Date: Wed, 6 Mar 2019 06:30:43 +0000
Subject: [PATCH] spi: lpspi: use the core way to implement cs-gpio function
Use the default implementation of transfer_one_msg/chipselect/setup functions in spi core to implement cs-gpio control.
Use fsl_lpspi_prepare_message to init the cs_gpio pin.
--- drivers/spi/spi-fsl-lpspi.c | 101 +++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 35 deletions(-)
drivers/spi/spi-fsl-lpspi.c +66 -35
@@ -9,6 +9,7 @@#include <linux/completion.h> #include <linux/delay.h> #include <linux/err.h> +#include <linux/gpio.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/irq.h>
@@ -16,8 +17,10 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_gpio.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/platform_data/spi-imx.h> #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/spi/spi.h>
@@ -91,6 +94,7 @@ struct fsl_lpspi_data {struct clk *clk_ipg;struct clk *clk_per;bool is_slave; +bool is_first_byte;void *rx_buf;const void *tx_buf;
@@ -106,6 +110,8 @@ struct fsl_lpspi_data {struct completion xfer_done;bool slave_aborted; + +int chipselect[0 ]; };static const struct of_device_id fsl_lpspi_dt_ids[] = {
@@ -178,6 +184,20 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)return 0 ; } +static int fsl_lpspi_prepare_message (struct spi_controller *controller, +struct spi_message *msg) +{ +struct fsl_lpspi_data *fsl_lpspi = +spi_controller_get_devdata (controller); +struct spi_device *spi = msg->spi; +int gpio = fsl_lpspi->chipselect[spi->chip_select]; + +if (gpio_is_valid (gpio)) +gpio_direction_output (gpio, spi->mode &SPI_CS_HIGH ?0 :1 ); + +return 0 ; +} +static void fsl_lpspi_write_tx_fifo (struct fsl_lpspi_data *fsl_lpspi) {u8 txfifo_cnt;
@@ -210,8 +230,7 @@ static void fsl_lpspi_read_rx_fifo(struct fsl_lpspi_data *fsl_lpspi) fsl_lpspi->rx (fsl_lpspi); } -static void fsl_lpspi_set_cmd (struct fsl_lpspi_data *fsl_lpspi, -bool is_first_xfer) +static void fsl_lpspi_set_cmd (struct fsl_lpspi_data *fsl_lpspi) {u32 temp =0 ;
@@ -227,7 +246,7 @@ static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi,* For subsequent transfer, set TCR_CONTC to keep SS asserted. */ temp |=TCR_CONT ; -if (is_first_xfer) +if (fsl_lpspi->is_first_byte) temp &= ~TCR_CONTC ;else temp |=TCR_CONTC ;
@@ -396,8 +415,7 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } -static int fsl_lpspi_transfer_one (struct spi_controller *controller, -struct spi_device *spi, +static int fsl_lpspi_pio_transfer (struct spi_controller *controller,struct spi_transfer *t) { struct fsl_lpspi_data *fsl_lpspi =
@@ -422,40 +440,27 @@ static int fsl_lpspi_transfer_one(struct spi_controller *controller,return 0 ; } -static int fsl_lpspi_transfer_one_msg (struct spi_controller *controller, -struct spi_message *msg) +static int fsl_lpspi_transfer_one (struct spi_controller *controller, +struct spi_device *spi, +struct spi_transfer *t) {struct fsl_lpspi_data *fsl_lpspi = -spi_controller_get_devdata (controller); -struct spi_device *spi = msg->spi; -struct spi_transfer *xfer; -bool is_first_xfer = true; -int ret =0 ; - - msg->status =0 ; - msg->actual_length =0 ; - -list_for_each_entry (xfer, &msg->transfers, transfer_list) { - ret =fsl_lpspi_setup_transfer (spi, xfer); -if (ret <0 ) - goto complete; - -fsl_lpspi_set_cmd (fsl_lpspi, is_first_xfer); - - is_first_xfer = false; +spi_controller_get_devdata (controller); +int ret; - ret =fsl_lpspi_transfer_one (controller, spi, xfer); -if (ret <0 ) - goto complete; + fsl_lpspi->is_first_byte = true; + ret =fsl_lpspi_setup_transfer (spi, t); +if (ret <0 ) +return ret; - msg->actual_length += xfer->len; - } +fsl_lpspi_set_cmd (fsl_lpspi); + fsl_lpspi->is_first_byte = false; -complete: - msg->status = ret; -spi_finalize_current_message (controller); + ret =fsl_lpspi_pio_transfer (controller, t); +if (ret <0 ) +return ret; -return ret; +return 0 ; }static irqreturn_t fsl_lpspi_isr (int irq,void *dev_id)
@@ -531,10 +536,13 @@ static int fsl_lpspi_init_rpm(struct fsl_lpspi_data *fsl_lpspi)static int fsl_lpspi_probe (struct platform_device *pdev) { +struct device_node *np = pdev->dev.of_node;struct fsl_lpspi_data *fsl_lpspi;struct spi_controller *controller; +struct spi_imx_master *lpspi_platform_info = +dev_get_platdata (&pdev->dev);struct resource *res; -int ret, irq; +int i, ret, irq;u32 temp;if (of_property_read_bool ((&pdev->dev)->of_node,"spi-slave" ))
@@ -558,7 +566,30 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->is_slave =of_property_read_bool ((&pdev->dev)->of_node,"spi-slave" ); - controller->transfer_one_message = fsl_lpspi_transfer_one_msg; +if (!fsl_lpspi->is_slave) { +for (i =0 ; i < controller->num_chipselect; i++) { +int cs_gpio =of_get_named_gpio (np,"cs-gpios" , i); + +if (!gpio_is_valid (cs_gpio) && lpspi_platform_info) + cs_gpio = lpspi_platform_info->chipselect[i]; + + fsl_lpspi->chipselect[i] = cs_gpio; +if (!gpio_is_valid (cs_gpio)) +continue ; + + ret =devm_gpio_request (&pdev->dev, + fsl_lpspi->chipselect[i], +DRIVER_NAME ); +if (ret) { +dev_err (&pdev->dev,"can't get cs gpios\n" ); + goto out_controller_put; + } + } + controller->cs_gpios = fsl_lpspi->chipselect; + controller->prepare_message = fsl_lpspi_prepare_message; + } + + controller->transfer_one = fsl_lpspi_transfer_one; controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware; controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware; controller->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ;
Signature · 1 line
2.20.1
PATCH v2 6/8 spi: lpspi: add dma mode support
In reply to Clark WangAdd dma mode support for LPSPI. Any frame longer than half txfifosize will be sent by dma mode.
For now, there are some limits:
1. The maximum transfer speed in master mode depends on the slave device, at least 40MHz(tested by spi-nor on 8qm-lpddr4-arm2 base board);
2. The maximum transfer speed in slave mode is 15MHz(imx7ulp), 22MHz(8qm/qxp). In order to reach the maximum speed which is mentioned in datasheet, the load of connect wires between master and slave should be less than 15pF.
---
V2:
- replace a if judgement by switch statement
- seperate a Debug print fix into next patch
--- drivers/spi/spi-fsl-lpspi.c | 312 ++++++++++++++++++++++++++++++++++-- 1 file changed, 301 insertions(+), 11 deletions(-)
drivers/spi/spi-fsl-lpspi.c +301 -11
@@ -8,6 +8,8 @@#include <linux/clk.h> #include <linux/completion.h> #include <linux/delay.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/gpio.h> #include <linux/interrupt.h>
@@ -20,6 +22,7 @@#include <linux/of_gpio.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/platform_data/dma-imx.h> #include <linux/platform_data/spi-imx.h> #include <linux/pm_runtime.h> #include <linux/slab.h>
@@ -31,6 +34,9 @@#define FSL_LPSPI_RPM_TIMEOUT 50/* 50ms */ +/* The maximum bytes that edma can transfer once.*/ +#define FSL_LPSPI_MAX_EDMA_BYTES ((1 << 15) - 1) +/* i.MX7ULP LPSPI registers */ #define IMX7ULP_VERID 0x0#define IMX7ULP_PARAM 0x4
@@ -64,6 +70,8 @@#define IER_FCIE BIT(9)#define IER_RDIE BIT(1)#define IER_TDIE BIT(0) +#define DER_RDDE BIT(1) +#define DER_TDDE BIT(0)#define CFGR1_PCSCFG BIT(27)#define CFGR1_PINCFG (BIT(24)|BIT(25))#define CFGR1_PCSPOL BIT(8)
@@ -91,6 +99,7 @@ struct lpspi_config {struct fsl_lpspi_data {struct device *dev;void __iomem *base; +unsigned long base_phys;struct clk *clk_ipg;struct clk *clk_per;bool is_slave;
@@ -111,6 +120,11 @@ struct fsl_lpspi_data {bool slave_aborted; +/* DMA */ +bool usedma; +struct completion dma_rx_completion; +struct completion dma_tx_completion; +int chipselect[0 ]; };
@@ -158,6 +172,35 @@ static void fsl_lpspi_intctrl(struct fsl_lpspi_data *fsl_lpspi,writel (enable, fsl_lpspi->base +IMX7ULP_IER ); } +static int fsl_lpspi_bytes_per_word (const int bpw) +{ +return DIV_ROUND_UP (bpw,BITS_PER_BYTE ); +} + +static bool fsl_lpspi_can_dma (struct spi_controller *controller, +struct spi_device *spi, +struct spi_transfer *transfer) +{ +unsigned int bytes_per_word; + +if (!controller->dma_rx) +return false; + + bytes_per_word =fsl_lpspi_bytes_per_word (transfer->bits_per_word); + +switch (bytes_per_word) + { +case 1 : +case 2 : +case 4 : +break ; +default : +return false; + } + +return true; +} +static int lpspi_prepare_xfer_hardware (struct spi_controller *controller) { struct fsl_lpspi_data *fsl_lpspi =
@@ -245,11 +288,13 @@ static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi)* For the first transfer, clear TCR_CONTC to assert SS. * For subsequent transfer, set TCR_CONTC to keep SS asserted. */ - temp |=TCR_CONT ; -if (fsl_lpspi->is_first_byte) - temp &= ~TCR_CONTC ; -else - temp |=TCR_CONTC ; +if (!fsl_lpspi->usedma) { + temp |=TCR_CONT ; +if (fsl_lpspi->is_first_byte) + temp &= ~TCR_CONTC ; +else + temp |=TCR_CONTC ; + } }writel (temp, fsl_lpspi->base +IMX7ULP_TCR );
@@ -260,7 +305,11 @@ static void fsl_lpspi_set_watermark(struct fsl_lpspi_data *fsl_lpspi) {u32 temp; - temp = fsl_lpspi->watermark >>1 | (fsl_lpspi->watermark >>1 ) <<16 ; +if (!fsl_lpspi->usedma) + temp = fsl_lpspi->watermark >>1 | + (fsl_lpspi->watermark >>1 ) <<16 ; +else + temp = fsl_lpspi->watermark >>1 ;writel (temp, fsl_lpspi->base +IMX7ULP_FCR );
@@ -302,6 +351,53 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } +static int fsl_lpspi_dma_configure (struct spi_controller *controller) +{ +int ret; +enum dma_slave_buswidth buswidth; +struct dma_slave_config rx = {}, tx = {}; +struct fsl_lpspi_data *fsl_lpspi = +spi_controller_get_devdata (controller); + +switch (fsl_lpspi_bytes_per_word (fsl_lpspi->config.bpw)) { +case 4 : + buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES ; +break ; +case 2 : + buswidth =DMA_SLAVE_BUSWIDTH_2_BYTES ; +break ; +case 1 : + buswidth =DMA_SLAVE_BUSWIDTH_1_BYTE ; +break ; +default : +return -EINVAL ; + } + + tx.direction =DMA_MEM_TO_DEV ; + tx.dst_addr = fsl_lpspi->base_phys +IMX7ULP_TDR ; + tx.dst_addr_width = buswidth; + tx.dst_maxburst =1 ; + ret =dmaengine_slave_config (controller->dma_tx, &tx); +if (ret) { +dev_err (fsl_lpspi->dev,"TX dma configuration failed with %d\n" , + ret); +return ret; + } + + rx.direction =DMA_DEV_TO_MEM ; + rx.src_addr = fsl_lpspi->base_phys +IMX7ULP_RDR ; + rx.src_addr_width = buswidth; + rx.src_maxburst =1 ; + ret =dmaengine_slave_config (controller->dma_rx, &rx); +if (ret) { +dev_err (fsl_lpspi->dev,"RX dma configuration failed with %d\n" , + ret); +return ret; + } + +return 0 ; +} +static int fsl_lpspi_config (struct fsl_lpspi_data *fsl_lpspi) {u32 temp;
@@ -327,10 +423,16 @@ static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi) temp |=CR_RRF |CR_RTF |CR_MEN ;writel (temp, fsl_lpspi->base +IMX7ULP_CR ); + temp =0 ; +if (fsl_lpspi->usedma) + temp =DER_TDDE |DER_RDDE ; +writel (temp, fsl_lpspi->base +IMX7ULP_DER ); +return 0 ; } -static int fsl_lpspi_setup_transfer (struct spi_device *spi, +static int fsl_lpspi_setup_transfer (struct spi_controller *controller, +struct spi_device *spi,struct spi_transfer *t) { struct fsl_lpspi_data *fsl_lpspi =
@@ -363,6 +465,11 @@ static int fsl_lpspi_setup_transfer(struct spi_device *spi,else fsl_lpspi->watermark = fsl_lpspi->txfifosize; +if (fsl_lpspi_can_dma (controller, spi, t)) + fsl_lpspi->usedma =1 ; +else + fsl_lpspi->usedma =0 ; +return fsl_lpspi_config (fsl_lpspi); }
@@ -401,8 +508,10 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi) {u32 temp; -/* Disable all interrupt */ -fsl_lpspi_intctrl (fsl_lpspi,0 ); +if (!fsl_lpspi->usedma) { +/* Disable all interrupt */ +fsl_lpspi_intctrl (fsl_lpspi,0 ); + }/* W1C for all flags in SR */ temp =0x3F <<8 ;
@@ -415,6 +524,176 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } +static void fsl_lpspi_dma_rx_callback (void *cookie) +{ +struct fsl_lpspi_data *fsl_lpspi = (struct fsl_lpspi_data *)cookie; + +complete (&fsl_lpspi->dma_rx_completion); +} + +static void fsl_lpspi_dma_tx_callback (void *cookie) +{ +struct fsl_lpspi_data *fsl_lpspi = (struct fsl_lpspi_data *)cookie; + +complete (&fsl_lpspi->dma_tx_completion); +} + +static int fsl_lpspi_calculate_timeout (struct fsl_lpspi_data *fsl_lpspi, +int size) +{ +unsigned long timeout =0 ; + +/* Time with actual data transfer and CS change delay related to HW */ + timeout = (8 +4 ) * size / fsl_lpspi->config.speed_hz; + +/* Add extra second for scheduler related activities */ + timeout +=1 ; + +/* Double calculated timeout */ +return msecs_to_jiffies (2 * timeout *MSEC_PER_SEC ); +} + +static int fsl_lpspi_dma_transfer (struct spi_controller *controller, +struct fsl_lpspi_data *fsl_lpspi, +struct spi_transfer *transfer) +{ +struct dma_async_tx_descriptor *desc_tx, *desc_rx; +unsigned long transfer_timeout; +unsigned long timeout; +struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg; +int ret; + + ret =fsl_lpspi_dma_configure (controller); +if (ret) +return ret; + + desc_rx =dmaengine_prep_slave_sg (controller->dma_rx, + rx->sgl, rx->nents,DMA_DEV_TO_MEM , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!desc_rx) +return -EINVAL ; + + desc_rx->callback = fsl_lpspi_dma_rx_callback; + desc_rx->callback_param = (void *)fsl_lpspi; +dmaengine_submit (desc_rx); +reinit_completion (&fsl_lpspi->dma_rx_completion); +dma_async_issue_pending (controller->dma_rx); + + desc_tx =dmaengine_prep_slave_sg (controller->dma_tx, + tx->sgl, tx->nents,DMA_MEM_TO_DEV , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!desc_tx) { +dmaengine_terminate_all (controller->dma_tx); +return -EINVAL ; + } + + desc_tx->callback = fsl_lpspi_dma_tx_callback; + desc_tx->callback_param = (void *)fsl_lpspi; +dmaengine_submit (desc_tx); +reinit_completion (&fsl_lpspi->dma_tx_completion); +dma_async_issue_pending (controller->dma_tx); + + fsl_lpspi->slave_aborted = false; + +if (!fsl_lpspi->is_slave) { + transfer_timeout =fsl_lpspi_calculate_timeout (fsl_lpspi, + transfer->len); + +/* Wait eDMA to finish the data transfer.*/ + timeout =wait_for_completion_timeout (&fsl_lpspi->dma_tx_completion, + transfer_timeout); +if (!timeout) { +dev_err (fsl_lpspi->dev,"I/O Error in DMA TX\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -ETIMEDOUT ; + } + + timeout =wait_for_completion_timeout (&fsl_lpspi->dma_rx_completion, + transfer_timeout); +if (!timeout) { +dev_err (fsl_lpspi->dev,"I/O Error in DMA RX\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -ETIMEDOUT ; + } + }else { +if (wait_for_completion_interruptible (&fsl_lpspi->dma_tx_completion) || + fsl_lpspi->slave_aborted) { +dev_dbg (fsl_lpspi->dev, +"I/O Error in DMA TX interrupted\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -EINTR ; + } + +if (wait_for_completion_interruptible (&fsl_lpspi->dma_rx_completion) || + fsl_lpspi->slave_aborted) { +dev_dbg (fsl_lpspi->dev, +"I/O Error in DMA RX interrupted\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -EINTR ; + } + } + +fsl_lpspi_reset (fsl_lpspi); + +return 0 ; +} + +static void fsl_lpspi_dma_exit (struct spi_controller *controller) +{ +if (controller->dma_rx) { +dma_release_channel (controller->dma_rx); + controller->dma_rx =NULL ; + } + +if (controller->dma_tx) { +dma_release_channel (controller->dma_tx); + controller->dma_tx =NULL ; + } +} + +static int fsl_lpspi_dma_init (struct device *dev, +struct fsl_lpspi_data *fsl_lpspi, +struct spi_controller *controller) +{ +int ret; + +/* Prepare for TX DMA: */ + controller->dma_tx =dma_request_slave_channel_reason (dev,"tx" ); +if (IS_ERR (controller->dma_tx)) { + ret =PTR_ERR (controller->dma_tx); +dev_dbg (dev,"can't get the TX DMA channel, error %d!\n" , ret); + controller->dma_tx =NULL ; + goto err; + } + +/* Prepare for RX DMA: */ + controller->dma_rx =dma_request_slave_channel_reason (dev,"rx" ); +if (IS_ERR (controller->dma_rx)) { + ret =PTR_ERR (controller->dma_rx); +dev_dbg (dev,"can't get the RX DMA channel, error %d\n" , ret); + controller->dma_rx =NULL ; + goto err; + } + +init_completion (&fsl_lpspi->dma_rx_completion); +init_completion (&fsl_lpspi->dma_tx_completion); + controller->can_dma = fsl_lpspi_can_dma; + controller->max_dma_len =FSL_LPSPI_MAX_EDMA_BYTES ; + +return 0 ; +err: +fsl_lpspi_dma_exit (controller); +return ret; +} +static int fsl_lpspi_pio_transfer (struct spi_controller *controller,struct spi_transfer *t) {
@@ -449,14 +728,17 @@ static int fsl_lpspi_transfer_one(struct spi_controller *controller,int ret; fsl_lpspi->is_first_byte = true; - ret =fsl_lpspi_setup_transfer (spi, t); + ret =fsl_lpspi_setup_transfer (controller, spi, t);if (ret <0 )return ret;fsl_lpspi_set_cmd (fsl_lpspi); fsl_lpspi->is_first_byte = false; - ret =fsl_lpspi_pio_transfer (controller, t); +if (fsl_lpspi->usedma) + ret =fsl_lpspi_dma_transfer (controller, fsl_lpspi, t); +else + ret =fsl_lpspi_pio_transfer (controller, t);if (ret <0 )return ret;
@@ -606,6 +888,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ret =PTR_ERR (fsl_lpspi->base); goto out_controller_put; } + fsl_lpspi->base_phys = res->start; irq =platform_get_irq (pdev,0 );if (irq <0 ) {
@@ -647,6 +930,13 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->txfifosize =1 << (temp &0x0f ); fsl_lpspi->rxfifosize =1 << ((temp >>8 ) &0x0f ); + ret =fsl_lpspi_dma_init (&pdev->dev, fsl_lpspi, controller); +if (ret == -EPROBE_DEFER ) + goto out_controller_put; + +if (ret <0 ) +dev_err (&pdev->dev,"dma setup error %d, use pio\n" , ret); + ret =devm_spi_register_controller (&pdev->dev, controller);if (ret <0 ) {dev_err (&pdev->dev,"spi_register_controller error.\n" );
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "spi: lpspi: add dma mode support" to the spi tree
The patch
spi: lpspi: add dma mode support
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
09c04466ce7ea494993c0635ba5edb6d2222a806Mon Sep 17 00:00:00 2001
From: Clark Wang <[email protected]>
Date: Wed, 6 Mar 2019 06:30:45 +0000
Subject: [PATCH] spi: lpspi: add dma mode support
Add dma mode support for LPSPI. Any frame longer than half txfifosize will be sent by dma mode.
For now, there are some limits:
1. The maximum transfer speed in master mode depends on the slave device, at least 40MHz(tested by spi-nor on 8qm-lpddr4-arm2 base board);
2. The maximum transfer speed in slave mode is 15MHz(imx7ulp), 22MHz(8qm/qxp). In order to reach the maximum speed which is mentioned in datasheet, the load of connect wires between master and slave should be less than 15pF.
--- drivers/spi/spi-fsl-lpspi.c | 312 ++++++++++++++++++++++++++++++++++-- 1 file changed, 301 insertions(+), 11 deletions(-)
drivers/spi/spi-fsl-lpspi.c +301 -11
@@ -8,6 +8,8 @@#include <linux/clk.h> #include <linux/completion.h> #include <linux/delay.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/gpio.h> #include <linux/interrupt.h>
@@ -20,6 +22,7 @@#include <linux/of_gpio.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/platform_data/dma-imx.h> #include <linux/platform_data/spi-imx.h> #include <linux/pm_runtime.h> #include <linux/slab.h>
@@ -31,6 +34,9 @@#define FSL_LPSPI_RPM_TIMEOUT 50/* 50ms */ +/* The maximum bytes that edma can transfer once.*/ +#define FSL_LPSPI_MAX_EDMA_BYTES ((1 << 15) - 1) +/* i.MX7ULP LPSPI registers */ #define IMX7ULP_VERID 0x0#define IMX7ULP_PARAM 0x4
@@ -64,6 +70,8 @@#define IER_FCIE BIT(9)#define IER_RDIE BIT(1)#define IER_TDIE BIT(0) +#define DER_RDDE BIT(1) +#define DER_TDDE BIT(0)#define CFGR1_PCSCFG BIT(27)#define CFGR1_PINCFG (BIT(24)|BIT(25))#define CFGR1_PCSPOL BIT(8)
@@ -91,6 +99,7 @@ struct lpspi_config {struct fsl_lpspi_data {struct device *dev;void __iomem *base; +unsigned long base_phys;struct clk *clk_ipg;struct clk *clk_per;bool is_slave;
@@ -111,6 +120,11 @@ struct fsl_lpspi_data {bool slave_aborted; +/* DMA */ +bool usedma; +struct completion dma_rx_completion; +struct completion dma_tx_completion; +int chipselect[0 ]; };
@@ -158,6 +172,35 @@ static void fsl_lpspi_intctrl(struct fsl_lpspi_data *fsl_lpspi,writel (enable, fsl_lpspi->base +IMX7ULP_IER ); } +static int fsl_lpspi_bytes_per_word (const int bpw) +{ +return DIV_ROUND_UP (bpw,BITS_PER_BYTE ); +} + +static bool fsl_lpspi_can_dma (struct spi_controller *controller, +struct spi_device *spi, +struct spi_transfer *transfer) +{ +unsigned int bytes_per_word; + +if (!controller->dma_rx) +return false; + + bytes_per_word =fsl_lpspi_bytes_per_word (transfer->bits_per_word); + +switch (bytes_per_word) + { +case 1 : +case 2 : +case 4 : +break ; +default : +return false; + } + +return true; +} +static int lpspi_prepare_xfer_hardware (struct spi_controller *controller) { struct fsl_lpspi_data *fsl_lpspi =
@@ -245,11 +288,13 @@ static void fsl_lpspi_set_cmd(struct fsl_lpspi_data *fsl_lpspi)* For the first transfer, clear TCR_CONTC to assert SS. * For subsequent transfer, set TCR_CONTC to keep SS asserted. */ - temp |=TCR_CONT ; -if (fsl_lpspi->is_first_byte) - temp &= ~TCR_CONTC ; -else - temp |=TCR_CONTC ; +if (!fsl_lpspi->usedma) { + temp |=TCR_CONT ; +if (fsl_lpspi->is_first_byte) + temp &= ~TCR_CONTC ; +else + temp |=TCR_CONTC ; + } }writel (temp, fsl_lpspi->base +IMX7ULP_TCR );
@@ -260,7 +305,11 @@ static void fsl_lpspi_set_watermark(struct fsl_lpspi_data *fsl_lpspi) {u32 temp; - temp = fsl_lpspi->watermark >>1 | (fsl_lpspi->watermark >>1 ) <<16 ; +if (!fsl_lpspi->usedma) + temp = fsl_lpspi->watermark >>1 | + (fsl_lpspi->watermark >>1 ) <<16 ; +else + temp = fsl_lpspi->watermark >>1 ;writel (temp, fsl_lpspi->base +IMX7ULP_FCR );
@@ -302,6 +351,53 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } +static int fsl_lpspi_dma_configure (struct spi_controller *controller) +{ +int ret; +enum dma_slave_buswidth buswidth; +struct dma_slave_config rx = {}, tx = {}; +struct fsl_lpspi_data *fsl_lpspi = +spi_controller_get_devdata (controller); + +switch (fsl_lpspi_bytes_per_word (fsl_lpspi->config.bpw)) { +case 4 : + buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES ; +break ; +case 2 : + buswidth =DMA_SLAVE_BUSWIDTH_2_BYTES ; +break ; +case 1 : + buswidth =DMA_SLAVE_BUSWIDTH_1_BYTE ; +break ; +default : +return -EINVAL ; + } + + tx.direction =DMA_MEM_TO_DEV ; + tx.dst_addr = fsl_lpspi->base_phys +IMX7ULP_TDR ; + tx.dst_addr_width = buswidth; + tx.dst_maxburst =1 ; + ret =dmaengine_slave_config (controller->dma_tx, &tx); +if (ret) { +dev_err (fsl_lpspi->dev,"TX dma configuration failed with %d\n" , + ret); +return ret; + } + + rx.direction =DMA_DEV_TO_MEM ; + rx.src_addr = fsl_lpspi->base_phys +IMX7ULP_RDR ; + rx.src_addr_width = buswidth; + rx.src_maxburst =1 ; + ret =dmaengine_slave_config (controller->dma_rx, &rx); +if (ret) { +dev_err (fsl_lpspi->dev,"RX dma configuration failed with %d\n" , + ret); +return ret; + } + +return 0 ; +} +static int fsl_lpspi_config (struct fsl_lpspi_data *fsl_lpspi) {u32 temp;
@@ -327,10 +423,16 @@ static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi) temp |=CR_RRF |CR_RTF |CR_MEN ;writel (temp, fsl_lpspi->base +IMX7ULP_CR ); + temp =0 ; +if (fsl_lpspi->usedma) + temp =DER_TDDE |DER_RDDE ; +writel (temp, fsl_lpspi->base +IMX7ULP_DER ); +return 0 ; } -static int fsl_lpspi_setup_transfer (struct spi_device *spi, +static int fsl_lpspi_setup_transfer (struct spi_controller *controller, +struct spi_device *spi,struct spi_transfer *t) { struct fsl_lpspi_data *fsl_lpspi =
@@ -363,6 +465,11 @@ static int fsl_lpspi_setup_transfer(struct spi_device *spi,else fsl_lpspi->watermark = fsl_lpspi->txfifosize; +if (fsl_lpspi_can_dma (controller, spi, t)) + fsl_lpspi->usedma =1 ; +else + fsl_lpspi->usedma =0 ; +return fsl_lpspi_config (fsl_lpspi); }
@@ -401,8 +508,10 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi) {u32 temp; -/* Disable all interrupt */ -fsl_lpspi_intctrl (fsl_lpspi,0 ); +if (!fsl_lpspi->usedma) { +/* Disable all interrupt */ +fsl_lpspi_intctrl (fsl_lpspi,0 ); + }/* W1C for all flags in SR */ temp =0x3F <<8 ;
@@ -415,6 +524,176 @@ static int fsl_lpspi_reset(struct fsl_lpspi_data *fsl_lpspi)return 0 ; } +static void fsl_lpspi_dma_rx_callback (void *cookie) +{ +struct fsl_lpspi_data *fsl_lpspi = (struct fsl_lpspi_data *)cookie; + +complete (&fsl_lpspi->dma_rx_completion); +} + +static void fsl_lpspi_dma_tx_callback (void *cookie) +{ +struct fsl_lpspi_data *fsl_lpspi = (struct fsl_lpspi_data *)cookie; + +complete (&fsl_lpspi->dma_tx_completion); +} + +static int fsl_lpspi_calculate_timeout (struct fsl_lpspi_data *fsl_lpspi, +int size) +{ +unsigned long timeout =0 ; + +/* Time with actual data transfer and CS change delay related to HW */ + timeout = (8 +4 ) * size / fsl_lpspi->config.speed_hz; + +/* Add extra second for scheduler related activities */ + timeout +=1 ; + +/* Double calculated timeout */ +return msecs_to_jiffies (2 * timeout *MSEC_PER_SEC ); +} + +static int fsl_lpspi_dma_transfer (struct spi_controller *controller, +struct fsl_lpspi_data *fsl_lpspi, +struct spi_transfer *transfer) +{ +struct dma_async_tx_descriptor *desc_tx, *desc_rx; +unsigned long transfer_timeout; +unsigned long timeout; +struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg; +int ret; + + ret =fsl_lpspi_dma_configure (controller); +if (ret) +return ret; + + desc_rx =dmaengine_prep_slave_sg (controller->dma_rx, + rx->sgl, rx->nents,DMA_DEV_TO_MEM , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!desc_rx) +return -EINVAL ; + + desc_rx->callback = fsl_lpspi_dma_rx_callback; + desc_rx->callback_param = (void *)fsl_lpspi; +dmaengine_submit (desc_rx); +reinit_completion (&fsl_lpspi->dma_rx_completion); +dma_async_issue_pending (controller->dma_rx); + + desc_tx =dmaengine_prep_slave_sg (controller->dma_tx, + tx->sgl, tx->nents,DMA_MEM_TO_DEV , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!desc_tx) { +dmaengine_terminate_all (controller->dma_tx); +return -EINVAL ; + } + + desc_tx->callback = fsl_lpspi_dma_tx_callback; + desc_tx->callback_param = (void *)fsl_lpspi; +dmaengine_submit (desc_tx); +reinit_completion (&fsl_lpspi->dma_tx_completion); +dma_async_issue_pending (controller->dma_tx); + + fsl_lpspi->slave_aborted = false; + +if (!fsl_lpspi->is_slave) { + transfer_timeout =fsl_lpspi_calculate_timeout (fsl_lpspi, + transfer->len); + +/* Wait eDMA to finish the data transfer.*/ + timeout =wait_for_completion_timeout (&fsl_lpspi->dma_tx_completion, + transfer_timeout); +if (!timeout) { +dev_err (fsl_lpspi->dev,"I/O Error in DMA TX\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -ETIMEDOUT ; + } + + timeout =wait_for_completion_timeout (&fsl_lpspi->dma_rx_completion, + transfer_timeout); +if (!timeout) { +dev_err (fsl_lpspi->dev,"I/O Error in DMA RX\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -ETIMEDOUT ; + } + }else { +if (wait_for_completion_interruptible (&fsl_lpspi->dma_tx_completion) || + fsl_lpspi->slave_aborted) { +dev_dbg (fsl_lpspi->dev, +"I/O Error in DMA TX interrupted\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -EINTR ; + } + +if (wait_for_completion_interruptible (&fsl_lpspi->dma_rx_completion) || + fsl_lpspi->slave_aborted) { +dev_dbg (fsl_lpspi->dev, +"I/O Error in DMA RX interrupted\n" ); +dmaengine_terminate_all (controller->dma_tx); +dmaengine_terminate_all (controller->dma_rx); +fsl_lpspi_reset (fsl_lpspi); +return -EINTR ; + } + } + +fsl_lpspi_reset (fsl_lpspi); + +return 0 ; +} + +static void fsl_lpspi_dma_exit (struct spi_controller *controller) +{ +if (controller->dma_rx) { +dma_release_channel (controller->dma_rx); + controller->dma_rx =NULL ; + } + +if (controller->dma_tx) { +dma_release_channel (controller->dma_tx); + controller->dma_tx =NULL ; + } +} + +static int fsl_lpspi_dma_init (struct device *dev, +struct fsl_lpspi_data *fsl_lpspi, +struct spi_controller *controller) +{ +int ret; + +/* Prepare for TX DMA: */ + controller->dma_tx =dma_request_slave_channel_reason (dev,"tx" ); +if (IS_ERR (controller->dma_tx)) { + ret =PTR_ERR (controller->dma_tx); +dev_dbg (dev,"can't get the TX DMA channel, error %d!\n" , ret); + controller->dma_tx =NULL ; + goto err; + } + +/* Prepare for RX DMA: */ + controller->dma_rx =dma_request_slave_channel_reason (dev,"rx" ); +if (IS_ERR (controller->dma_rx)) { + ret =PTR_ERR (controller->dma_rx); +dev_dbg (dev,"can't get the RX DMA channel, error %d\n" , ret); + controller->dma_rx =NULL ; + goto err; + } + +init_completion (&fsl_lpspi->dma_rx_completion); +init_completion (&fsl_lpspi->dma_tx_completion); + controller->can_dma = fsl_lpspi_can_dma; + controller->max_dma_len =FSL_LPSPI_MAX_EDMA_BYTES ; + +return 0 ; +err: +fsl_lpspi_dma_exit (controller); +return ret; +} +static int fsl_lpspi_pio_transfer (struct spi_controller *controller,struct spi_transfer *t) {
@@ -449,14 +728,17 @@ static int fsl_lpspi_transfer_one(struct spi_controller *controller,int ret; fsl_lpspi->is_first_byte = true; - ret =fsl_lpspi_setup_transfer (spi, t); + ret =fsl_lpspi_setup_transfer (controller, spi, t);if (ret <0 )return ret;fsl_lpspi_set_cmd (fsl_lpspi); fsl_lpspi->is_first_byte = false; - ret =fsl_lpspi_pio_transfer (controller, t); +if (fsl_lpspi->usedma) + ret =fsl_lpspi_dma_transfer (controller, fsl_lpspi, t); +else + ret =fsl_lpspi_pio_transfer (controller, t);if (ret <0 )return ret;
@@ -606,6 +888,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ret =PTR_ERR (fsl_lpspi->base); goto out_controller_put; } + fsl_lpspi->base_phys = res->start; irq =platform_get_irq (pdev,0 );if (irq <0 ) {
@@ -647,6 +930,13 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->txfifosize =1 << (temp &0x0f ); fsl_lpspi->rxfifosize =1 << ((temp >>8 ) &0x0f ); + ret =fsl_lpspi_dma_init (&pdev->dev, fsl_lpspi, controller); +if (ret == -EPROBE_DEFER ) + goto out_controller_put; + +if (ret <0 ) +dev_err (&pdev->dev,"dma setup error %d, use pio\n" , ret); + ret =devm_spi_register_controller (&pdev->dev, controller);if (ret <0 ) {dev_err (&pdev->dev,"spi_register_controller error.\n" );
Signature · 1 line
2.20.1
PATCH v2 7/8 spi: lpspi: Add the missing NULL check
In reply to Clark WangThe spi_transfer *t will be used in one transfer whatever. If t is NULL, there has no need to try sending data, so add an error return here.
---
V2:
- add this patch in this version
--- drivers/spi/spi-fsl-lpspi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/spi/spi-fsl-lpspi.c +5 -2
@@ -438,9 +438,12 @@ static int fsl_lpspi_setup_transfer(struct spi_controller *controller,struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (spi->controller); +if (t ==NULL ) +return -EINVAL ; + fsl_lpspi->config.mode = spi->mode; - fsl_lpspi->config.bpw = t ? t->bits_per_word : spi->bits_per_word; - fsl_lpspi->config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; + fsl_lpspi->config.bpw = t->bits_per_word; + fsl_lpspi->config.speed_hz = t->speed_hz; fsl_lpspi->config.chip_select = spi->chip_select;if (!fsl_lpspi->config.speed_hz)
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "spi: lpspi: Add the missing NULL check" to the spi tree
The patch
spi: lpspi: Add the missing NULL check
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
578465ea2b4b56368ddc3dcefb1f6d607382ef86Mon Sep 17 00:00:00 2001
From: Clark Wang <[email protected]>
Date: Wed, 6 Mar 2019 06:30:47 +0000
Subject: [PATCH] spi: lpspi: Add the missing NULL check
The spi_transfer *t will be used in one transfer whatever. If t is NULL, there has no need to try sending data, so add an error return here.
--- drivers/spi/spi-fsl-lpspi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/spi/spi-fsl-lpspi.c +5 -2
@@ -438,9 +438,12 @@ static int fsl_lpspi_setup_transfer(struct spi_controller *controller,struct fsl_lpspi_data *fsl_lpspi =spi_controller_get_devdata (spi->controller); +if (t ==NULL ) +return -EINVAL ; + fsl_lpspi->config.mode = spi->mode; - fsl_lpspi->config.bpw = t ? t->bits_per_word : spi->bits_per_word; - fsl_lpspi->config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; + fsl_lpspi->config.bpw = t->bits_per_word; + fsl_lpspi->config.speed_hz = t->speed_hz; fsl_lpspi->config.chip_select = spi->chip_select;if (!fsl_lpspi->config.speed_hz)
Signature · 1 line
2.20.1
PATCH v2 8/8 spi: lpspi: Code cleanup
In reply to Clark WangDelete the extra space.
---
V2:
- add this patch in this version
--- drivers/spi/spi-fsl-lpspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-fsl-lpspi.c +1 -1
@@ -345,7 +345,7 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)writel (scldiv | (scldiv <<8 ) | ((scldiv >>1 ) <<16 ), fsl_lpspi->base +IMX7ULP_CCR ); -dev_dbg (fsl_lpspi->dev,"perclk=%d, speed=%d, prescale =%d, scldiv=%d\n" , +dev_dbg (fsl_lpspi->dev,"perclk=%d, speed=%d, prescale=%d, scldiv=%d\n" , perclk_rate, config.speed_hz, prescale, scldiv);return 0 ;
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "spi: lpspi: Code cleanup" to the spi tree
The patch
spi: lpspi: Code cleanup
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
4e3891a55f671a4e641d2ef4e5ec0e27e56b20d9Mon Sep 17 00:00:00 2001
From: Clark Wang <[email protected]>
Date: Wed, 6 Mar 2019 06:30:49 +0000
Subject: [PATCH] spi: lpspi: Code cleanup
Delete the extra space.
--- drivers/spi/spi-fsl-lpspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-fsl-lpspi.c +1 -1
@@ -345,7 +345,7 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)writel (scldiv | (scldiv <<8 ) | ((scldiv >>1 ) <<16 ), fsl_lpspi->base +IMX7ULP_CCR ); -dev_dbg (fsl_lpspi->dev,"perclk=%d, speed=%d, prescale =%d, scldiv=%d\n" , +dev_dbg (fsl_lpspi->dev,"perclk=%d, speed=%d, prescale=%d, scldiv=%d\n" , perclk_rate, config.speed_hz, prescale, scldiv);return 0 ;
Signature · 1 line
2.20.1