| Message ID | 1347860103-4141-27-git-send-email-shawn.guo@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Shawn Thanks for the clean up. Would you like these patches to go via a single tree, presumably, arm-soc? In this case On Mon, 17 Sep 2012, Shawn Guo wrote: > This is a piece of code becoming dead since commit 2c9ba37 ([media] > V4L: mx2_camera: remove unsupported i.MX27 DMA mode, make EMMA > mandatory). It should have been removed together with the commit. > Remove it now. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > Cc: linux-media@vger.kernel.org Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Thanks Guennadi > --- > drivers/media/video/mx2_camera.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c > index 965427f..89c7e28 100644 > --- a/drivers/media/video/mx2_camera.c > +++ b/drivers/media/video/mx2_camera.c > @@ -441,11 +441,9 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) > > csicr1 = CSICR1_MCLKEN; > > - if (cpu_is_mx27()) { > + if (cpu_is_mx27()) > csicr1 |= CSICR1_PRP_IF_EN | CSICR1_FCC | > CSICR1_RXFF_LEVEL(0); > - } else if (cpu_is_mx27()) > - csicr1 |= CSICR1_SOF_INTEN | CSICR1_RXFF_LEVEL(2); > > pcdev->csicr1 = csicr1; > writel(pcdev->csicr1, pcdev->base_csi + CSICR1); > -- > 1.7.9.5 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/
On 17 September 2012 10:18, Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote: > Hi Shawn > > Thanks for the clean up. Would you like these patches to go via a single > tree, presumably, arm-soc? In this case > > On Mon, 17 Sep 2012, Shawn Guo wrote: > >> This is a piece of code becoming dead since commit 2c9ba37 ([media] >> V4L: mx2_camera: remove unsupported i.MX27 DMA mode, make EMMA >> mandatory). It should have been removed together with the commit. >> Remove it now. >> >> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> >> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >> Cc: linux-media@vger.kernel.org > Acked-by: Javier Martin <javier.martin@vista-silicon.com> > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > Thanks > Guennadi > >> --- >> drivers/media/video/mx2_camera.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c >> index 965427f..89c7e28 100644 >> --- a/drivers/media/video/mx2_camera.c >> +++ b/drivers/media/video/mx2_camera.c >> @@ -441,11 +441,9 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) >> >> csicr1 = CSICR1_MCLKEN; >> >> - if (cpu_is_mx27()) { >> + if (cpu_is_mx27()) >> csicr1 |= CSICR1_PRP_IF_EN | CSICR1_FCC | >> CSICR1_RXFF_LEVEL(0); >> - } else if (cpu_is_mx27()) >> - csicr1 |= CSICR1_SOF_INTEN | CSICR1_RXFF_LEVEL(2); >> >> pcdev->csicr1 = csicr1; >> writel(pcdev->csicr1, pcdev->base_csi + CSICR1); >> -- >> 1.7.9.5 >> > > --- > Guennadi Liakhovetski, Ph.D. > Freelance Open-Source Software Developer > http://www.open-technology.de/ > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Sep 17, 2012 at 10:18:42AM +0200, Guennadi Liakhovetski wrote: > Hi Shawn > > Thanks for the clean up. Would you like these patches to go via a single > tree, presumably, arm-soc? In this case > Yes, to save the cross-tree dependency, I would like to have the series go via arm-soc tree as a whole. > On Mon, 17 Sep 2012, Shawn Guo wrote: > > > This is a piece of code becoming dead since commit 2c9ba37 ([media] > > V4L: mx2_camera: remove unsupported i.MX27 DMA mode, make EMMA > > mandatory). It should have been removed together with the commit. > > Remove it now. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > Cc: linux-media@vger.kernel.org > > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > Thanks, Guennadi.
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 965427f..89c7e28 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -441,11 +441,9 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) csicr1 = CSICR1_MCLKEN; - if (cpu_is_mx27()) { + if (cpu_is_mx27()) csicr1 |= CSICR1_PRP_IF_EN | CSICR1_FCC | CSICR1_RXFF_LEVEL(0); - } else if (cpu_is_mx27()) - csicr1 |= CSICR1_SOF_INTEN | CSICR1_RXFF_LEVEL(2); pcdev->csicr1 = csicr1; writel(pcdev->csicr1, pcdev->base_csi + CSICR1);
This is a piece of code becoming dead since commit 2c9ba37 ([media] V4L: mx2_camera: remove unsupported i.MX27 DMA mode, make EMMA mandatory). It should have been removed together with the commit. Remove it now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: linux-media@vger.kernel.org --- drivers/media/video/mx2_camera.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)