| Message ID | 1362137873-8827-2-git-send-email-javier.martin@vista-silicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 01, 2013 at 12:37:52PM +0100, Javier Martin wrote: > > Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> > --- > arch/arm/mach-imx/clk-imx27.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c > index 4c1d1e4..0b9664a 100644 > --- a/arch/arm/mach-imx/clk-imx27.c > +++ b/arch/arm/mach-imx/clk-imx27.c > @@ -253,6 +253,8 @@ int __init mx27_clocks_init(unsigned long fref) > clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0"); > clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0"); > clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0"); > + clk_register_clkdev(clk[sahara_ahb_gate], "ahb", "sahara-imx27.0"); > + clk_register_clkdev(clk[sahara_ipg_gate], "ipg", "sahara-imx27.0"); One of the first patches I want to push upstream for the next merge window is this one: https://patchwork.kernel.org/patch/1817741/ So the change above becomes unnecessary Sascha
Hi Sascha, On 4 March 2013 08:53, Sascha Hauer <s.hauer@pengutronix.de> wrote: > On Fri, Mar 01, 2013 at 12:37:52PM +0100, Javier Martin wrote: >> >> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> >> --- >> arch/arm/mach-imx/clk-imx27.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c >> index 4c1d1e4..0b9664a 100644 >> --- a/arch/arm/mach-imx/clk-imx27.c >> +++ b/arch/arm/mach-imx/clk-imx27.c >> @@ -253,6 +253,8 @@ int __init mx27_clocks_init(unsigned long fref) >> clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0"); >> clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0"); >> clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0"); >> + clk_register_clkdev(clk[sahara_ahb_gate], "ahb", "sahara-imx27.0"); >> + clk_register_clkdev(clk[sahara_ipg_gate], "ipg", "sahara-imx27.0"); > > One of the first patches I want to push upstream for the next merge > window is this one: > > https://patchwork.kernel.org/patch/1817741/ > > So the change above becomes unnecessary Very good. Then this patch can be safely dropped.
On Tue, Mar 05, 2013 at 08:48:19AM +0100, javier Martin wrote: > Hi Sascha, > > On 4 March 2013 08:53, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > On Fri, Mar 01, 2013 at 12:37:52PM +0100, Javier Martin wrote: > >> > >> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> > >> --- > >> arch/arm/mach-imx/clk-imx27.c | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c > >> index 4c1d1e4..0b9664a 100644 > >> --- a/arch/arm/mach-imx/clk-imx27.c > >> +++ b/arch/arm/mach-imx/clk-imx27.c > >> @@ -253,6 +253,8 @@ int __init mx27_clocks_init(unsigned long fref) > >> clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0"); > >> clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0"); > >> clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0"); > >> + clk_register_clkdev(clk[sahara_ahb_gate], "ahb", "sahara-imx27.0"); > >> + clk_register_clkdev(clk[sahara_ipg_gate], "ipg", "sahara-imx27.0"); > > > > One of the first patches I want to push upstream for the next merge > > window is this one: > > > > https://patchwork.kernel.org/patch/1817741/ > > > > So the change above becomes unnecessary > > Very good. Then this patch can be safely dropped. So should I take this patch or not? Thanks,
On Sun, Mar 10, 2013 at 04:34:01PM +0800, Herbert Xu wrote: > > > > > > https://patchwork.kernel.org/patch/1817741/ > > > > > > So the change above becomes unnecessary > > > > Very good. Then this patch can be safely dropped. > > So should I take this patch or not? This clk patch, no. The sahara patch, yes, if it is fine for you. Sascha
On Mon, Mar 11, 2013 at 12:08:56AM +0100, Sascha Hauer wrote: > On Sun, Mar 10, 2013 at 04:34:01PM +0800, Herbert Xu wrote: > > > > > > > > https://patchwork.kernel.org/patch/1817741/ > > > > > > > > So the change above becomes unnecessary > > > > > > Very good. Then this patch can be safely dropped. > > > > So should I take this patch or not? > > This clk patch, no. The sahara patch, yes, if it is fine for you. But will the second patch work fine without the first? Thanks,
On Mon, Mar 11, 2013 at 09:19:26AM +0800, Herbert Xu wrote: > On Mon, Mar 11, 2013 at 12:08:56AM +0100, Sascha Hauer wrote: > > On Sun, Mar 10, 2013 at 04:34:01PM +0800, Herbert Xu wrote: > > > > > > > > > > https://patchwork.kernel.org/patch/1817741/ > > > > > > > > > > So the change above becomes unnecessary > > > > > > > > Very good. Then this patch can be safely dropped. > > > > > > So should I take this patch or not? > > > > This clk patch, no. The sahara patch, yes, if it is fine for you. > > But will the second patch work fine without the first? It will work once a device is registered. The necessary clocks for it will be provided by the devicetree then. Sascha
Hi, On 11 March 2013 08:42, Sascha Hauer <s.hauer@pengutronix.de> wrote: > On Mon, Mar 11, 2013 at 09:19:26AM +0800, Herbert Xu wrote: >> On Mon, Mar 11, 2013 at 12:08:56AM +0100, Sascha Hauer wrote: >> > On Sun, Mar 10, 2013 at 04:34:01PM +0800, Herbert Xu wrote: >> > > > > >> > > > > https://patchwork.kernel.org/patch/1817741/ >> > > > > >> > > > > So the change above becomes unnecessary >> > > > >> > > > Very good. Then this patch can be safely dropped. >> > > >> > > So should I take this patch or not? >> > >> > This clk patch, no. The sahara patch, yes, if it is fine for you. >> >> But will the second patch work fine without the first? > > It will work once a device is registered. The necessary clocks for it > will be provided by the devicetree then. As Sascha stated you can safely drop this first patch: [PATCH v3 1/2] i.MX27: Add clock support for SAHARA2. And merge the second one: [PATCH v3 2/2] crypto: sahara: Add driver for SAHARA2 accelerator. Regards.
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c index 4c1d1e4..0b9664a 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c @@ -253,6 +253,8 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0"); clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0"); clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0"); + clk_register_clkdev(clk[sahara_ahb_gate], "ahb", "sahara-imx27.0"); + clk_register_clkdev(clk[sahara_ipg_gate], "ipg", "sahara-imx27.0"); clk_register_clkdev(clk[dma_ahb_gate], "ahb", "imx27-dma"); clk_register_clkdev(clk[dma_ipg_gate], "ipg", "imx27-dma"); clk_register_clkdev(clk[fec_ipg_gate], "ipg", "imx27-fec.0");
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> --- arch/arm/mach-imx/clk-imx27.c | 2 ++ 1 file changed, 2 insertions(+)