2012/12/21 Josh Cartwright <josh.cartwri...@ni.com>: > On Fri, Dec 21, 2012 at 03:28:10PM +0000, Michal Simek wrote: >> >> >> > -----Original Message----- >> > From: Josh Cartwright [mailto:josh.cartwri...@ni.com] >> > Sent: Wednesday, December 19, 2012 9:54 PM >> > To: Stephen Boyd; Michal Simek >> > Cc: Soren Brinkmann; Mike Turquette; linux-kernel@vger.kernel.org; >> > linux-arm- >> > ker...@lists.infradead.org >> > Subject: Re: [PATCH 4/4] clk: zynq: Use of_init_clk_data() >> > >> > On Wed, Dec 19, 2012 at 12:30:21PM -0800, Stephen Boyd wrote: >> > > On 12/19/12 11:22, Soren Brinkmann wrote: >> > [..] >> > > > >> > > > A probably unique thing I do is, I set the status of uart0 to >> > > > disabled. This way I can reuse my rootfs which does not run getty on >> > > > ttyPS1. And this worked fine before. >> > > > >> > > >> > > Thanks for testing. It seems that clocks are failing to register. >> > > Please try this patch. >> > > >> > > --->8----- >> > > >> > > diff --git a/drivers/tty/serial/xilinx_uartps.c >> > > b/drivers/tty/serial/xilinx_uartps.c >> > > index 2be22a2..2734715 100644 >> > > --- a/drivers/tty/serial/xilinx_uartps.c >> > > +++ b/drivers/tty/serial/xilinx_uartps.c >> > > @@ -948,9 +948,9 @@ static int xuartps_probe(struct platform_device >> > > *pdev) >> > > struct clk *clk; >> > > >> > > clk = of_clk_get(pdev->dev.of_node, 0); >> > > - if (!clk) { >> > > - dev_err(&pdev->dev, "no clock specified\n"); >> > > - return -ENODEV; >> > > + if (IS_ERR(clk)) { >> > > + dev_err(&pdev->dev, "failed to get clock\n"); >> > > + return PTR_ERR(clk); >> > > } >> > > >> > > rc = clk_prepare_enable(clk); >> > >> > Yes, indeed. >> > >> > As a side note, this is introduced in my patch "serial: xilinx_uartps: >> > get clock rate info from dts", which is in xilinx/arm-next (and thus in >> > linux-next), >> > but as far as I can tell, didn't ever make it into the arm-soc tree. >> > >> > Michal, did you have plans for pushing this through arm-soc? >> >> I have had this patch in my devel branch for a while. >> It is in arm-next tree right now and I will provide path to mainline. > > Will you be rolling in Stephen's suggestions, or should he/I cook up a > patch on top with the fix in place?
Here is the patch I have applied. http://git.xilinx.com/?p=linux-xlnx.git;a=commit;h=a3607ea56f4455c515201ab91d2304a634925f6c > It probably makes sense to pull the quoted fix above directly into the > patch before it hits mainline, and we can change the use of of_clk_get > as a patch on top. Thoughts? Stephen: Can you please tell me how do you want to add these patches to mainline? Through arm-soc tree? Have you asked for pulling? Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
