spi: stm32-qspi: Replace of_gpio_named_count() by gpiod_count()
PATCH 1/2 spi: stm32-qspi: Replace of_gpio_named_count() by gpiod_count()
As a preparation to unexport of_gpio_named_count(), convert the driver to use gpiod_count() instead.
--- drivers/spi/spi-stm32-qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-stm32-qspi.c +2 -2
@@ -656,7 +656,7 @@ static int stm32_qspi_setup(struct spi_device *spi) mode = spi->mode & (SPI_TX_OCTAL |SPI_RX_OCTAL );if ((mode ==SPI_TX_OCTAL || mode ==SPI_RX_OCTAL ) || ((mode == (SPI_TX_OCTAL |SPI_RX_OCTAL )) && -of_gpio_named_count (qspi->dev->of_node,"cs-gpios" ) == -ENOENT )) { +gpiod_count (qspi->dev,"cs" ) == -ENOENT )) {dev_err (qspi->dev,"spi-rx-bus-width\\/spi-tx-bus-width\\/cs-gpios\n" );dev_err (qspi->dev,"configuration not supported\n" );
@@ -681,7 +681,7 @@ static int stm32_qspi_setup(struct spi_device *spi)* are both set in spi->mode and "cs-gpios" properties is found in DT */ if (((spi->mode & (SPI_TX_OCTAL |SPI_RX_OCTAL )) == (SPI_TX_OCTAL |SPI_RX_OCTAL )) && -of_gpio_named_count (qspi->dev->of_node,"cs-gpios" )) { +gpiod_count (qspi->dev,"cs" )) { qspi->cr_reg |=CR_DFM ;dev_dbg (qspi->dev,"Dual flash mode enable" ); }
Signature · 1 line
2.35.1
PATCH 2/2 spi: stm32-qspi: Refactor dual flash mode enable check in ->setup()
gpiod_count() either returns positive number of the CS or negative error code. In the stm32_qspi_setup() we check that configuration has enough CS for the dual flash mode and SPI mode is not changing over the lines of the code. Taking all above into considertion, refactor dual flash mode enable check by dropping unneeded CS check and reusing local mode variable.
--- drivers/spi/spi-stm32-qspi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/spi-stm32-qspi.c +1 -2
@@ -680,8 +680,7 @@ static int stm32_qspi_setup(struct spi_device *spi)* Dual flash mode is only enable in case SPI_TX_OCTAL and SPI_TX_OCTAL * are both set in spi->mode and "cs-gpios" properties is found in DT */ -if (((spi->mode & (SPI_TX_OCTAL |SPI_RX_OCTAL )) == (SPI_TX_OCTAL |SPI_RX_OCTAL )) && -gpiod_count (qspi->dev,"cs" )) { +if (mode == (SPI_TX_OCTAL |SPI_RX_OCTAL )) { qspi->cr_reg |=CR_DFM ;dev_dbg (qspi->dev,"Dual flash mode enable" ); }
Signature · 1 line
2.35.1
Re: [PATCH v1 2/2] spi: stm32-qspi: Refactor dual flash mode enable check in ->setup()
HI Andy
Quoted 17 lines · Andy Shevchenko
gpiod_count()either returns positive number of the CS or negative error code. In thestm32_qspi_setup()we check that configuration has enough CS for the dual flash mode and SPI mode is not changing over the lines of the code. Taking all above into considertion, refactor dual flash mode enable check by dropping unneeded CS check and reusing local mode variable.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/spi/spi-stm32-qspi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/spi/spi-stm32-qspi.c +0
-0
drivers/spi/spi-stm32-qspi.c static int stm32_qspi_setup(struct spi_device *spi) · line 686
Quoted 9 lines
drivers/spi/spi-stm32-qspi.c +1
-2@@ -680,8 +680,7 @@ static int stm32_qspi_setup(struct spi_device *spi)* Dual flash mode is only enable in case SPI_TX_OCTAL and SPI_TX_OCTAL * are both set in spi->mode and "cs-gpios" properties is found in DT */ -if (((spi->mode & (SPI_TX_OCTAL |SPI_RX_OCTAL )) == (SPI_TX_OCTAL |SPI_RX_OCTAL )) && -gpiod_count (qspi->dev,"cs" )) { +if (mode == (SPI_TX_OCTAL |SPI_RX_OCTAL )) { qspi->cr_reg |=CR_DFM ;dev_dbg (qspi->dev,"Dual flash mode enable" ); }
Thanks
Patrice
Hi Andy
Quoted 22 lines · Andy Shevchenko
As a preparation to unexport
of_gpio_named_count(), convert the driver to usegpiod_count()instead.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/spi/spi-stm32-qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/spi/spi-stm32-qspi.c +1
-1@@ -656,7 +656,7 @@ static int stm32_qspi_setup(struct spi_device *spi) mode = spi->mode & (SPI_TX_OCTAL |SPI_RX_OCTAL );if ((mode ==SPI_TX_OCTAL || mode ==SPI_RX_OCTAL ) || ((mode == (SPI_TX_OCTAL |SPI_RX_OCTAL )) && -of_gpio_named_count (qspi->dev->of_node,"cs-gpios" ) == -ENOENT )) { +gpiod_count (qspi->dev,"cs" ) == -ENOENT )) {dev_err (qspi->dev,"spi-rx-bus-width\\/spi-tx-bus-width\\/cs-gpios\n" );dev_err (qspi->dev,"configuration not supported\n" );
drivers/spi/spi-stm32-qspi.c static int stm32_qspi_setup(struct spi_device *spi) · line 687
Quoted 8 lines
drivers/spi/spi-stm32-qspi.c +1
-1@@ -681,7 +681,7 @@ static int stm32_qspi_setup(struct spi_device *spi)* are both set in spi->mode and "cs-gpios" properties is found in DT */ if (((spi->mode & (SPI_TX_OCTAL |SPI_RX_OCTAL )) == (SPI_TX_OCTAL |SPI_RX_OCTAL )) && -of_gpio_named_count (qspi->dev->of_node,"cs-gpios" )) { +gpiod_count (qspi->dev,"cs" )) { qspi->cr_reg |=CR_DFM ;dev_dbg (qspi->dev,"Dual flash mode enable" ); }
Thanks
Patrice
Mark Brown
maintainerQuoted 4 lines · Andy Shevchenko
As a preparation to unexport
of_gpio_named_count(), convert the driver to usegpiod_count()instead.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/2] spi: stm32-qspi: Replace of_gpio_named_count() by gpiod_count()
commit: eea0e7d20d6dab38522ac0a3af61fd92c53c34f6
[2/2] spi: stm32-qspi: Refactor dual flash mode enable check in ->setup()
commit: c9448aa41ac7dd223a6bef79e71d6c168593ebb7All 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