From: Kevin Hao <[email protected]> The stable commit 8df235f768ce ("spi: cadence-quadspi: Implement refcount to handle unbind during busy") and the SDK commit 1eb6f605cfd5 ("spi: spi-cadence-quadspi: Add Rx periodic Tuning support") use different approaches to obtain the struct cqspi_st pointer and assign it to the local variable 'cqspi'. This results in the following redefinition build error: drivers/spi/spi-cadence-quadspi.c: In function ‘cqspi_exec_mem_op’: drivers/spi/spi-cadence-quadspi.c:1791:26: error: redefinition of ‘cqspi’ 1791 | struct cqspi_st *cqspi = spi_controller_get_devdata(mem->spi->controller);
To resolve this issue, only one method should be retained. The approach from the stable commit is preferred. Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, This addresses a build failure in the v6.6 xilinx branches. I had overlooked this issue during my build testing. Please merge this fix into the following two branches: v6.6/standard/sdkv6.6/xlnx-soc v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc --- drivers/spi/spi-cadence-quadspi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index d29ee5166d57dc7c54eb74711748ace7d8f09e91..036d434d477f829027d9e65316754014a69a4131 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1785,10 +1785,9 @@ static int cqspi_mem_process(struct spi_mem *mem, const struct spi_mem_op *op) static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op) { - struct cqspi_st *cqspi = spi_master_get_devdata(mem->spi->master); + struct cqspi_st *cqspi = spi_controller_get_devdata(mem->spi->controller); struct cqspi_flash_pdata *f_pdata; int ret; - struct cqspi_st *cqspi = spi_controller_get_devdata(mem->spi->controller); if (refcount_read(&cqspi->inflight_ops) == 0) return -ENODEV; --- base-commit: 795872ca730ee7fd7f6f0e95c44589bf89527270 change-id: 20260221-v6-6-xilinx-76e6ffc7756e Best regards, -- Kevin Hao <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16326): https://lists.yoctoproject.org/g/linux-yocto/message/16326 Mute This Topic: https://lists.yoctoproject.org/mt/117926078/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
