diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-11 19:58:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-11 19:58:20 +0000 |
| commit | b562b304efc0922d1ef9e7d5b9d333db7497f81a (patch) | |
| tree | f3b3cb81c07442555c67b371b45bbb64d9301331 /drivers/spi/spi.c | |
| parent | caef2df1137adcea48b0902f310f4639b846e3a1 (diff) | |
| parent | e11e8473bcec748c3820636f11b986f611c9309b (diff) | |
Merge tag 'mtk-mtd-spi-move' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.7
spi: Rewrite mtk-quadspi spi-nor driver with spi-mem
This patchset from Chuanhong Guo <gch981213@gmail.com> adds a spi-mem
driver for Mediatek SPI-NOR controller, which already has limited
support by mtk-quadspi. This new driver can make use of full quadspi
capability of this controller.
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 6c223f7d1ddc..f6f6b2a0c81c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1951,13 +1951,8 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, spi->mode |= SPI_CS_HIGH; /* Device speed */ - rc = of_property_read_u32(nc, "spi-max-frequency", &value); - if (rc) { - dev_err(&ctlr->dev, - "%pOF has no valid 'spi-max-frequency' property (%d)\n", nc, rc); - return rc; - } - spi->max_speed_hz = value; + if (!of_property_read_u32(nc, "spi-max-frequency", &value)) + spi->max_speed_hz = value; return 0; } |