* [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes @ 2010-09-21 8:51 Tarun Kanti DebBarma 2010-09-22 19:00 ` G, Manjunath Kondaiah 2010-09-30 20:16 ` Cousson, Benoit 0 siblings, 2 replies; 7+ messages in thread From: Tarun Kanti DebBarma @ 2010-09-21 8:51 UTC (permalink / raw) To: linux-omap Cc: Thara Gopinath, Partha Basak, Tarun Kanti DebBarma, Cousson, Benoit, Paul Walmsley, Kevin Hilman, Tony Lindgren From: Thara Gopinath <thara@ti.com> This patch adds device name info to OMAP2 dmtimer fclk nodes so that the fclk nodes can be retrieved by doing a clk_get with the corresponding device pointers. Signed-off-by: Partha Basak <p-basak2@ti.com> Signed-off-by: Thara Gopinath <thara@ti.com> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Cc: Cousson, Benoit <b-cousson@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/clock2420_data.c | 26 +++++++++++++++----------- arch/arm/mach-omap2/clock2430_data.c | 26 +++++++++++++++----------- arch/arm/mach-omap2/clock3xxx_data.c | 26 +++++++++++++++----------- arch/arm/mach-omap2/clock44xx_data.c | 24 ++++++++++++++---------- 4 files changed, 59 insertions(+), 43 deletions(-) diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index 37d65d6..6378e6d 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c @@ -1765,29 +1765,33 @@ static struct omap_clk omap2420_clks[] = { CLK(NULL, "virt_prcm_set", &virt_prcm_set, CK_242X), /* general l4 interface ck, multi-parent functional clk */ CLK(NULL, "gpt1_ick", &gpt1_ick, CK_242X), + /* + * gpt1 will be modified in subsequent patch when dmtimers + * will be fully converted to platform device + */ CLK(NULL, "gpt1_fck", &gpt1_fck, CK_242X), CLK(NULL, "gpt2_ick", &gpt2_ick, CK_242X), - CLK(NULL, "gpt2_fck", &gpt2_fck, CK_242X), + CLK("dmtimer.1", "fck", &gpt2_fck, CK_242X), CLK(NULL, "gpt3_ick", &gpt3_ick, CK_242X), - CLK(NULL, "gpt3_fck", &gpt3_fck, CK_242X), + CLK("dmtimer.2", "fck", &gpt3_fck, CK_242X), CLK(NULL, "gpt4_ick", &gpt4_ick, CK_242X), - CLK(NULL, "gpt4_fck", &gpt4_fck, CK_242X), + CLK("dmtimer.3", "fck", &gpt4_fck, CK_242X), CLK(NULL, "gpt5_ick", &gpt5_ick, CK_242X), - CLK(NULL, "gpt5_fck", &gpt5_fck, CK_242X), + CLK("dmtimer.4", "fck", &gpt5_fck, CK_242X), CLK(NULL, "gpt6_ick", &gpt6_ick, CK_242X), - CLK(NULL, "gpt6_fck", &gpt6_fck, CK_242X), + CLK("dmtimer.5", "fck", &gpt6_fck, CK_242X), CLK(NULL, "gpt7_ick", &gpt7_ick, CK_242X), - CLK(NULL, "gpt7_fck", &gpt7_fck, CK_242X), + CLK("dmtimer.6", "fck", &gpt7_fck, CK_242X), CLK(NULL, "gpt8_ick", &gpt8_ick, CK_242X), - CLK(NULL, "gpt8_fck", &gpt8_fck, CK_242X), + CLK("dmtimer.7", "fck", &gpt8_fck, CK_242X), CLK(NULL, "gpt9_ick", &gpt9_ick, CK_242X), - CLK(NULL, "gpt9_fck", &gpt9_fck, CK_242X), + CLK("dmtimer.8", "fck", &gpt9_fck, CK_242X), CLK(NULL, "gpt10_ick", &gpt10_ick, CK_242X), - CLK(NULL, "gpt10_fck", &gpt10_fck, CK_242X), + CLK("dmtimer.9", "fck", &gpt10_fck, CK_242X), CLK(NULL, "gpt11_ick", &gpt11_ick, CK_242X), - CLK(NULL, "gpt11_fck", &gpt11_fck, CK_242X), + CLK("dmtimer.10", "fck", &gpt11_fck, CK_242X), CLK(NULL, "gpt12_ick", &gpt12_ick, CK_242X), - CLK(NULL, "gpt12_fck", &gpt12_fck, CK_242X), + CLK("dmtimer.11", "fck", &gpt12_fck, CK_242X), CLK("omap-mcbsp.1", "ick", &mcbsp1_ick, CK_242X), CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_242X), CLK("omap-mcbsp.2", "ick", &mcbsp2_ick, CK_242X), diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index b33118f..ae9b44e 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c @@ -1851,29 +1851,33 @@ static struct omap_clk omap2430_clks[] = { CLK(NULL, "virt_prcm_set", &virt_prcm_set, CK_243X), /* general l4 interface ck, multi-parent functional clk */ CLK(NULL, "gpt1_ick", &gpt1_ick, CK_243X), + /* + * gpt1 will be modified in subsequent patch when dmtimers + * will be fully converted to platform device + */ CLK(NULL, "gpt1_fck", &gpt1_fck, CK_243X), CLK(NULL, "gpt2_ick", &gpt2_ick, CK_243X), - CLK(NULL, "gpt2_fck", &gpt2_fck, CK_243X), + CLK("dmtimer.1", "fck", &gpt2_fck, CK_243X), CLK(NULL, "gpt3_ick", &gpt3_ick, CK_243X), - CLK(NULL, "gpt3_fck", &gpt3_fck, CK_243X), + CLK("dmtimer.2", "fck", &gpt3_fck, CK_243X), CLK(NULL, "gpt4_ick", &gpt4_ick, CK_243X), - CLK(NULL, "gpt4_fck", &gpt4_fck, CK_243X), + CLK("dmtimer.3", "fck", &gpt4_fck, CK_243X), CLK(NULL, "gpt5_ick", &gpt5_ick, CK_243X), - CLK(NULL, "gpt5_fck", &gpt5_fck, CK_243X), + CLK("dmtimer.4", "fck", &gpt5_fck, CK_243X), CLK(NULL, "gpt6_ick", &gpt6_ick, CK_243X), - CLK(NULL, "gpt6_fck", &gpt6_fck, CK_243X), + CLK("dmtimer.5", "fck", &gpt6_fck, CK_243X), CLK(NULL, "gpt7_ick", &gpt7_ick, CK_243X), - CLK(NULL, "gpt7_fck", &gpt7_fck, CK_243X), + CLK("dmtimer.6", "fck", &gpt7_fck, CK_243X), CLK(NULL, "gpt8_ick", &gpt8_ick, CK_243X), - CLK(NULL, "gpt8_fck", &gpt8_fck, CK_243X), + CLK("dmtimer.7", "fck", &gpt8_fck, CK_243X), CLK(NULL, "gpt9_ick", &gpt9_ick, CK_243X), - CLK(NULL, "gpt9_fck", &gpt9_fck, CK_243X), + CLK("dmtimer.8", "fck", &gpt9_fck, CK_243X), CLK(NULL, "gpt10_ick", &gpt10_ick, CK_243X), - CLK(NULL, "gpt10_fck", &gpt10_fck, CK_243X), + CLK("dmtimer.9", "fck", &gpt10_fck, CK_243X), CLK(NULL, "gpt11_ick", &gpt11_ick, CK_243X), - CLK(NULL, "gpt11_fck", &gpt11_fck, CK_243X), + CLK("dmtimer.10", "fck", &gpt11_fck, CK_243X), CLK(NULL, "gpt12_ick", &gpt12_ick, CK_243X), - CLK(NULL, "gpt12_fck", &gpt12_fck, CK_243X), + CLK("dmtimer.11", "fck", &gpt12_fck, CK_243X), CLK("omap-mcbsp.1", "ick", &mcbsp1_ick, CK_243X), CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_243X), CLK("omap-mcbsp.2", "ick", &mcbsp2_ick, CK_243X), diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index dfdce2d..1cdcaf5 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c @@ -3248,8 +3248,8 @@ static struct omap_clk omap3xxx_clks[] = { CLK(NULL, "modem_fck", &modem_fck, CK_343X), CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X), CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X), - CLK(NULL, "gpt10_fck", &gpt10_fck, CK_3XXX), - CLK(NULL, "gpt11_fck", &gpt11_fck, CK_3XXX), + CLK("dmtimer.9", "fck", &gpt10_fck, CK_3XXX), + CLK("dmtimer.10", "fck", &gpt11_fck, CK_3XXX), CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2 | CK_AM35XX), CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2 | CK_AM35XX), CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX), @@ -3334,6 +3334,10 @@ static struct omap_clk omap3xxx_clks[] = { CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX), CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX), CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2), + /* + * gpt1 will be changed in subsequent patch when dmtimer + * is fully converted to platform device. + */ CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX), CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX), CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_3XXX), @@ -3349,14 +3353,14 @@ static struct omap_clk omap3xxx_clks[] = { CLK(NULL, "per_96m_fck", &per_96m_fck, CK_3XXX), CLK(NULL, "per_48m_fck", &per_48m_fck, CK_3XXX), CLK(NULL, "uart3_fck", &uart3_fck, CK_3XXX), - CLK(NULL, "gpt2_fck", &gpt2_fck, CK_3XXX), - CLK(NULL, "gpt3_fck", &gpt3_fck, CK_3XXX), - CLK(NULL, "gpt4_fck", &gpt4_fck, CK_3XXX), - CLK(NULL, "gpt5_fck", &gpt5_fck, CK_3XXX), - CLK(NULL, "gpt6_fck", &gpt6_fck, CK_3XXX), - CLK(NULL, "gpt7_fck", &gpt7_fck, CK_3XXX), - CLK(NULL, "gpt8_fck", &gpt8_fck, CK_3XXX), - CLK(NULL, "gpt9_fck", &gpt9_fck, CK_3XXX), + CLK("dmtimer.1", "fck", &gpt2_fck, CK_3XXX), + CLK("dmtimer.2", "fck", &gpt3_fck, CK_3XXX), + CLK("dmtimer.3", "fck", &gpt4_fck, CK_3XXX), + CLK("dmtimer.4", "fck", &gpt5_fck, CK_3XXX), + CLK("dmtimer.5", "fck", &gpt6_fck, CK_3XXX), + CLK("dmtimer.6", "fck", &gpt7_fck, CK_3XXX), + CLK("dmtimer.7", "fck", &gpt8_fck, CK_3XXX), + CLK("dmtimer.8", "fck", &gpt9_fck, CK_3XXX), CLK(NULL, "per_32k_alwon_fck", &per_32k_alwon_fck, CK_3XXX), CLK(NULL, "gpio6_dbck", &gpio6_dbck, CK_3XXX), CLK(NULL, "gpio5_dbck", &gpio5_dbck, CK_3XXX), @@ -3396,7 +3400,7 @@ static struct omap_clk omap3xxx_clks[] = { CLK(NULL, "sr2_fck", &sr2_fck, CK_343X), CLK(NULL, "sr_l4_ick", &sr_l4_ick, CK_343X), CLK(NULL, "secure_32k_fck", &secure_32k_fck, CK_3XXX), - CLK(NULL, "gpt12_fck", &gpt12_fck, CK_3XXX), + CLK("dmtimer.11", "fck", &gpt12_fck, CK_3XXX), CLK(NULL, "wdt1_fck", &wdt1_fck, CK_3XXX), CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX), CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX), diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index a0e369e..7398158 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -2574,17 +2574,21 @@ static struct omap_clk omap44xx_clks[] = { CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck, CK_443X), CLK(NULL, "smartreflex_iva_fck", &smartreflex_iva_fck, CK_443X), CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck, CK_443X), + /* + * gpt1 will be changed in subsequent patch when dmtimer + * will be fully converted to platform device. + */ CLK(NULL, "gpt1_fck", &timer1_fck, CK_443X), - CLK(NULL, "gpt10_fck", &timer10_fck, CK_443X), - CLK(NULL, "gpt11_fck", &timer11_fck, CK_443X), - CLK(NULL, "gpt2_fck", &timer2_fck, CK_443X), - CLK(NULL, "gpt3_fck", &timer3_fck, CK_443X), - CLK(NULL, "gpt4_fck", &timer4_fck, CK_443X), - CLK(NULL, "gpt5_fck", &timer5_fck, CK_443X), - CLK(NULL, "gpt6_fck", &timer6_fck, CK_443X), - CLK(NULL, "gpt7_fck", &timer7_fck, CK_443X), - CLK(NULL, "gpt8_fck", &timer8_fck, CK_443X), - CLK(NULL, "gpt9_fck", &timer9_fck, CK_443X), + CLK("dmtimer.9", "fck", &timer10_fck, CK_443X), + CLK("dmtimer.10", "fck", &timer11_fck, CK_443X), + CLK("dmtimer.1", "fck", &timer2_fck, CK_443X), + CLK("dmtimer.2", "fck", &timer3_fck, CK_443X), + CLK("dmtimer.3", "fck", &timer4_fck, CK_443X), + CLK("dmtimer.4", "fck", &timer5_fck, CK_443X), + CLK("dmtimer.5", "fck", &timer6_fck, CK_443X), + CLK("dmtimer.6", "fck", &timer7_fck, CK_443X), + CLK("dmtimer.7", "fck", &timer8_fck, CK_443X), + CLK("dmtimer.8", "fck", &timer9_fck, CK_443X), CLK(NULL, "uart1_fck", &uart1_fck, CK_443X), CLK(NULL, "uart2_fck", &uart2_fck, CK_443X), CLK(NULL, "uart3_fck", &uart3_fck, CK_443X), -- 1.6.0.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes 2010-09-21 8:51 [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes Tarun Kanti DebBarma @ 2010-09-22 19:00 ` G, Manjunath Kondaiah 2010-09-30 20:16 ` Cousson, Benoit 1 sibling, 0 replies; 7+ messages in thread From: G, Manjunath Kondaiah @ 2010-09-22 19:00 UTC (permalink / raw) To: DebBarma, Tarun Kanti, linux-omap@vger.kernel.org Cc: Gopinath, Thara, Basak, Partha, Cousson, Benoit, Paul Walmsley, Kevin Hilman, Tony Lindgren > -----Original Message----- > From: linux-omap-owner@vger.kernel.org > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of > DebBarma, Tarun Kanti > Sent: Tuesday, September 21, 2010 2:21 PM > To: linux-omap@vger.kernel.org > Cc: Gopinath, Thara; Basak, Partha; DebBarma, Tarun Kanti; > Cousson, Benoit; Paul Walmsley; Kevin Hilman; Tony Lindgren > Subject: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to > flck nodes > > From: Thara Gopinath <thara@ti.com> > > This patch adds device name info to OMAP2 dmtimer fclk nodes > so that the fclk nodes can be retrieved by doing a clk_get > with the corresponding device pointers. > > Signed-off-by: Partha Basak <p-basak2@ti.com> > Signed-off-by: Thara Gopinath <thara@ti.com> > Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> > Cc: Cousson, Benoit <b-cousson@ti.com> > Cc: Paul Walmsley <paul@pwsan.com> > Cc: Kevin Hilman <khilman@deeprootsystems.com> > Cc: Tony Lindgren <tony@atomide.com> > --- > arch/arm/mach-omap2/clock2420_data.c | 26 > +++++++++++++++----------- > arch/arm/mach-omap2/clock2430_data.c | 26 > +++++++++++++++----------- > arch/arm/mach-omap2/clock3xxx_data.c | 26 > +++++++++++++++----------- > arch/arm/mach-omap2/clock44xx_data.c | 24 ++++++++++++++---------- > 4 files changed, 59 insertions(+), 43 deletions(-) > > diff --git a/arch/arm/mach-omap2/clock2420_data.c > b/arch/arm/mach-omap2/clock2420_data.c > index 37d65d6..6378e6d 100644 > --- a/arch/arm/mach-omap2/clock2420_data.c > +++ b/arch/arm/mach-omap2/clock2420_data.c > @@ -1765,29 +1765,33 @@ static struct omap_clk omap2420_clks[] = { > CLK(NULL, "virt_prcm_set", &virt_prcm_set, CK_242X), > /* general l4 interface ck, multi-parent functional clk */ > CLK(NULL, "gpt1_ick", &gpt1_ick, CK_242X), > + /* > + * gpt1 will be modified in subsequent patch when dmtimers > + * will be fully converted to platform device > + */ This comment can fit better in patch description instead of putting it in source code. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes 2010-09-21 8:51 [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes Tarun Kanti DebBarma 2010-09-22 19:00 ` G, Manjunath Kondaiah @ 2010-09-30 20:16 ` Cousson, Benoit 2010-10-01 5:26 ` Varadarajan, Charulatha 2010-10-01 15:49 ` Kevin Hilman 1 sibling, 2 replies; 7+ messages in thread From: Cousson, Benoit @ 2010-09-30 20:16 UTC (permalink / raw) To: DebBarma, Tarun Kanti, Paul Walmsley, Kevin Hilman, Tony Lindgren Cc: linux-omap@vger.kernel.org, Gopinath, Thara, Basak, Partha On 9/21/2010 10:51 AM, DebBarma, Tarun Kanti wrote: > From: Thara Gopinath<thara@ti.com> > > This patch adds device name info to OMAP2 dmtimer fclk nodes so You should avoid using "that patch" in a changelog, since we already know it is a patch. You can read 4.c in "The perfect patch" from Andrew Morton: http://userweb.kernel.org/~akpm/stuff/tpp.txt > that the fclk nodes can be retrieved by doing a clk_get with the > corresponding device pointers. ...or device name. > Signed-off-by: Partha Basak<p-basak2@ti.com> > Signed-off-by: Thara Gopinath<thara@ti.com> > Signed-off-by: Tarun Kanti DebBarma<tarun.kanti@ti.com> > Cc: Cousson, Benoit<b-cousson@ti.com> > Cc: Paul Walmsley<paul@pwsan.com> > Cc: Kevin Hilman<khilman@deeprootsystems.com> > Cc: Tony Lindgren<tony@atomide.com> > --- > arch/arm/mach-omap2/clock2420_data.c | 26 +++++++++++++++----------- > arch/arm/mach-omap2/clock2430_data.c | 26 +++++++++++++++----------- > arch/arm/mach-omap2/clock3xxx_data.c | 26 +++++++++++++++----------- > arch/arm/mach-omap2/clock44xx_data.c | 24 ++++++++++++++---------- > 4 files changed, 59 insertions(+), 43 deletions(-) > > diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c > index 37d65d6..6378e6d 100644 > --- a/arch/arm/mach-omap2/clock2420_data.c > +++ b/arch/arm/mach-omap2/clock2420_data.c > @@ -1765,29 +1765,33 @@ static struct omap_clk omap2420_clks[] = { > CLK(NULL, "virt_prcm_set",&virt_prcm_set, CK_242X), > /* general l4 interface ck, multi-parent functional clk */ > CLK(NULL, "gpt1_ick", &gpt1_ick, CK_242X), > + /* > + * gpt1 will be modified in subsequent patch when dmtimers > + * will be fully converted to platform device > + */ > CLK(NULL, "gpt1_fck", &gpt1_fck, CK_242X), > CLK(NULL, "gpt2_ick", &gpt2_ick, CK_242X), > - CLK(NULL, "gpt2_fck", &gpt2_fck, CK_242X), > + CLK("dmtimer.1", "fck", &gpt2_fck, CK_242X), That comment is not necessarily only for you, but do we have to start device id at 0? I think it is really confusing to name the famous gptimer1 device with "dmtimer.0". From that list it looks like this is not even consistent across IPs. McBSP start at 1 for example. Since we are in the name discussion, I'd like as well to potentially stop using the dmtimer / gptimer confusing naming convention, and replace that with a simple name "timer". Or potentially "omap_timer". Dual Mode timer does not mean at lot and General Purpose timer is not that better. We already started that discussion with Kevin some time ago but didn't really conclude. Tony, Paul and Kevin, Do you have any opinion on that subject? Regards, Benoit > CLK(NULL, "gpt3_ick", &gpt3_ick, CK_242X), > - CLK(NULL, "gpt3_fck", &gpt3_fck, CK_242X), > + CLK("dmtimer.2", "fck", &gpt3_fck, CK_242X), > CLK(NULL, "gpt4_ick", &gpt4_ick, CK_242X), > - CLK(NULL, "gpt4_fck", &gpt4_fck, CK_242X), > + CLK("dmtimer.3", "fck", &gpt4_fck, CK_242X), > CLK(NULL, "gpt5_ick", &gpt5_ick, CK_242X), > - CLK(NULL, "gpt5_fck", &gpt5_fck, CK_242X), > + CLK("dmtimer.4", "fck", &gpt5_fck, CK_242X), > CLK(NULL, "gpt6_ick", &gpt6_ick, CK_242X), > - CLK(NULL, "gpt6_fck", &gpt6_fck, CK_242X), > + CLK("dmtimer.5", "fck", &gpt6_fck, CK_242X), > CLK(NULL, "gpt7_ick", &gpt7_ick, CK_242X), > - CLK(NULL, "gpt7_fck", &gpt7_fck, CK_242X), > + CLK("dmtimer.6", "fck", &gpt7_fck, CK_242X), > CLK(NULL, "gpt8_ick", &gpt8_ick, CK_242X), > - CLK(NULL, "gpt8_fck", &gpt8_fck, CK_242X), > + CLK("dmtimer.7", "fck", &gpt8_fck, CK_242X), > CLK(NULL, "gpt9_ick", &gpt9_ick, CK_242X), > - CLK(NULL, "gpt9_fck", &gpt9_fck, CK_242X), > + CLK("dmtimer.8", "fck", &gpt9_fck, CK_242X), > CLK(NULL, "gpt10_ick", &gpt10_ick, CK_242X), > - CLK(NULL, "gpt10_fck", &gpt10_fck, CK_242X), > + CLK("dmtimer.9", "fck", &gpt10_fck, CK_242X), > CLK(NULL, "gpt11_ick", &gpt11_ick, CK_242X), > - CLK(NULL, "gpt11_fck", &gpt11_fck, CK_242X), > + CLK("dmtimer.10", "fck", &gpt11_fck, CK_242X), > CLK(NULL, "gpt12_ick", &gpt12_ick, CK_242X), > - CLK(NULL, "gpt12_fck", &gpt12_fck, CK_242X), > + CLK("dmtimer.11", "fck", &gpt12_fck, CK_242X), > CLK("omap-mcbsp.1", "ick", &mcbsp1_ick, CK_242X), > CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_242X), > CLK("omap-mcbsp.2", "ick", &mcbsp2_ick, CK_242X), > diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c > index b33118f..ae9b44e 100644 > --- a/arch/arm/mach-omap2/clock2430_data.c > +++ b/arch/arm/mach-omap2/clock2430_data.c > @@ -1851,29 +1851,33 @@ static struct omap_clk omap2430_clks[] = { > CLK(NULL, "virt_prcm_set",&virt_prcm_set, CK_243X), > /* general l4 interface ck, multi-parent functional clk */ > CLK(NULL, "gpt1_ick", &gpt1_ick, CK_243X), > + /* > + * gpt1 will be modified in subsequent patch when dmtimers > + * will be fully converted to platform device > + */ > CLK(NULL, "gpt1_fck", &gpt1_fck, CK_243X), > CLK(NULL, "gpt2_ick", &gpt2_ick, CK_243X), > - CLK(NULL, "gpt2_fck", &gpt2_fck, CK_243X), > + CLK("dmtimer.1", "fck", &gpt2_fck, CK_243X), > CLK(NULL, "gpt3_ick", &gpt3_ick, CK_243X), > - CLK(NULL, "gpt3_fck", &gpt3_fck, CK_243X), > + CLK("dmtimer.2", "fck", &gpt3_fck, CK_243X), > CLK(NULL, "gpt4_ick", &gpt4_ick, CK_243X), > - CLK(NULL, "gpt4_fck", &gpt4_fck, CK_243X), > + CLK("dmtimer.3", "fck", &gpt4_fck, CK_243X), > CLK(NULL, "gpt5_ick", &gpt5_ick, CK_243X), > - CLK(NULL, "gpt5_fck", &gpt5_fck, CK_243X), > + CLK("dmtimer.4", "fck", &gpt5_fck, CK_243X), > CLK(NULL, "gpt6_ick", &gpt6_ick, CK_243X), > - CLK(NULL, "gpt6_fck", &gpt6_fck, CK_243X), > + CLK("dmtimer.5", "fck", &gpt6_fck, CK_243X), > CLK(NULL, "gpt7_ick", &gpt7_ick, CK_243X), > - CLK(NULL, "gpt7_fck", &gpt7_fck, CK_243X), > + CLK("dmtimer.6", "fck", &gpt7_fck, CK_243X), > CLK(NULL, "gpt8_ick", &gpt8_ick, CK_243X), > - CLK(NULL, "gpt8_fck", &gpt8_fck, CK_243X), > + CLK("dmtimer.7", "fck", &gpt8_fck, CK_243X), > CLK(NULL, "gpt9_ick", &gpt9_ick, CK_243X), > - CLK(NULL, "gpt9_fck", &gpt9_fck, CK_243X), > + CLK("dmtimer.8", "fck", &gpt9_fck, CK_243X), > CLK(NULL, "gpt10_ick", &gpt10_ick, CK_243X), > - CLK(NULL, "gpt10_fck", &gpt10_fck, CK_243X), > + CLK("dmtimer.9", "fck", &gpt10_fck, CK_243X), > CLK(NULL, "gpt11_ick", &gpt11_ick, CK_243X), > - CLK(NULL, "gpt11_fck", &gpt11_fck, CK_243X), > + CLK("dmtimer.10", "fck", &gpt11_fck, CK_243X), > CLK(NULL, "gpt12_ick", &gpt12_ick, CK_243X), > - CLK(NULL, "gpt12_fck", &gpt12_fck, CK_243X), > + CLK("dmtimer.11", "fck", &gpt12_fck, CK_243X), > CLK("omap-mcbsp.1", "ick", &mcbsp1_ick, CK_243X), > CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_243X), > CLK("omap-mcbsp.2", "ick", &mcbsp2_ick, CK_243X), > diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c > index dfdce2d..1cdcaf5 100644 > --- a/arch/arm/mach-omap2/clock3xxx_data.c > +++ b/arch/arm/mach-omap2/clock3xxx_data.c > @@ -3248,8 +3248,8 @@ static struct omap_clk omap3xxx_clks[] = { > CLK(NULL, "modem_fck", &modem_fck, CK_343X), > CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X), > CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X), > - CLK(NULL, "gpt10_fck", &gpt10_fck, CK_3XXX), > - CLK(NULL, "gpt11_fck", &gpt11_fck, CK_3XXX), > + CLK("dmtimer.9", "fck", &gpt10_fck, CK_3XXX), > + CLK("dmtimer.10", "fck", &gpt11_fck, CK_3XXX), > CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2 | CK_AM35XX), > CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2 | CK_AM35XX), > CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX), > @@ -3334,6 +3334,10 @@ static struct omap_clk omap3xxx_clks[] = { > CLK(NULL, "usbhost_48m_fck",&usbhost_48m_fck, CK_3430ES2 | CK_AM35XX), > CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2 | CK_AM35XX), > CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2), > + /* > + * gpt1 will be changed in subsequent patch when dmtimer > + * is fully converted to platform device. > + */ > CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX), > CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX), > CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_3XXX), > @@ -3349,14 +3353,14 @@ static struct omap_clk omap3xxx_clks[] = { > CLK(NULL, "per_96m_fck", &per_96m_fck, CK_3XXX), > CLK(NULL, "per_48m_fck", &per_48m_fck, CK_3XXX), > CLK(NULL, "uart3_fck", &uart3_fck, CK_3XXX), > - CLK(NULL, "gpt2_fck", &gpt2_fck, CK_3XXX), > - CLK(NULL, "gpt3_fck", &gpt3_fck, CK_3XXX), > - CLK(NULL, "gpt4_fck", &gpt4_fck, CK_3XXX), > - CLK(NULL, "gpt5_fck", &gpt5_fck, CK_3XXX), > - CLK(NULL, "gpt6_fck", &gpt6_fck, CK_3XXX), > - CLK(NULL, "gpt7_fck", &gpt7_fck, CK_3XXX), > - CLK(NULL, "gpt8_fck", &gpt8_fck, CK_3XXX), > - CLK(NULL, "gpt9_fck", &gpt9_fck, CK_3XXX), > + CLK("dmtimer.1", "fck", &gpt2_fck, CK_3XXX), > + CLK("dmtimer.2", "fck", &gpt3_fck, CK_3XXX), > + CLK("dmtimer.3", "fck", &gpt4_fck, CK_3XXX), > + CLK("dmtimer.4", "fck", &gpt5_fck, CK_3XXX), > + CLK("dmtimer.5", "fck", &gpt6_fck, CK_3XXX), > + CLK("dmtimer.6", "fck", &gpt7_fck, CK_3XXX), > + CLK("dmtimer.7", "fck", &gpt8_fck, CK_3XXX), > + CLK("dmtimer.8", "fck", &gpt9_fck, CK_3XXX), > CLK(NULL, "per_32k_alwon_fck",&per_32k_alwon_fck, CK_3XXX), > CLK(NULL, "gpio6_dbck", &gpio6_dbck, CK_3XXX), > CLK(NULL, "gpio5_dbck", &gpio5_dbck, CK_3XXX), > @@ -3396,7 +3400,7 @@ static struct omap_clk omap3xxx_clks[] = { > CLK(NULL, "sr2_fck", &sr2_fck, CK_343X), > CLK(NULL, "sr_l4_ick", &sr_l4_ick, CK_343X), > CLK(NULL, "secure_32k_fck",&secure_32k_fck, CK_3XXX), > - CLK(NULL, "gpt12_fck", &gpt12_fck, CK_3XXX), > + CLK("dmtimer.11", "fck", &gpt12_fck, CK_3XXX), > CLK(NULL, "wdt1_fck", &wdt1_fck, CK_3XXX), > CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX), > CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX), > diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c > index a0e369e..7398158 100644 > --- a/arch/arm/mach-omap2/clock44xx_data.c > +++ b/arch/arm/mach-omap2/clock44xx_data.c > @@ -2574,17 +2574,21 @@ static struct omap_clk omap44xx_clks[] = { > CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck, CK_443X), > CLK(NULL, "smartreflex_iva_fck", &smartreflex_iva_fck, CK_443X), > CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck, CK_443X), > + /* > + * gpt1 will be changed in subsequent patch when dmtimer > + * will be fully converted to platform device. > + */ > CLK(NULL, "gpt1_fck", &timer1_fck, CK_443X), > - CLK(NULL, "gpt10_fck", &timer10_fck, CK_443X), > - CLK(NULL, "gpt11_fck", &timer11_fck, CK_443X), > - CLK(NULL, "gpt2_fck", &timer2_fck, CK_443X), > - CLK(NULL, "gpt3_fck", &timer3_fck, CK_443X), > - CLK(NULL, "gpt4_fck", &timer4_fck, CK_443X), > - CLK(NULL, "gpt5_fck", &timer5_fck, CK_443X), > - CLK(NULL, "gpt6_fck", &timer6_fck, CK_443X), > - CLK(NULL, "gpt7_fck", &timer7_fck, CK_443X), > - CLK(NULL, "gpt8_fck", &timer8_fck, CK_443X), > - CLK(NULL, "gpt9_fck", &timer9_fck, CK_443X), > + CLK("dmtimer.9", "fck", &timer10_fck, CK_443X), > + CLK("dmtimer.10", "fck", &timer11_fck, CK_443X), > + CLK("dmtimer.1", "fck", &timer2_fck, CK_443X), > + CLK("dmtimer.2", "fck", &timer3_fck, CK_443X), > + CLK("dmtimer.3", "fck", &timer4_fck, CK_443X), > + CLK("dmtimer.4", "fck", &timer5_fck, CK_443X), > + CLK("dmtimer.5", "fck", &timer6_fck, CK_443X), > + CLK("dmtimer.6", "fck", &timer7_fck, CK_443X), > + CLK("dmtimer.7", "fck", &timer8_fck, CK_443X), > + CLK("dmtimer.8", "fck", &timer9_fck, CK_443X), > CLK(NULL, "uart1_fck", &uart1_fck, CK_443X), > CLK(NULL, "uart2_fck", &uart2_fck, CK_443X), > CLK(NULL, "uart3_fck", &uart3_fck, CK_443X), ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes 2010-09-30 20:16 ` Cousson, Benoit @ 2010-10-01 5:26 ` Varadarajan, Charulatha 2010-10-01 7:24 ` Cousson, Benoit 2010-10-01 15:49 ` Kevin Hilman 1 sibling, 1 reply; 7+ messages in thread From: Varadarajan, Charulatha @ 2010-10-01 5:26 UTC (permalink / raw) To: Cousson, Benoit Cc: linux-omap@vger.kernel.org, Gopinath, Thara, Basak, Partha, DebBarma, Tarun Kanti, Paul Walmsley, Tony Lindgren, Kevin Hilman Benoit, <<snip>> > > > > This patch adds device name info to OMAP2 dmtimer fclk nodes so > > You should avoid using "that patch" in a changelog, since we already > know it is a patch. > > You can read 4.c in "The perfect patch" from Andrew Morton: > http://userweb.kernel.org/~akpm/stuff/tpp.txt > Referring to 6.b section in the above link, is it a bad idea to have a cover-letter? Should we better include the content of introductory email in patch 1 of any patch series? <<snip>> ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes 2010-10-01 5:26 ` Varadarajan, Charulatha @ 2010-10-01 7:24 ` Cousson, Benoit 2010-10-09 15:00 ` DebBarma, Tarun Kanti 0 siblings, 1 reply; 7+ messages in thread From: Cousson, Benoit @ 2010-10-01 7:24 UTC (permalink / raw) To: Varadarajan, Charulatha Cc: linux-omap@vger.kernel.org, Gopinath, Thara, Basak, Partha, DebBarma, Tarun Kanti, Paul Walmsley, Tony Lindgren, Kevin Hilman Hi Charu, >From: Varadarajan, Charulatha >Sent: Friday, October 01, 2010 7:27 AM > >Benoit, > >> > >> > This patch adds device name info to OMAP2 dmtimer fclk nodes so >> >> You should avoid using "that patch" in a changelog, since we already >> know it is a patch. >> >> You can read 4.c in "The perfect patch" from Andrew Morton: >> http://userweb.kernel.org/~akpm/stuff/tpp.txt >> > >Referring to 6.b section in the above link, is it a bad idea to have >a cover-letter? Should we better include the content of introductory >email in patch 1 of any patch series? I saw it as well, and was a little bit surprised at first. But if you look carefully the rational, it makes sense if you do not take care about the content of the cover-letter. > Please don't do this. There is no facility in the git tree to carry > changelog-only changesets such as this (or at least, we don't do that) so > the information in the introductory email will be lost. > > So I end up copying and pasting your nice introduction into the > changelog for the first patch, so it gets into git. I'll follow it with > the text Here the concern is that some important information can be in the cover-letter but not in the patch changelog, so they will be lost. That issue does not appear if you use the cover-letter only to summarize the patches changelog and to provide the history or the various patch series revision. At the end the history and the patch series revision should no go into the changelog anyway, so it is perfectly fine to lose them. Bottom-line, keep doing cover-letter to summarize the series, but do not put information that should belong to the patch changelog only. Regards, Benoit Texas Instruments France SA, 821 Avenue Jack Kilby, 06270 Villeneuve Loubet. 036 420 040 R.C.S Antibes. Capital de EUR 753.920 ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes 2010-10-01 7:24 ` Cousson, Benoit @ 2010-10-09 15:00 ` DebBarma, Tarun Kanti 0 siblings, 0 replies; 7+ messages in thread From: DebBarma, Tarun Kanti @ 2010-10-09 15:00 UTC (permalink / raw) To: Cousson, Benoit, Varadarajan, Charulatha Cc: linux-omap@vger.kernel.org, Gopinath, Thara, Basak, Partha, Paul Walmsley, Tony Lindgren, Kevin Hilman Benoit, > -----Original Message----- > From: Cousson, Benoit > Sent: Friday, October 01, 2010 12:54 PM > To: Varadarajan, Charulatha > Cc: linux-omap@vger.kernel.org; Gopinath, Thara; Basak, Partha; DebBarma, > Tarun Kanti; Paul Walmsley; Tony Lindgren; Kevin Hilman > Subject: RE: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck > nodes > > Hi Charu, > > >From: Varadarajan, Charulatha > >Sent: Friday, October 01, 2010 7:27 AM > > > >Benoit, > > > >> > > >> > This patch adds device name info to OMAP2 dmtimer fclk nodes so > >> > >> You should avoid using "that patch" in a changelog, since we already > >> know it is a patch. > >> > >> You can read 4.c in "The perfect patch" from Andrew Morton: > >> http://userweb.kernel.org/~akpm/stuff/tpp.txt > >> > > > >Referring to 6.b section in the above link, is it a bad idea to have > >a cover-letter? Should we better include the content of introductory > >email in patch 1 of any patch series? > > I saw it as well, and was a little bit surprised at first. > But if you look carefully the rational, it makes sense if you do not take > care about the content of the cover-letter. > > > Please don't do this. There is no facility in the git tree to carry > > changelog-only changesets such as this (or at least, we don't do > that) so > > the information in the introductory email will be lost. > > > > So I end up copying and pasting your nice introduction into the > > changelog for the first patch, so it gets into git. I'll follow it > with > > the text > > Here the concern is that some important information can be in the cover- > letter but not in the patch changelog, so they will be lost. > That issue does not appear if you use the cover-letter only to summarize > the patches changelog and to provide the history or the various patch > series revision. > At the end the history and the patch series revision should no go into the > changelog anyway, so it is perfectly fine to lose them. > > Bottom-line, keep doing cover-letter to summarize the series, but do not > put information that should belong to the patch changelog only. > Ok, I will take care. -tarun ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes 2010-09-30 20:16 ` Cousson, Benoit 2010-10-01 5:26 ` Varadarajan, Charulatha @ 2010-10-01 15:49 ` Kevin Hilman 1 sibling, 0 replies; 7+ messages in thread From: Kevin Hilman @ 2010-10-01 15:49 UTC (permalink / raw) To: Cousson, Benoit Cc: DebBarma, Tarun Kanti, Paul Walmsley, Tony Lindgren, linux-omap@vger.kernel.org, Gopinath, Thara, Basak, Partha "Cousson, Benoit" <b-cousson@ti.com> writes: [...] > Since we are in the name discussion, I'd like as well to potentially > stop using the dmtimer / gptimer confusing naming convention, and > replace that with a simple name "timer". Or potentially "omap_timer". > Dual Mode timer does not mean at lot and General Purpose timer is not > that better. > > We already started that discussion with Kevin some time ago but didn't > really conclude. > > Tony, Paul and Kevin, > Do you have any opinion on that subject? Since the HW teams have decided on aligned names for all the IPs, I think we should stick with those. In this case, "timer". However, since that is such a generic word and used throughout the kernel, maybe calling it omap_timer is better. I'd live with either, Kevin ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-10-09 15:00 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-21 8:51 [PATCHv3 1/17] OMAP2/3/4:dmtimer:add device names to flck nodes Tarun Kanti DebBarma 2010-09-22 19:00 ` G, Manjunath Kondaiah 2010-09-30 20:16 ` Cousson, Benoit 2010-10-01 5:26 ` Varadarajan, Charulatha 2010-10-01 7:24 ` Cousson, Benoit 2010-10-09 15:00 ` DebBarma, Tarun Kanti 2010-10-01 15:49 ` Kevin Hilman
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.