Commit d3505401 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Mark Brown

spi: spi-fsl-dspi: Use specific compatible strings for all SoC instantiations

Currently, the device tree bindings submitted in mainline for Layerscape
SoCs look like this:

LS1021A:
compatible = "fsl,ls1021a-v1.0-dspi";

LS1012A:
compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi";

LS2085A:
compatible = "fsl,ls2085a-dspi";

LS2088A:
compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi";

LX2160A:
compatible = "fsl,lx2160a-dspi", "fsl,ls2085a-dspi";

LS1043A:
compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";

LS1046A:
compatible = "fsl,ls1021a-v1.0-dspi";

Due to a lack of a more specific compatible string, LS1012A, LS1043A and
LS1046A will fall under the LS1021A umbrella, and LS2088A and LX2160A
under the LS2085A umbrella.

They do work in those modes, but there are slight differences in the
hardware instantiations, mostly related to FIFO sizes (with the more
specific compatible strings, the FIFO size can be increased properly).
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Message-Id: <20200302001958.11105-3-olteanv@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8b614cb8
...@@ -133,27 +133,66 @@ struct fsl_dspi_devtype_data { ...@@ -133,27 +133,66 @@ struct fsl_dspi_devtype_data {
bool xspi_mode; bool xspi_mode;
}; };
static const struct fsl_dspi_devtype_data vf610_data = { enum {
.trans_mode = DSPI_DMA_MODE, LS1021A,
.max_clock_factor = 2, LS1012A,
LS1043A,
LS1046A,
LS2080A,
LS2085A,
LX2160A,
MCF5441X,
VF610,
}; };
static const struct fsl_dspi_devtype_data ls1021a_v1_data = { static const struct fsl_dspi_devtype_data devtype_data[] = {
.trans_mode = DSPI_TCFQ_MODE, [VF610] = {
.max_clock_factor = 8, .trans_mode = DSPI_DMA_MODE,
.ptp_sts_supported = true, .max_clock_factor = 2,
.xspi_mode = true, },
}; [LS1021A] = {
.trans_mode = DSPI_TCFQ_MODE,
static const struct fsl_dspi_devtype_data ls2085a_data = { .max_clock_factor = 8,
.trans_mode = DSPI_TCFQ_MODE, .ptp_sts_supported = true,
.max_clock_factor = 8, .xspi_mode = true,
.ptp_sts_supported = true, },
}; [LS1012A] = {
.trans_mode = DSPI_TCFQ_MODE,
static const struct fsl_dspi_devtype_data coldfire_data = { .max_clock_factor = 8,
.trans_mode = DSPI_EOQ_MODE, .ptp_sts_supported = true,
.max_clock_factor = 8, .xspi_mode = true,
},
[LS1043A] = {
.trans_mode = DSPI_TCFQ_MODE,
.max_clock_factor = 8,
.ptp_sts_supported = true,
.xspi_mode = true,
},
[LS1046A] = {
.trans_mode = DSPI_TCFQ_MODE,
.max_clock_factor = 8,
.ptp_sts_supported = true,
.xspi_mode = true,
},
[LS2080A] = {
.trans_mode = DSPI_TCFQ_MODE,
.max_clock_factor = 8,
.ptp_sts_supported = true,
},
[LS2085A] = {
.trans_mode = DSPI_TCFQ_MODE,
.max_clock_factor = 8,
.ptp_sts_supported = true,
},
[LX2160A] = {
.trans_mode = DSPI_TCFQ_MODE,
.max_clock_factor = 8,
.ptp_sts_supported = true,
},
[MCF5441X] = {
.trans_mode = DSPI_EOQ_MODE,
.max_clock_factor = 8,
},
}; };
struct fsl_dspi_dma { struct fsl_dspi_dma {
...@@ -909,9 +948,31 @@ static void dspi_cleanup(struct spi_device *spi) ...@@ -909,9 +948,31 @@ static void dspi_cleanup(struct spi_device *spi)
} }
static const struct of_device_id fsl_dspi_dt_ids[] = { static const struct of_device_id fsl_dspi_dt_ids[] = {
{ .compatible = "fsl,vf610-dspi", .data = &vf610_data, }, {
{ .compatible = "fsl,ls1021a-v1.0-dspi", .data = &ls1021a_v1_data, }, .compatible = "fsl,vf610-dspi",
{ .compatible = "fsl,ls2085a-dspi", .data = &ls2085a_data, }, .data = &devtype_data[VF610],
}, {
.compatible = "fsl,ls1021a-v1.0-dspi",
.data = &devtype_data[LS1021A],
}, {
.compatible = "fsl,ls1012a-dspi",
.data = &devtype_data[LS1012A],
}, {
.compatible = "fsl,ls1043a-dspi",
.data = &devtype_data[LS1043A],
}, {
.compatible = "fsl,ls1046a-dspi",
.data = &devtype_data[LS1046A],
}, {
.compatible = "fsl,ls2080a-dspi",
.data = &devtype_data[LS2080A],
}, {
.compatible = "fsl,ls2085a-dspi",
.data = &devtype_data[LS2085A],
}, {
.compatible = "fsl,lx2160a-dspi",
.data = &devtype_data[LX2160A],
},
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, fsl_dspi_dt_ids); MODULE_DEVICE_TABLE(of, fsl_dspi_dt_ids);
...@@ -1064,7 +1125,8 @@ static int dspi_probe(struct platform_device *pdev) ...@@ -1064,7 +1125,8 @@ static int dspi_probe(struct platform_device *pdev)
ctlr->num_chipselect = pdata->cs_num; ctlr->num_chipselect = pdata->cs_num;
ctlr->bus_num = pdata->bus_num; ctlr->bus_num = pdata->bus_num;
dspi->devtype_data = &coldfire_data; /* Only Coldfire uses platform data */
dspi->devtype_data = &devtype_data[MCF5441X];
} else { } else {
ret = of_property_read_u32(np, "spi-num-chipselects", &cs_num); ret = of_property_read_u32(np, "spi-num-chipselects", &cs_num);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment