[PATCH v2 7/8] spi: cadence-xspi: add ADI SC846 platform support
From: Nuno Sá
Date: Wed Nov 11 2026 - 08:35:47 EST
Add driver data for the Analog Devices ADSP-SC846 integration of the
Cadence xSPI controller. It uses the generic Cadence memory operations
and handlers, and only needs a hw_init() callback programming the SC846
specific PHY settings before resetting the DLL. Being a hw_init()
callback, the PHY is also set up again on resume.
Waiting for the DLL to lock is done on the PHY DLL observable register
rather than on the register used by the Marvell path, as that is what is
documented for this platform.
Signed-off-by: Nuno Sá <nuno.sa@xxxxxxxxxx>
---
drivers/spi/spi-cadence-xspi.c | 75 +++++++++++++++++++++++++++++++++++-------
1 file changed, 64 insertions(+), 11 deletions(-)
diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index d592512dda63..55b37175f08f 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -42,9 +42,15 @@
/* PHY gate loopback control register */
#define CDNS_XSPI_CCP_PHY_GATE_LPBCK_CTRL 0x0008
+/* PHY DLL master control register */
+#define CDNS_XSPI_CCP_PHY_DLL_MASTER_CTRL 0x000C
+
/* PHY DLL slave control register */
#define CDNS_XSPI_CCP_PHY_DLL_SLAVE_CTRL 0x0010
+/* PHY DQS input enable timing register */
+#define CDNS_XSPI_CCP_PHY_IE_TIMER 0x0014
+
/* DLL PHY control register */
#define CDNS_XSPI_DLL_PHY_CTRL 0x1034
@@ -235,6 +241,14 @@
#define MARVELL_RFILE_PHY_DLL_MASTER_CTRL 0x00800000
#define MARVELL_RFILE_PHY_DLL_SLAVE_CTRL 0x0000ff01
+/* ADI SC846 PHY default values */
+#define ADI_XSPI_PHY_DQ_TR 0x00000101
+#define ADI_XSPI_PHY_DQS_TR 0x00300400
+#define ADI_XSPI_PHY_GATE_LPBK_CTL 0x00180030
+#define ADI_XSPI_PHY_DLL_MSTR_CTL 0x00140084
+#define ADI_XSPI_PHY_DLL_SLAVE_CTL 0x00003fc4
+#define ADI_XSPI_PHY_IE_TR 0x00100000
+
/* PHY config registers */
#define CDNS_XSPI_RF_MINICTRL_REGS_DLL_PHY_CTRL 0x1034
#define CDNS_XSPI_PHY_CTB_RFILE_PHY_CTRL 0x0080
@@ -788,6 +802,45 @@ static void cdns_xspi_print_phy_config(struct cdns_xspi_dev *cdns_xspi)
readl(cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_DLL_SLAVE_CTRL));
}
+static void cdns_xspi_reset_dll(struct cdns_xspi_dev *cdns_xspi)
+{
+ u32 dll_cntrl = readl(cdns_xspi->iobase +
+ CDNS_XSPI_RF_MINICTRL_REGS_DLL_PHY_CTRL);
+
+ /* Reset DLL */
+ dll_cntrl |= CDNS_XSPI_DLL_RST_N;
+ writel(dll_cntrl, cdns_xspi->iobase +
+ CDNS_XSPI_RF_MINICTRL_REGS_DLL_PHY_CTRL);
+}
+
+static int cdns_sc846_xspi_hw_init(struct cdns_xspi_dev *cdns_xspi)
+{
+ u32 dll_obs;
+
+ writel(ADI_XSPI_PHY_DQ_TR,
+ cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_DQ_TIMING);
+ writel(ADI_XSPI_PHY_DQS_TR,
+ cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_DQS_TIMING);
+ writel(ADI_XSPI_PHY_GATE_LPBK_CTL,
+ cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_GATE_LPBCK_CTRL);
+ writel(ADI_XSPI_PHY_DLL_MSTR_CTL,
+ cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_DLL_MASTER_CTRL);
+ writel(ADI_XSPI_PHY_DLL_SLAVE_CTL,
+ cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_DLL_SLAVE_CTRL);
+ writel(ADI_XSPI_PHY_IE_TR,
+ cdns_xspi->auxbase + CDNS_XSPI_CCP_PHY_IE_TIMER);
+ writel(0, cdns_xspi->iobase + CDNS_XSPI_RF_MINICTRL_REGS_DLL_PHY_CTRL);
+
+ cdns_xspi_reset_dll(cdns_xspi);
+
+ /*
+ * Unlike the Marvell integration, the DLL lock is documented on the
+ * PHY DLL observable register.
+ */
+ return readl_poll_timeout(cdns_xspi->auxbase + CDNS_XSPI_DATASLICE_RFILE_PHY_DLL_OBS_REG_0,
+ dll_obs, dll_obs & CDNS_XSPI_DLL_LOCK, 10, 10000);
+}
+
#ifdef CONFIG_64BIT
static const int cdns_mrvl_xspi_clk_div_list[] = {
4, //0x0 = Divide by 4. SPI clock is 200 MHz.
@@ -806,17 +859,6 @@ static const int cdns_mrvl_xspi_clk_div_list[] = {
128 //0xD = Divide by 128. SPI clock is 6.25 MHz.
};
-static void cdns_xspi_reset_dll(struct cdns_xspi_dev *cdns_xspi)
-{
- u32 dll_cntrl = readl(cdns_xspi->iobase +
- CDNS_XSPI_RF_MINICTRL_REGS_DLL_PHY_CTRL);
-
- /* Reset DLL */
- dll_cntrl |= CDNS_XSPI_DLL_RST_N;
- writel(dll_cntrl, cdns_xspi->iobase +
- CDNS_XSPI_RF_MINICTRL_REGS_DLL_PHY_CTRL);
-}
-
static bool cdns_xspi_is_dll_locked(struct cdns_xspi_dev *cdns_xspi)
{
u32 dll_lock;
@@ -1416,6 +1458,13 @@ static const struct cdns_xspi_driver_data cdns_driver_data = {
.set_interrupts_handler = cdns_xspi_set_interrupts,
};
+static const struct cdns_xspi_driver_data sc846_driver_data = {
+ .mem_ops = &cadence_xspi_mem_ops,
+ .sdma_handler = cdns_xspi_sdma_handle,
+ .set_interrupts_handler = cdns_xspi_set_interrupts,
+ .hw_init = cdns_sc846_xspi_hw_init,
+};
+
#ifdef CONFIG_64BIT
static const struct cdns_xspi_driver_data marvell_driver_data = {
.mem_ops = &marvell_xspi_mem_ops,
@@ -1428,6 +1477,10 @@ static const struct cdns_xspi_driver_data marvell_driver_data = {
#endif
static const struct of_device_id cdns_xspi_of_match[] = {
+ {
+ .compatible = "adi,adsp-sc846-xspi",
+ .data = &sc846_driver_data,
+ },
{
.compatible = "cdns,xspi-nor",
.data = &cdns_driver_data,
--
2.56.0