diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2016-10-27 21:24:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-28 20:39:09 +0200 |
| commit | e9e128a69af2b5fd2a4e01a59cc7e479ce9b8813 (patch) | |
| tree | dbac5e95c4743c8e430479213895f1e3294ea4be /drivers/spi/spi-fsl-espi.c | |
| parent | spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized d... (diff) | |
| download | linux-e9e128a69af2b5fd2a4e01a59cc7e479ce9b8813.tar.xz linux-e9e128a69af2b5fd2a4e01a59cc7e479ce9b8813.zip | |
spi: fsl-espi: improve check for SPI_QE_CPU_MODE
SPI_QE_CPU_MODE doesn't exist for ESPI and is set by of_mpc8xxx_spi_probe
based on DT property "mode". This property is not defined for ESPI,
see Documentation/devicetree/bindings/spi/fsl-spi.txt.
So print an error message and bail out if SPI_QE_CPU_MODE is set.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-espi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 4e8a99d0cb63..f04c2464e854 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -583,8 +583,9 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, goto err_probe; if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE) { - mpc8xxx_spi->rx_shift = 16; - mpc8xxx_spi->tx_shift = 24; + dev_err(dev, "SPI_QE_CPU_MODE is not supported on ESPI!\n"); + ret = -EINVAL; + goto err_probe; } /* SPI controller initializations */ |