diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2018-12-13 11:01:43 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-14 15:08:19 +0100 |
| commit | c6ded00cbd05a9d62f7acf83c3bac23a3051f0b4 (patch) | |
| tree | eb77f6e8305636b0d75b4530f947bcf936b3145c | |
| parent | bd3521e6f2eed85db65c51aa86082728b40e1e6e (diff) | |
| download | barebox-c6ded00cbd05a9d62f7acf83c3bac23a3051f0b4.tar.gz barebox-c6ded00cbd05a9d62f7acf83c3bac23a3051f0b4.tar.xz | |
spi: i.MX: Fix wrong bus nubering with devicetree
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/spi/imx_spi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 10621d00c8..46e8955abb 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -605,17 +605,20 @@ static int imx_spi_probe(struct device_d *dev) master = &imx->master; master->dev = dev; - master->bus_num = dev->id; master->setup = imx_spi_setup; master->transfer = imx_spi_transfer; if (pdata) { + master->bus_num = dev->id; master->num_chipselect = pdata->num_chipselect; imx->cs_array = pdata->chipselect; - } else { - if (IS_ENABLED(CONFIG_OFDEVICE)) - imx_spi_dt_probe(imx); + } else if (IS_ENABLED(CONFIG_OFDEVICE)) { + ret = of_alias_get_id(dev->device_node, "spi"); + if (ret < 0) + goto err_free; + master->bus_num = ret; + imx_spi_dt_probe(imx); } imx->clk = clk_get(dev, NULL); |