> -----Original Message----- > From: Cousson, Benoit > Sent: Tuesday, November 23, 2010 11:21 PM > To: DebBarma, Tarun Kanti > Cc: linux-omap@xxxxxxxxxxxxxxx; Gopinath, Thara; Basak, Partha > Subject: Re: [PATCHv4 11/14] OMAP2+: dmtimer: convert to platform devices > > On 11/20/2010 3:39 AM, Tarun Kanti DebBarma wrote: > > From: Thara Gopinath<thara@xxxxxx> > > > > Add routines to converts dmtimers to platform devices. The device data > > is obtained from hwmod database of respective platform and is registered > > to device model after successful binding to driver. It also provides > > provision to access timers during early boot when pm_runtime framework > > is not completely up and running. > > > > Signed-off-by: Thara Gopinath<thara@xxxxxx> > > Signed-off-by: Tarun Kanti DebBarma<tarun.kanti@xxxxxx> > > [p-basak2@xxxxxx: pm_runtime logic] > > Signed-off-by: Partha Basak<p-basak2@xxxxxx> > > --- > > arch/arm/mach-omap2/Makefile | 2 +- > > arch/arm/mach-omap2/dmtimer.c | 296 > +++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 297 insertions(+), 1 deletions(-) > > create mode 100644 arch/arm/mach-omap2/dmtimer.c > > > > diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile > > index ce7b1f0..148f4d7 100644 > > --- a/arch/arm/mach-omap2/Makefile > > +++ b/arch/arm/mach-omap2/Makefile > > @@ -4,7 +4,7 @@ > > > > # Common support > > obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer- > gp.o pm.o \ > > - common.o > > + common.o dmtimer.o > > > > omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o > > hwmod-common = omap_hwmod.o \ > > diff --git a/arch/arm/mach-omap2/dmtimer.c b/arch/arm/mach- > omap2/dmtimer.c > > new file mode 100644 > > index 0000000..b5951b1 > > --- /dev/null > > +++ b/arch/arm/mach-omap2/dmtimer.c > > @@ -0,0 +1,296 @@ > > +/** > > + * OMAP2PLUS Dual-Mode Timers - platform device registration > > + * > > + * Contains first level initialization routines which extracts timers > > + * information from hwmod database and registers with linux device > model. > > + * It also has low level function to chnage the timer input clock > source. > > typo. Will change. > > > + * > > + * Copyright (C) 2010 Texas Instruments Incorporated - > http://www.ti.com/ > > + * Tarun Kanti DebBarma<tarun.kanti@xxxxxx> > > + * > > + * Copyright (C) 2010 Texas Instruments Incorporated > > + * Thara Gopinath<thara@xxxxxx> > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 as > > + * published by the Free Software Foundation. > > + * > > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > > + * kind, whether express or implied; without even the implied warranty > > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + */ > > +#undef DEBUG > > I guess, that undef should not be there? Will remove. > > > + > > +#include<linux/clk.h> > > +#include<linux/delay.h> > > +#include<linux/io.h> > > +#include<linux/err.h> > > +#include<linux/slab.h> > > + > > +#include<mach/irqs.h> > > Do you still need that? It have been already removed. Thanks. > > > +#include<plat/dmtimer.h> > > +#include<plat/powerdomain.h> > > Why do you need powerdomain in that file? This is also removed. After code optimization and cleanup this got missed. > > > +#include<plat/omap_hwmod.h> > > +#include<plat/omap_device.h> > > +#include<linux/pm_runtime.h> > > + > > +static int early_timer_count __initdata = 1; > > + > > +/** > > + * omap2_dm_timer_set_src - change the timer input clock source > > + * @pdev: timer platform device pointer > > + * @timer_clk: current clock source > > + * @source: array index of parent clock source > > + */ > > +static int omap2_dm_timer_set_src(struct platform_device *pdev, int > source) > > +{ > > + int ret; > > + struct dmtimer_platform_data *pdata = pdev->dev.platform_data; > > + struct clk *fclk = clk_get(&pdev->dev, "fck"); > > + struct clk *new_fclk; > > + char *fclk_name = "32k_ck"; /* default name */ > > + > > + switch(source) { > > + case OMAP_TIMER_SRC_SYS_CLK: > > + fclk_name = "sys_ck"; > > + break; > > + > > + case OMAP_TIMER_SRC_32_KHZ: > > + fclk_name = "32k_ck"; > > + break; > > + > > + case OMAP_TIMER_SRC_EXT_CLK: > > + if (pdata->timer_ip_type == OMAP_TIMER_IP_VERSION_1) { > > + fclk_name = "alt_ck"; > > + break; > > + } > > + dev_dbg(&pdev->dev, "%s:%d: invalid clk src.\n", > > + __func__, __LINE__); > > + return -EINVAL; > > + } > > Do you really have to maintain the source enum? Cannot you just pass the > char* to this API? > It will avoid that code, and make that API much more flexible if we have > to add extra clock source in the future. > If the clock does not exist in a particular Soc, the clk_get will fail > and that's all you have to know. Right now the exported APIs use integer constants to identify different Sources. So this can not be changed without wider implications. Besides I have seen Paul Walmsley implementing in this way. So you can suggest and I am OK. > > > + > > + > > + if (IS_ERR_OR_NULL(fclk)) { > > + dev_dbg(&pdev->dev, "%s:%d: clk_get() FAILED\n", > > + __func__, __LINE__); > > + return -EINVAL; > > + } > > + > > + new_fclk = clk_get(&pdev->dev, fclk_name); > > + if (IS_ERR_OR_NULL(new_fclk)) { > > + dev_dbg(&pdev->dev, "%s:%d: clk_get() %s FAILED\n", > > + __func__, __LINE__, fclk_name); > > + clk_put(fclk); > > + return -EINVAL; > > + } > > + > > + ret = clk_set_parent(fclk, new_fclk); > > + if (IS_ERR_VALUE(ret)) { > > + dev_dbg(&pdev->dev, "%s:clk_set_parent() to %s FAILED\n", > > + __func__, fclk_name); > > + ret = -EINVAL; > > + } > > + > > + clk_put(new_fclk); > > + clk_put(fclk); > > + > > + return ret; > > +} > > + > > +struct omap_device_pm_latency omap2_dmtimer_latency[] = { > > + { > > + .deactivate_func = omap_device_idle_hwmods, > > + .activate_func = omap_device_enable_hwmods, > > + .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, > > + }, > > +}; > > + > > +/** > > + * omap_dm_timer_early_init - build and register early timer device > > + * with an associated timer hwmod > > + * @oh: timer hwmod pointer to be used to build timer device > > + * @user: parameter that can be passed from calling hwmod API > > + * > > + * early init is called in the last part of omap2_init_common_hw > > + * for each early timer class using omap_hwmod_for_each_by_class. > > + * it registers each of the timer devices present in the system. > > typo: It > > > + * at the end of function call memory is allocated for omap_device > > Typo: At... There are tons of typo like that in your patches, so I'm not > going to highlight them all. You should do a check of the whole series. Yes, I will make the correction. > > > + * and hwmod for early timer and the device is registered to the > > + * framework ready to be probed by the driver. > > + */ > > +static int __init omap2_timer_early_init(struct omap_hwmod *oh, void > *user) > > +{ > > + int id; > > + int ret = 0; > > + char *name = "omap-timer"; > > Please use "omap_timer" instead in order to be consistent with other > omap devices. Yes, I have already made the change. > > > + struct dmtimer_platform_data *pdata; > > + struct omap_device *od; > > + > > + pr_debug("%s:%s\n", __func__, oh->name); > > + > > + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); > > + if (!pdata) { > > + pr_err("%s: No memory for [%s]\n", __func__, oh->name); > > + return -ENOMEM; > > + } > > + > > + pdata->is_early_init = 1; > > + > > + /* hook clock set/get functions */ > > + pdata->set_timer_src = omap2_dm_timer_set_src; > > + > > + /* read timer ip version */ > > + pdata->timer_ip_type = oh->class->rev; > > + if (pdata->timer_ip_type == OMAP_TIMER_IP_VERSION_2) { > > + pdata->func_offst = 0x14; > > + pdata->intr_offst = 0x10; > > You should use the defines here instead of the hard coded values. > XXX_TIOCP_CFG, XXX_IRQSTATUS_RAW - XXX_TIOCP_CFG... Ok. > > > + } else { > > + pdata->func_offst = 0; > > + pdata->intr_offst = 0; > > + } > > + > > + /* > > + * extract the id from name filed in hwmod database > > + * and use the same for constructing ids' for the > > + * timer devices. in a way, we are avoiding usage of > > + * static variable witin the function to do the same. > > + * CAUTION: we have to be careful and make sure the > > + * name in hwmod database does not change in which case > > + * we might either make corresponding change here or > > + * switch back static variable mechanism. > > + */ > > + sscanf(oh->name, "timer%2d",&id); > > + > > + od = omap_device_build(name, id, oh, pdata, sizeof(*pdata), > > + omap2_dmtimer_latency, > > + ARRAY_SIZE(omap2_dmtimer_latency), 1); > > + > > + if (IS_ERR(od)) { > > + pr_err("%s: Cant build omap_device for %s:%s.\n", > > + __func__, name, oh->name); > > + ret = -EINVAL; > > + } else > > + early_timer_count++; > > Blank line here. Ok. > > > + /* > > + * pdata can be freed because omap_device_build > > + * creates its own memory pool > > + */ > > + kfree(pdata); > > + > > + return ret; > > +} > > + > > +/** > > + * omap2_dm_timer_init - build and register timer device with an > > + * associated timer hwmod > > + * @oh: timer hwmod pointer to be used to build timer device > > + * @user: parameter that can be passed from calling hwmod API > > + * > > + * called by omap_hwmod_for_each_by_class to register each of the timer > > + * devices present in the system. the number of timer devices is known > > + * by parsing through the hwmod database for a given class name. at the > > + * end of function call memory is allocated for omap_device and hwmod > > + * for timer and the device is registered to the framework ready to be > > + * proved by the driver. > > + */ > > +static int __init omap2_timer_init(struct omap_hwmod *oh, void *user) > > +{ > > + int id; > > + int ret = 0; > > + char *name = "omap-timer"; > > + struct omap_device *od; > > + struct dmtimer_platform_data *pdata; > > + > > + if (!oh) { > > + pr_err("%s:NULL hwmod pointer (oh)\n", __func__); > > + return -EINVAL; > > + } > > + pr_debug("%s:%s\n", __func__, oh->name); > > + > > + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); > > + if (!pdata) { > > + pr_err("%s:No memory for [%s]\n", __func__, oh->name); > > + return -ENOMEM; > > + } > > + > > + pdata->is_early_init = 0; > > + > > + /* hook clock set/get functions */ > > + pdata->set_timer_src = omap2_dm_timer_set_src; > > + > > + /* read timer ip version */ > > + pdata->timer_ip_type = oh->class->rev; > > + if (pdata->timer_ip_type == OMAP_TIMER_IP_VERSION_2) { > > + pdata->func_offst = 0x14; > > + pdata->intr_offst = 0x10; > > + } else { > > + pdata->func_offst = 0; > > + pdata->intr_offst = 0; > > + } > > + > > + /* > > + * extract the id from name filed in hwmod database > > + * and use the same for constructing ids' for the > > + * timer devices. in a way, we are avoiding usage of > > + * static variable witin the function to do the same. > > typo: within Ok. > > > + * CAUTION: we have to be careful and make sure the > > + * name in hwmod database does not change in which case > > + * we might either make corresponding change here or > > + * switch back static variable mechanism. > > + */ > > + sscanf(oh->name, "timer%2d",&id); > > + > > + od = omap_device_build(name, id, oh, > > + pdata, sizeof(*pdata), > > + omap2_dmtimer_latency, > > + ARRAY_SIZE(omap2_dmtimer_latency), 0); > > + > > + if (IS_ERR(od)) { > > + pr_err("%s: Cant build omap_device for %s:%s.\n", > > typo: can't Ok. > > > + __func__, name, oh->name); > > + ret = -EINVAL; > > + } > > Blank line here. Ok. > > > + /* > > + * pdata can be freed because omap_device_build > > + * creates its own memory pool > > + */ > > + kfree(pdata); > > + return ret; > > +} > > That function is a pure duplication of the omap2_timer_early_init one. > You can probably use the "user" extra parameters to handle the small > differences between them (is_early_init). Sounds good! I will try. > > > + > > +/** > > + * omap2_dm_timer_early_init - top level early timer initialization > > + * called in the last part of omap2_init_common_hw > > + * > > + * uses dedicated hwmod api to parse through hwmod database for > > + * given class name and then build and register the timer device. > > + * at the end driver is registered and early probe initiated. > > + */ > > +void __init omap2_dm_timer_early_init(void) > > +{ > > + if (omap_hwmod_for_each_by_class("timer", > > + omap2_timer_early_init, NULL)) { > > For better readability, you'd better not call that function directly in > the if statement. Ok. > > > + pr_debug("%s: device registration FAILED\n", __func__); > > + return; > > + } > > Blank line here. Ok. > > > + early_platform_driver_register_all("earlytimer"); > > + early_platform_driver_probe("earlytimer", early_timer_count, 0); > > +} > > + > > +/** > > + * omap_timer_init - top level timer device initialization > > + * > > + * uses dedicated hwmod api to parse through hwmod database for > > + * given class names and then build and register the timer device. > > + */ > > +static int __init omap2_dmtimer_device_init(void) > > Most of the functions here are using _dm_timer_. You should align this > name too. Ok, thanks. -- Tarun -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
