| Message ID | 20240620175657.358273-9-piotr.wojtaszczyk@timesys.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add audio support for LPC32XX CPUs | expand |
Hi Piotr, piotr.wojtaszczyk@timesys.com wrote on Thu, 20 Jun 2024 19:56:39 +0200: > Move away from pl08x platform data towards device tree. > > Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com> I don't see any change regarding the NAND controller node in the device tree, is there any dependency with other patches from the same patchset or may I apply this directly to nand/next? Thanks, Miquèl
On Fri, Jun 21, 2024 at 10:30 AM Miquel Raynal <miquel.raynal@bootlin.com> wrote: > > Hi Piotr, > > piotr.wojtaszczyk@timesys.com wrote on Thu, 20 Jun 2024 19:56:39 +0200: > > > Move away from pl08x platform data towards device tree. > > > > Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com> > > I don't see any change regarding the NAND controller node in the device > tree, is there any dependency with other patches from the same patchset > or may I apply this directly to nand/next? > > Thanks, > Miquèl Yes, this patch depends on "[v4,04/10] ARM: dts: lpc32xx: Add missing dma and i2s properties" which will be splitted into two or more separate patches per request in the comments. I'd like to keep driver changes and corresponding changes in DTS in the same patch but I've made a separate patch for DTS per request from v2 of the patch set. -- Piotr Wojtaszczyk Timesys
Hi Piotr, piotr.wojtaszczyk@timesys.com wrote on Fri, 21 Jun 2024 14:44:21 +0200: > On Fri, Jun 21, 2024 at 10:30 AM Miquel Raynal > <miquel.raynal@bootlin.com> wrote: > > > > Hi Piotr, > > > > piotr.wojtaszczyk@timesys.com wrote on Thu, 20 Jun 2024 19:56:39 +0200: > > > > > Move away from pl08x platform data towards device tree. > > > > > > Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com> > > > > I don't see any change regarding the NAND controller node in the device > > tree, is there any dependency with other patches from the same patchset > > or may I apply this directly to nand/next? > > > > Thanks, > > Miquèl > > Yes, this patch depends on "[v4,04/10] ARM: dts: lpc32xx: Add missing > dma and i2s properties" > which will be splitted into two or more separate patches per request > in the comments. > I'd like to keep driver changes and corresponding changes in DTS in > the same patch > but I've made a separate patch for DTS per request from v2 of the patch set. These changes won't be applied to the same tries so they must be split. So I will not take this patch for the next merge window and instead will take it for the one after, if the DT patches have been applied. Please ping me at -rc1 again if the DT patches have gone through. Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/lpc32xx_mlc.c b/drivers/mtd/nand/raw/lpc32xx_mlc.c index 677fcb03f9be..e504e3c5af11 100644 --- a/drivers/mtd/nand/raw/lpc32xx_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c @@ -574,15 +574,7 @@ static int lpc32xx_dma_setup(struct lpc32xx_nand_host *host) struct mtd_info *mtd = nand_to_mtd(&host->nand_chip); dma_cap_mask_t mask; - if (!host->pdata || !host->pdata->dma_filter) { - dev_err(mtd->dev.parent, "no DMA platform data\n"); - return -ENOENT; - } - - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - host->dma_chan = dma_request_channel(mask, host->pdata->dma_filter, - "nand-mlc"); + host->dma_chan = dma_request_chan(mtd->dev.parent, "rx-tx"); if (!host->dma_chan) { dev_err(mtd->dev.parent, "Failed to request DMA channel\n"); return -EBUSY; diff --git a/drivers/mtd/nand/raw/lpc32xx_slc.c b/drivers/mtd/nand/raw/lpc32xx_slc.c index 1c5fa855b9f2..f83a31411bde 100644 --- a/drivers/mtd/nand/raw/lpc32xx_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_slc.c @@ -721,15 +721,7 @@ static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host) struct mtd_info *mtd = nand_to_mtd(&host->nand_chip); dma_cap_mask_t mask; - if (!host->pdata || !host->pdata->dma_filter) { - dev_err(mtd->dev.parent, "no DMA platform data\n"); - return -ENOENT; - } - - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - host->dma_chan = dma_request_channel(mask, host->pdata->dma_filter, - "nand-slc"); + host->dma_chan = dma_request_chan(mtd->dev.parent, "rx-tx"); if (!host->dma_chan) { dev_err(mtd->dev.parent, "Failed to request DMA channel\n"); return -EBUSY;
Move away from pl08x platform data towards device tree. Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com> --- Changes for v4: - This patch is new in v4 drivers/mtd/nand/raw/lpc32xx_mlc.c | 10 +--------- drivers/mtd/nand/raw/lpc32xx_slc.c | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-)