[PATCH] spi: Fix missed rename from SPI_ADVANCE to SPI_STACKED_PARALLEL
Signed-off-by: Dominik Wernberger dominik.wernberger@gmx.de --- drivers/spi/spi-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 36b7d383aa..d604975374 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -446,7 +446,7 @@ int _spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, slave = dev_get_parent_priv(dev); bus_data = dev_get_uclass_priv(bus);
-#if CONFIG_IS_ENABLED(SPI_ADVANCE) +#if CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL) if ((dev_read_bool(dev, "parallel-memories")) && !slave->multi_cs_cap) { dev_err(dev, "controller doesn't support multi CS\n"); return -EINVAL; @@ -515,7 +515,7 @@ int spi_slave_of_to_plat(struct udevice *dev, struct dm_spi_slave_plat *plat) int mode = 0; int value;
-#if CONFIG_IS_ENABLED(SPI_ADVANCE) +#if CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL) int ret;
ret = dev_read_u32_array(dev, "reg", plat->cs, SPI_CS_CNT_MAX); -- 2.34.1
---
Moved the URL from the commit message here into the annotation section.
Original renaming was performed in https://lore.kernel.org/u-boot/20241026201741.171073-8-marek.vasut+renesas@m...
I encountered this issue while testing the Zynq-7000 QSPI parallel Flash implementation but there is no corresponding issue in the bug tracker that I'm aware of.
On 11/25/24 9:53 PM, Dominik Wernberger wrote:
The commit message goes here (now it is empty).
Use 'git commit --amend' and fill something in here, something simple similar to the subject is fine, like:
" Fix missed rename from SPI_ADVANCE to SPI_STACKED_PARALLEL. This fixes an issue encountered while testing the Zynq-7000 QSPI parallel Flash implementation. "
Signed-off-by: Dominik Wernberger dominik.wernberger@gmx.de
And then it would be perfect.
Thanks for the fix.
( Tom, if you want to fix up the commit message while applying and it is fine with Dominik, please add my:
Reviewed-by: Marek Vasut marek.vasut+renesas@mailbox.org
This is obviously a valid fix for RC3 )
On Mon, Nov 25, 2024 at 10:09:09PM +0100, Marek Vasut wrote:
On 11/25/24 9:53 PM, Dominik Wernberger wrote:
The commit message goes here (now it is empty).
Use 'git commit --amend' and fill something in here, something simple similar to the subject is fine, like:
" Fix missed rename from SPI_ADVANCE to SPI_STACKED_PARALLEL. This fixes an issue encountered while testing the Zynq-7000 QSPI parallel Flash implementation. "
Signed-off-by: Dominik Wernberger dominik.wernberger@gmx.de
And then it would be perfect.
Thanks for the fix.
( Tom, if you want to fix up the commit message while applying and it is fine with Dominik, please add my:
Reviewed-by: Marek Vasut marek.vasut+renesas@mailbox.org
This is obviously a valid fix for RC3
Thanks, I'll grab one of these and possibly reword slightly while applying.
participants (3)
-
Dominik Wernberger -
Marek Vasut -
Tom Rini