On Thu, Dec 13, 2018 at 11:01:43AM +0300, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx>
>
Applied, thanks
Sascha
> diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
> index 10621d00c..46e8955ab 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);
> --
> 2.13.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
