Re: [U-Boot] [PATCH v2 5/9] spi: Add support for SPL_OF_PLATDATA to mxs_spi.c driver

Subject: [PATCH v2 5/9] spi: Add support for SPL_OF_PLATDATA to mxs_spi.c driver

After this patch the mxs_spi.c DM/DTS driver can be used at early SPL to read payload from SPI-NOR memories.

It was necessary to adjust its name to 'fsl_imx_2{38}_spi' to match requirements for SPL_OF_PLATDATA usage.

Signed-off-by: Lukasz Majewski lukma@denx.de

Changes in v2: None

drivers/spi/mxs_spi.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index d475830f17..58b1c67a19 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -57,7 +57,18 @@ static inline struct mxs_spi_slave *to_mxs_slave(struct spi_slave *slave) #else #include <dm.h> #include <errno.h> +#include <dt-structs.h>

+#ifdef CONFIG_MX28 +#define dtd_fsl_imx_spi dtd_fsl_imx28_spi #else /* CONFIG_MX23 */ +#define dtd_fsl_imx_spi dtd_fsl_imx23_spi #endif

struct mxs_spi_platdata { +#if CONFIG_IS_ENABLED(OF_PLATDATA)

• struct dtd_fsl_imx_spi dtplat;

+#endif s32 frequency; /* Default clock frequency, -1 for none */ fdt_addr_t base; /* SPI IP block base address */ int num_cs; /* Number of CSes supported */ @@ -430,11 +441,26 @@ static int mxs_spi_probe(struct udevice *bus) int ret;

debug("%s: probe\n", __func__);

+#if CONFIG_IS_ENABLED(OF_PLATDATA)

• struct dtd_fsl_imx_spi *dtplat = &plat->dtplat;

• struct phandle_1_arg *p1a = &dtplat->clocks[0];

• priv->regs = (struct mxs_ssp_regs *)dtplat->reg[0];

• priv->dma_channel = dtplat->dmas[1];

• priv->clk_id = p1a->arg[0];

• priv->max_freq = dtplat->spi_max_frequency;

• plat->num_cs = dtplat->num_cs;

• debug("OF_PLATDATA: regs: 0x%x max freq: %d clkid: %d\n",

•      (unsigned int)priv->regs, priv->max_freq, priv->clk_id); #else
  

  priv->regs = (struct mxs_ssp_regs *)plat->base; priv->max_freq = plat->frequency;

  priv->dma_channel = plat->dma_id; priv->clk_id = plat->clk_id;

+#endif

mxs_reset_block(&priv->regs->hw_ssp_ctrl0_reg);

@@ -571,16 +597,20 @@ static int mxs_ofdata_to_platdata(struct udevice *bus)

return 0; } -#endif

static const struct udevice_id mxs_spi_ids[] = { { .compatible = "fsl,imx23-spi" }, { .compatible = "fsl,imx28-spi" }, { } }; +#endif

U_BOOT_DRIVER(mxs_spi) = {

• .name = "mxs_spi",

+#ifdef CONFIG_MX28

• .name = "fsl_imx28_spi",

+#else /* CONFIG_MX23 */

• .name = "fsl_imx23_spi",

+#endif .id = UCLASS_SPI, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxs_spi_ids,

Reviewed-by: Peng Fan peng.fan@nxp.com

-- 2.11.0