Re: [PATCH] spi: cadence-qspi: Fix requesting of APB and AHB clocks on JH7110

[Ron Economos]

On 3/7/26 01:50, Mark Brown wrote:
> The move of the AHB and APB clocks from a JH7110 specific quirk to the
> main clock init dropped the specification of the clock names to request
> for the AHB and APB clocks, resulting in the clock framework requesting
> a clock with a NULL name three times.  On most platforms where the
> clocks are physically the same or some are always on this makes no
> difference but the reason we had the specific quirk for JH7110 is that
> it does actually have separate, controllable clocks.  Update the new
> code to request the AHB and APB clocks by name to restore the original
> behaviour on JH7110.
>
> Fixes: 324ecc7788c2 ("spi: cadence-qspi: Kill cqspi_jh7110_clk_init")
> Reported-by: Ron Economos <re@xxxxxxxx>
> Closes: https://lore.kernel.org/r/a3ca5e9b-7446-497e-8df2-7ef2b42a02e9@xxxxxxxx
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>   drivers/spi/spi-cadence-quadspi.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
> index 649ff55333f0..5fb0cb07c110 100644
> --- a/drivers/spi/spi-cadence-quadspi.c
> +++ b/drivers/spi/spi-cadence-quadspi.c
> @@ -76,6 +76,11 @@ struct cqspi_flash_pdata {
>   	u8		cs;
>   };
>   
> +static const struct clk_bulk_data cqspi_clks[CLK_QSPI_NUM] = {
> +	[CLK_QSPI_APB] = { .id = "apb" },
> +	[CLK_QSPI_AHB] = { .id = "ahb" },
> +};
> +
>   struct cqspi_st {
>   	struct platform_device	*pdev;
>   	struct spi_controller	*host;
> @@ -1823,6 +1828,7 @@ static int cqspi_probe(struct platform_device *pdev)
>   	}
>   
>   	/* Obtain QSPI clocks. */
> +	memcpy(&cqspi->clks, &cqspi_clks, sizeof(cqspi->clks));
>   	ret = devm_clk_bulk_get_optional(dev, CLK_QSPI_NUM, cqspi->clks);
>   	if (ret)
>   		return dev_err_probe(dev, ret, "Failed to get clocks\n");
>
> ---
> base-commit: 11439c4635edd669ae435eec308f4ab8a0804808
> change-id: 20260306-spi-cadence-qspi-fix-jh7110-608e79a09d15
>
> Best regards,
> --
> Mark Brown <broonie@xxxxxxxxxx>

Tested-by: Ron Economos <re@xxxxxxxx>