From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Quadros Subject: Re: [PATCH] clk: ti: am43x: Fix boot with CONFIG_SOC_AM33XX disabled Date: Wed, 18 Jun 2014 10:52:05 +0300 Message-ID: <53A14525.5050208@ti.com> References: <1403013804-13522-1-git-send-email-rogerq@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from devils.ext.ti.com ([198.47.26.153]:37622 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932818AbaFRHwK (ORCPT ); Wed, 18 Jun 2014 03:52:10 -0400 In-Reply-To: <1403013804-13522-1-git-send-email-rogerq@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: mturquette@linaro.org, tony@atomide.com Cc: t-kristo@ti.com, nm@ti.com, linux-omap@vger.kernel.org On 06/17/2014 05:03 PM, Roger Quadros wrote: > Define ti_clk_register_dpll_x2() and of_ti_am3_dpll_x2_setup() if > AM43XX is defined. > > Fixes the below boot issue. > > [ 2.157258] gpmc_l3_clk not enabled > [ 2.161194] gpmc_l3_clk not enabled > [ 2.164896] Division by zero in kernel. > [ 2.169055] CPU: 0 PID: 321 Comm: kworker/u2:2 Tainted: G W 3.16.0-rc1-00008-g4c0e520 #273 > [ 2.178880] Workqueue: deferwq deferred_probe_work_func > [ 2.184459] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) > [ 2.192752] [] (show_stack) from [] (dump_stack+0x80/0x9c) > [ 2.200486] [] (dump_stack) from [] (Ldiv0+0x8/0x10) > [ 2.207678] [] (Ldiv0) from [] (gpmc_calc_divider+0x24/0x40) > [ 2.215490] [] (gpmc_calc_divider) from [] (gpmc_cs_set_timings+0x18/0x474) > [ 2.224783] [] (gpmc_cs_set_timings) from [] (gpmc_nand_init+0x74/0x1a8) > [ 2.233791] [] (gpmc_nand_init) from [] (gpmc_probe+0x52c/0x874) > [ 2.242089] [] (gpmc_probe) from [] (platform_drv_probe+0x18/0x48) > [ 2.250534] [] (platform_drv_probe) from [] (driver_probe_device+0x104/0x22c) > [ 2.259988] [] (driver_probe_device) from [] (bus_for_each_drv+0x44/0x8c) > [ 2.269087] [] (bus_for_each_drv) from [] (device_attach+0x74/0x8c) > [ 2.277620] [] (device_attach) from [] (bus_probe_device+0x88/0xb0) > [ 2.286074] [] (bus_probe_device) from [] (deferred_probe_work_func+0x60/0x90) > [ 2.295611] [] (deferred_probe_work_func) from [] (process_one_work+0x1b4/0x4bc) > [ 2.305288] [] (process_one_work) from [] (worker_thread+0x148/0x550) > [ 2.313954] [] (worker_thread) from [] (kthread+0xc8/0xe4) > [ 2.321628] [] (kthread) from [] (ret_from_fork+0x14/0x2c) > Sorry to miss that this was reported by Tony. Reported-by: Tony Lindgren cheers, -roger > Signed-off-by: Roger Quadros > --- > drivers/clk/ti/dpll.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c > index abd956d..79791e1 100644 > --- a/drivers/clk/ti/dpll.c > +++ b/drivers/clk/ti/dpll.c > @@ -161,7 +161,8 @@ cleanup: > } > > #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ > - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM33XX) > + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM33XX) || \ > + defined(CONFIG_SOC_AM43XX) > /** > * ti_clk_register_dpll_x2 - Registers a DPLLx2 clock > * @node: device node for this clock > @@ -322,7 +323,7 @@ CLK_OF_DECLARE(ti_omap4_dpll_x2_clock, "ti,omap4-dpll-x2-clock", > of_ti_omap4_dpll_x2_setup); > #endif > > -#ifdef CONFIG_SOC_AM33XX > +#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX) > static void __init of_ti_am3_dpll_x2_setup(struct device_node *node) > { > ti_clk_register_dpll_x2(node, &dpll_x2_ck_ops, NULL); >