| Message ID | 1380580887-24249-4-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 30, 2013 at 06:41:25PM -0400, Santosh Shilimkar wrote: > Allow the TI_EDMA to be built for ARCH_KEYSTONE which also supports > the EDMA IP. > > Cc: Vinod Koul <vinod.koul@intel.com> > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > --- > Vinod, > I need your ack on this patch to carry $subject patch via arm-soc tree > to avoid the unmet dependency warnings. Sure, but too many dependency fixes have been popoing up for this part and this IIRC is third patch! Something doesn't seem right, hopefully am wrong.. I have a patch in my -next from Josh which selects TI_PRIV_EDMA for this... ~Vinod > > drivers/dma/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > index 526ec77..b1dde16 100644 > --- a/drivers/dma/Kconfig > +++ b/drivers/dma/Kconfig > @@ -195,7 +195,7 @@ config SIRF_DMA > > config TI_EDMA > bool "TI EDMA support" > - depends on ARCH_DAVINCI || ARCH_OMAP > + depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE > select DMA_ENGINE > select DMA_VIRTUAL_CHANNELS > default n > -- > 1.7.9.5 >
On Monday 30 September 2013 09:54 PM, Vinod Koul wrote: > On Mon, Sep 30, 2013 at 06:41:25PM -0400, Santosh Shilimkar wrote: >> Allow the TI_EDMA to be built for ARCH_KEYSTONE which also supports >> the EDMA IP. >> >> Cc: Vinod Koul <vinod.koul@intel.com> >> >> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> --- >> Vinod, >> I need your ack on this patch to carry $subject patch via arm-soc tree >> to avoid the unmet dependency warnings. > Sure, but too many dependency fixes have been popoing up for this part and this > IIRC is third patch! Something doesn't seem right, hopefully am wrong.. > I think it mainly because EDMA support is just merged last cycle and few SOCs which use the EDMA trying to enable them now. > I have a patch in my -next from Josh which selects TI_PRIV_EDMA for this... > I looked at your next patch which is fixing the TI_EDMA dependency. If you prefer to merge $subject patch via your tree, thats fine as well. Juts give me a stable branch targeted for 3.13 and I shall merge your branch and apply other patches on top of it. Since it was very trivial patch, I thought its easy to carry via arm-soc with your ack. >> >> drivers/dma/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig >> index 526ec77..b1dde16 100644 >> --- a/drivers/dma/Kconfig >> +++ b/drivers/dma/Kconfig >> @@ -195,7 +195,7 @@ config SIRF_DMA >> >> config TI_EDMA >> bool "TI EDMA support" >> - depends on ARCH_DAVINCI || ARCH_OMAP >> + depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE >> select DMA_ENGINE >> select DMA_VIRTUAL_CHANNELS >> default n >> -- >> 1.7.9.5 >> >
On Tue, Oct 01, 2013 at 09:35:43AM -0400, Santosh Shilimkar wrote: > On Monday 30 September 2013 09:54 PM, Vinod Koul wrote: > > On Mon, Sep 30, 2013 at 06:41:25PM -0400, Santosh Shilimkar wrote: > >> Allow the TI_EDMA to be built for ARCH_KEYSTONE which also supports > >> the EDMA IP. > >> > >> Cc: Vinod Koul <vinod.koul@intel.com> > >> > >> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > >> --- > >> Vinod, > >> I need your ack on this patch to carry $subject patch via arm-soc tree > >> to avoid the unmet dependency warnings. > > Sure, but too many dependency fixes have been popoing up for this part and this > > IIRC is third patch! Something doesn't seem right, hopefully am wrong.. > > > I think it mainly because EDMA support is just merged last cycle and few SOCs > which use the EDMA trying to enable them now. Okay btw is EDMA enabled in any of defconfigs. Having that will help us get better test covergae in -next > > > I have a patch in my -next from Josh which selects TI_PRIV_EDMA for this... > > > I looked at your next patch which is fixing the TI_EDMA dependency. > If you prefer to merge $subject patch via your tree, thats fine as well. > Juts give me a stable branch targeted for 3.13 and I shall merge your branch > and apply other patches on top of it. Pls merge my fixes branch. I will send that to Linus in day or two... > Since it was very trivial patch, I thought its easy to carry via arm-soc > with your ack. Sure, looks good to me Acked-by: Vinod Koul <vinod.koul@intel.com> > > >> > >> drivers/dma/Kconfig | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > >> index 526ec77..b1dde16 100644 > >> --- a/drivers/dma/Kconfig > >> +++ b/drivers/dma/Kconfig > >> @@ -195,7 +195,7 @@ config SIRF_DMA > >> > >> config TI_EDMA > >> bool "TI EDMA support" > >> - depends on ARCH_DAVINCI || ARCH_OMAP > >> + depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE > >> select DMA_ENGINE > >> select DMA_VIRTUAL_CHANNELS > >> default n > >> -- > >> 1.7.9.5 > >> > > >
On Thu, Oct 03, 2013 at 11:57:59AM -0400, Santosh Shilimkar wrote: > >> I looked at your next patch which is fixing the TI_EDMA dependency. > >> If you prefer to merge $subject patch via your tree, thats fine as well. > >> Juts give me a stable branch targeted for 3.13 and I shall merge your branch > >> and apply other patches on top of it. > > Pls merge my fixes branch. I will send that to Linus in day or two... > > > Will merge your next to avoid the merge conflict issue. No pls. I usually rebase my -next so I wont advise that. Fixes wont be so pls use that and this will be sent to Linus. ~Vinod > > >> Since it was very trivial patch, I thought its easy to carry via arm-soc > >> with your ack. > > Sure, looks good to me > > > > Acked-by: Vinod Koul <vinod.koul@intel.com> > > Thanks a lot. > > Regards, > Santosh >
On Thursday 03 October 2013 11:03 AM, Vinod Koul wrote: > On Tue, Oct 01, 2013 at 09:35:43AM -0400, Santosh Shilimkar wrote: >> On Monday 30 September 2013 09:54 PM, Vinod Koul wrote: >>> On Mon, Sep 30, 2013 at 06:41:25PM -0400, Santosh Shilimkar wrote: >>>> Allow the TI_EDMA to be built for ARCH_KEYSTONE which also supports >>>> the EDMA IP. >>>> >>>> Cc: Vinod Koul <vinod.koul@intel.com> >>>> >>>> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >>>> --- >>>> Vinod, >>>> I need your ack on this patch to carry $subject patch via arm-soc tree >>>> to avoid the unmet dependency warnings. >>> Sure, but too many dependency fixes have been popoing up for this part and this >>> IIRC is third patch! Something doesn't seem right, hopefully am wrong.. >>> >> I think it mainly because EDMA support is just merged last cycle and few SOCs >> which use the EDMA trying to enable them now. > Okay btw is EDMA enabled in any of defconfigs. Having that will help us get > better test covergae in -next > yeah.. I do enable that as part of the series. >> >>> I have a patch in my -next from Josh which selects TI_PRIV_EDMA for this... >>> >> I looked at your next patch which is fixing the TI_EDMA dependency. >> If you prefer to merge $subject patch via your tree, thats fine as well. >> Juts give me a stable branch targeted for 3.13 and I shall merge your branch >> and apply other patches on top of it. > Pls merge my fixes branch. I will send that to Linus in day or two... > Will merge your next to avoid the merge conflict issue. >> Since it was very trivial patch, I thought its easy to carry via arm-soc >> with your ack. > Sure, looks good to me > > Acked-by: Vinod Koul <vinod.koul@intel.com> Thanks a lot. Regards, Santosh
On Thursday 03 October 2013 11:11 AM, Vinod Koul wrote: > On Thu, Oct 03, 2013 at 11:57:59AM -0400, Santosh Shilimkar wrote: >>>> I looked at your next patch which is fixing the TI_EDMA dependency. >>>> If you prefer to merge $subject patch via your tree, thats fine as well. >>>> Juts give me a stable branch targeted for 3.13 and I shall merge your branch >>>> and apply other patches on top of it. >>> Pls merge my fixes branch. I will send that to Linus in day or two... >>> >> Will merge your next to avoid the merge conflict issue. > No pls. I usually rebase my -next so I wont advise that. Fixes wont be so pls > use that and this will be sent to Linus. > opps.. typo ... I mean fixes branch. Regards, Santosh
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 526ec77..b1dde16 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -195,7 +195,7 @@ config SIRF_DMA config TI_EDMA bool "TI EDMA support" - depends on ARCH_DAVINCI || ARCH_OMAP + depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE select DMA_ENGINE select DMA_VIRTUAL_CHANNELS default n
Allow the TI_EDMA to be built for ARCH_KEYSTONE which also supports the EDMA IP. Cc: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> --- Vinod, I need your ack on this patch to carry $subject patch via arm-soc tree to avoid the unmet dependency warnings. drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)