From: Tony Lindgren <tony@atomide.com>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 07/11] ARM: OMAP2+: Remove unused legacy code for DMA
Date: Thu, 8 Jun 2017 01:24:32 -0700 [thread overview]
Message-ID: <20170608082432.GF3730@atomide.com> (raw)
In-Reply-To: <10f65a24-0459-5df7-378d-84933b83c070@ti.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com> [170607 23:29]:
> On 2017-06-01 01:51, Tony Lindgren wrote:
> > --- a/arch/arm/mach-omap2/dma.c
> > +++ b/arch/arm/mach-omap2/dma.c
> > @@ -334,20 +334,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
> > p.dma_attr = (struct omap_dma_dev_attr *)oh->dev_attr;
> > p.errata = configure_dma_errata();
> >
> > - if (!of_have_populated_dt()) {
> > - if (soc_is_omap24xx()) {
> > - p.slave_map = omap24xx_sdma_map;
> > - p.slavecnt = ARRAY_SIZE(omap24xx_sdma_map);
> > - } else if (soc_is_omap34xx() || soc_is_omap3630()) {
> > - p.slave_map = omap3xxx_sdma_map;
> > - p.slavecnt = ARRAY_SIZE(omap3xxx_sdma_map);
> > - } else {
> > - pr_err("%s: The legacy DMA map is not provided!\n",
> > - __func__);
> > - return -ENODEV;
> > - }
> > - }
> > -
>
> This will conflict with the changes introduced by the tusb6010 DMAengine
> conversion:
> https://patchwork.kernel.org/patch/9734219/
Oops forgot about that one. I'll take a look if it makes sense
to leave the braces for now to avoid a merge conflict.
> with this patch I think the omap24xx_sdma_map and omap3xxx_sdma_map can
> also be removed, but we need to keep the omap24xx_sdma_dt_map for now
> till we have proper DT support for tusb.
OK good point, will check.
Regards,
Tony
next prev parent reply other threads:[~2017-06-08 8:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 22:51 [PATCH 00/11] Remove unused omap legacy code Tony Lindgren
2017-05-31 22:51 ` [PATCH 01/11] ARM: OMAP2+: Remove unused legacy code for opp Tony Lindgren
2017-05-31 22:51 ` [PATCH 02/11] ARM: OMAP2+: Remove unused legacy code for timer Tony Lindgren
2017-05-31 22:51 ` [PATCH 03/11] ARM: OMAP2+: Remove unused legacy code for PMU Tony Lindgren
2017-05-31 22:51 ` [PATCH 04/11] ARM: OMAP2+: Remove unused legacy code for device init Tony Lindgren
2017-06-07 22:27 ` Sebastian Reichel
2017-06-08 8:28 ` Tony Lindgren
2017-06-08 9:47 ` Tony Lindgren
2017-06-08 10:55 ` Sebastian Reichel
2017-06-08 11:10 ` Tony Lindgren
2017-05-31 22:51 ` [PATCH 05/11] ARM: OMAP2+: Remove unused legacy code for McBSP Tony Lindgren
2017-06-08 6:20 ` Peter Ujfalusi
2017-05-31 22:51 ` [PATCH 06/11] ARM: OMAP2+: Remove unused legacy code for io.c Tony Lindgren
2017-05-31 22:51 ` [PATCH 07/11] ARM: OMAP2+: Remove unused legacy code for DMA Tony Lindgren
2017-06-08 6:25 ` Peter Ujfalusi
2017-06-08 8:24 ` Tony Lindgren [this message]
2017-06-08 9:56 ` Tony Lindgren
2017-06-08 10:37 ` Peter Ujfalusi
2017-06-08 10:45 ` Tony Lindgren
2017-06-08 11:56 ` Bin Liu
2017-05-31 22:51 ` [PATCH 08/11] ARM: OMAP2+: Remove unused legacy code for PRM Tony Lindgren
2017-06-30 10:42 ` Tony Lindgren
2017-07-20 14:45 ` Sebastian Reichel
2017-07-21 5:55 ` Tony Lindgren
2017-05-31 22:51 ` [PATCH 09/11] ARM: OMAP2+: Remove unused legacy code for interconnects Tony Lindgren
2017-05-31 22:51 ` [PATCH 10/11] ARM: OMAP2+: Remove unused legacy code for watchdog Tony Lindgren
2017-05-31 22:51 ` [PATCH 11/11] ARM: OMAP2+: Remove unused legacy code for n8x0 Tony Lindgren
2017-06-08 8:13 ` [PATCH 00/11] Remove unused omap legacy code Sebastian Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170608082432.GF3730@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).