I didn't see a 0/9 of for this series .. and had mistakenly assumed it was for v5.2.
But after it failed to apply, I see it is for linux-yocto-dev and 5.4. Since it is now reviewed, I merged it to -dev, if that wasn't the intention send a revert for 5.4 and a series that applies to v5.2. Bruce In message: [linux-yocto][PATCH 1/9] Revert "spi: zynq-qspi: use devm_platform_ioremap_resource() to simplify code" on 16/12/2019 quanyang.w...@windriver.com wrote: > From: Quanyang Wang <quanyang.w...@windriver.com> > > This reverts commit ae91a439ac7ec8e1e925621293f45794de6366f2. > > Revert all mainline commits for spi-zynq-qspi.c and apply SDK patches > to make sure that spi-zynq-qspi.c works in spi-master frame work. > > Signed-off-by: Quanyang Wang <quanyang.w...@windriver.com> > --- > drivers/spi/spi-zynq-qspi.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c > index 5cf6993ddce5..4a5326ccf65a 100644 > --- a/drivers/spi/spi-zynq-qspi.c > +++ b/drivers/spi/spi-zynq-qspi.c > @@ -620,6 +620,7 @@ static int zynq_qspi_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > struct zynq_qspi *xqspi; > + struct resource *res; > u32 num_cs; > > ctlr = spi_alloc_master(&pdev->dev, sizeof(*xqspi)); > @@ -629,7 +630,8 @@ static int zynq_qspi_probe(struct platform_device *pdev) > xqspi = spi_controller_get_devdata(ctlr); > xqspi->dev = dev; > platform_set_drvdata(pdev, xqspi); > - xqspi->regs = devm_platform_ioremap_resource(pdev, 0); > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + xqspi->regs = devm_ioremap_resource(&pdev->dev, res); > if (IS_ERR(xqspi->regs)) { > ret = PTR_ERR(xqspi->regs); > goto remove_master; > -- > 2.17.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8251): https://lists.yoctoproject.org/g/linux-yocto/message/8251 Mute This Topic: https://lists.yoctoproject.org/mt/68719905/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-