| Message ID | 1351598606-8485-1-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | New |
| Headers | show |
Em Tue, 30 Oct 2012 10:03:25 -0200 Fabio Estevam <fabio.estevam@freescale.com> escreveu: > During the clock conversion for mx27 the "per4_gate" clock was missed to get > registered as a dependency of mx2-camera driver. > > In the old mx27 clock driver we used to have: > > DEFINE_CLOCK1(csi_clk, 0, NULL, 0, parent, &csi_clk1, &per4_clk); > > ,so does the same in the new clock driver > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > Acked-by: Sascha Hauer <s.hauer@pengutronix.de> As it seems that those patches depend on some patches at the arm tree, the better is to merge them via -arm tree. So, Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> > --- > Changes since v3: > - Use imx27-camera.0 instead of mx2-camera.0, due to recent changes in the > imx27 clock (commit 27b76486a3: media: mx2_camera: remove cpu_is_xxx by using platform_device_id) > > arch/arm/mach-imx/clk-imx27.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c > index 585ab25..2880bd9 100644 > --- a/arch/arm/mach-imx/clk-imx27.c > +++ b/arch/arm/mach-imx/clk-imx27.c > @@ -224,6 +224,7 @@ int __init mx27_clocks_init(unsigned long fref) > clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0"); > clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0"); > clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0"); > + clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0"); > clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); > clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); > clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc"); Cheers, Mauro
Hi Mauro, On Wed, Oct 31, 2012 at 09:56:32AM -0200, Mauro Carvalho Chehab wrote: > Em Tue, 30 Oct 2012 10:03:25 -0200 > Fabio Estevam <fabio.estevam@freescale.com> escreveu: > > > During the clock conversion for mx27 the "per4_gate" clock was missed to get > > registered as a dependency of mx2-camera driver. > > > > In the old mx27 clock driver we used to have: > > > > DEFINE_CLOCK1(csi_clk, 0, NULL, 0, parent, &csi_clk1, &per4_clk); > > > > ,so does the same in the new clock driver > > > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > Acked-by: Sascha Hauer <s.hauer@pengutronix.de> > > As it seems that those patches depend on some patches at the arm tree, > the better is to merge them via -arm tree. Quoting yourself: > Forgot to comment: as patch 2 relies on this change, the better, IMHO, is > to send both via the same tree. If you decide to do so, please get arm > maintainer's ack, instead, and we can merge both via my tree. That's why Fabio resent these patches with my Ack. You are free to take these. Sascha
Hi Sascha, On Wed, Oct 31, 2012 at 11:16 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > Quoting yourself: > >> Forgot to comment: as patch 2 relies on this change, the better, IMHO, is >> to send both via the same tree. If you decide to do so, please get arm >> maintainer's ack, instead, and we can merge both via my tree. > > That's why Fabio resent these patches with my Ack. You are free to take > these. I have just realized that this patch (1/2) will not apply against media tree because it does not have commit 27b76486a3 (media: mx2_camera: remove cpu_is_xxx by using platform_device_id), which changes from mx2_camera.0 to imx27-camera.0. So it seems to be better to merge this via arm tree to avoid such conflict. Regards, Fabio Estevam
On Wed, 31 Oct 2012, Fabio Estevam wrote: > Hi Sascha, > > On Wed, Oct 31, 2012 at 11:16 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > > Quoting yourself: > > > >> Forgot to comment: as patch 2 relies on this change, the better, IMHO, is > >> to send both via the same tree. If you decide to do so, please get arm > >> maintainer's ack, instead, and we can merge both via my tree. > > > > That's why Fabio resent these patches with my Ack. You are free to take > > these. > > I have just realized that this patch (1/2) will not apply against > media tree because it does not have commit 27b76486a3 (media: > mx2_camera: remove cpu_is_xxx by using platform_device_id), which > changes from mx2_camera.0 to imx27-camera.0. This is exactly the reason why I wasn't able to merge it. The problem was, that this "media: mx2_camera: remove cpu_is_xxx by using platform_device_id" patch non-trivially touched both arch/arm/ and drivers/media/ directories. And being patch 27/34 I didn't feel like asking the author to redo it again:-) This confirms, that it's better to avoid such overlapping patches whenever possible. > So it seems to be better to merge this via arm tree to avoid such conflict. Thanks Guennadi > Regards, > > Fabio Estevam --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/
Em Wed, 31 Oct 2012 14:53:47 +0100 (CET) Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu: > On Wed, 31 Oct 2012, Fabio Estevam wrote: > > > Hi Sascha, > > > > On Wed, Oct 31, 2012 at 11:16 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > > > > Quoting yourself: > > > > > >> Forgot to comment: as patch 2 relies on this change, the better, IMHO, is > > >> to send both via the same tree. If you decide to do so, please get arm > > >> maintainer's ack, instead, and we can merge both via my tree. > > > > > > That's why Fabio resent these patches with my Ack. You are free to take > > > these. > > > > I have just realized that this patch (1/2) will not apply against > > media tree because it does not have commit 27b76486a3 (media: > > mx2_camera: remove cpu_is_xxx by using platform_device_id), which > > changes from mx2_camera.0 to imx27-camera.0. > > This is exactly the reason why I wasn't able to merge it. The problem was, > that this "media: mx2_camera: remove cpu_is_xxx by using > platform_device_id" patch non-trivially touched both arch/arm/ and > drivers/media/ directories. And being patch 27/34 I didn't feel like > asking the author to redo it again:-) This confirms, that it's better to > avoid such overlapping patches whenever possible. > > > So it seems to be better to merge this via arm tree to avoid such conflict. I agree with Fabio and Guennadi. There are so many changes happening at arm that merging those two patches there will likely be easier for everybody. Otherwise, I'll need to pull from some arm tree that never rebase, with the needed patches, and coordinate with you during the merge window, to be sure that patches will arrive there at the right order, from the right tree. Cheers, Mauro
On Wed, Oct 31, 2012 at 04:53:03PM -0200, Mauro Carvalho Chehab wrote: > Em Wed, 31 Oct 2012 14:53:47 +0100 (CET) > Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu: > > > On Wed, 31 Oct 2012, Fabio Estevam wrote: > > > > > Hi Sascha, > > > > > > On Wed, Oct 31, 2012 at 11:16 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > > > > > > Quoting yourself: > > > > > > > >> Forgot to comment: as patch 2 relies on this change, the better, IMHO, is > > > >> to send both via the same tree. If you decide to do so, please get arm > > > >> maintainer's ack, instead, and we can merge both via my tree. > > > > > > > > That's why Fabio resent these patches with my Ack. You are free to take > > > > these. > > > > > > I have just realized that this patch (1/2) will not apply against > > > media tree because it does not have commit 27b76486a3 (media: > > > mx2_camera: remove cpu_is_xxx by using platform_device_id), which > > > changes from mx2_camera.0 to imx27-camera.0. > > > > This is exactly the reason why I wasn't able to merge it. The problem was, > > that this "media: mx2_camera: remove cpu_is_xxx by using > > platform_device_id" patch non-trivially touched both arch/arm/ and > > drivers/media/ directories. And being patch 27/34 I didn't feel like > > asking the author to redo it again:-) This confirms, that it's better to > > avoid such overlapping patches whenever possible. > > > > > So it seems to be better to merge this via arm tree to avoid such conflict. > > I agree with Fabio and Guennadi. There are so many changes happening at arm > that merging those two patches there will likely be easier for everybody. Ok, then I'll take them. I wasn't aware in arm-soc are sitting patches for this driver already. > > Otherwise, I'll need to pull from some arm tree that never rebase, with > the needed patches, and coordinate with you during the merge window, > to be sure that patches will arrive there at the right order, from the > right tree. Hopefully these kind of cross dependencies become fewer over time. SoC code is getting smaller and gets better abstracted from the drivers, so chances are good. Sascha
Em Wed, 31 Oct 2012 20:02:49 +0100 Sascha Hauer <s.hauer@pengutronix.de> escreveu: > On Wed, Oct 31, 2012 at 04:53:03PM -0200, Mauro Carvalho Chehab wrote: > > Em Wed, 31 Oct 2012 14:53:47 +0100 (CET) > > Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu: > > > > > On Wed, 31 Oct 2012, Fabio Estevam wrote: > > I agree with Fabio and Guennadi. There are so many changes happening at arm > > that merging those two patches there will likely be easier for everybody. > > Ok, then I'll take them. I wasn't aware in arm-soc are sitting patches > for this driver already. Thank you! > > > > Otherwise, I'll need to pull from some arm tree that never rebase, with > > the needed patches, and coordinate with you during the merge window, > > to be sure that patches will arrive there at the right order, from the > > right tree. > > Hopefully these kind of cross dependencies become fewer over time. SoC > code is getting smaller and gets better abstracted from the drivers, so > chances are good. Yes, I'm expecting so. Regards, Mauro
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c index 585ab25..2880bd9 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c @@ -224,6 +224,7 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0"); clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0"); clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0"); + clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0"); clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc");