All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] MX25 watchdog
@ 2010-06-09 11:06 Baruch Siach
  2010-06-09 11:07 ` [PATCH 1/3] mx25: add watchdog clock Baruch Siach
                   ` (3 more replies)
  0 siblings, 4 replies; 14+ messages in thread
From: Baruch Siach @ 2010-06-09 11:06 UTC (permalink / raw)
  To: linux-arm-kernel

This series adds support for the new watchdog driver on the i.MX25 PDK 
platform. A little fix to the watchdog driver itself is also added.

Baruch Siach (3):
  mx25: add watchdog clock
  mx25pdk: register watchdog device
  imx2_wdt: fix section mismatch

 arch/arm/mach-mx25/clock.c        |    2 ++
 arch/arm/mach-mx25/mach-mx25pdk.c |    1 +
 drivers/watchdog/imx2_wdt.c       |    1 -
 3 files changed, 3 insertions(+), 1 deletions(-)

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-09 11:06 [PATCH 0/3] MX25 watchdog Baruch Siach
@ 2010-06-09 11:07 ` Baruch Siach
  2010-06-10  8:10   ` Wolfram Sang
  2010-06-09 11:07 ` [PATCH 2/3] mx25pdk: register watchdog device Baruch Siach
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2010-06-09 11:07 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/mach-mx25/clock.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
index 1550149..f9662d9 100644
--- a/arch/arm/mach-mx25/clock.c
+++ b/arch/arm/mach-mx25/clock.c
@@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
 DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
 DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
 DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
+DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);
 
 #define _REGISTER_CLOCK(d, n, c)	\
 	{				\
@@ -225,6 +226,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
 	_REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
 	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
+	_REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
 };
 
 int __init mx25_clocks_init(void)
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 2/3] mx25pdk: register watchdog device
  2010-06-09 11:06 [PATCH 0/3] MX25 watchdog Baruch Siach
  2010-06-09 11:07 ` [PATCH 1/3] mx25: add watchdog clock Baruch Siach
@ 2010-06-09 11:07 ` Baruch Siach
  2010-06-09 11:07 ` [PATCH 3/3] imx2_wdt: fix section mismatch Baruch Siach
  2010-06-10  9:18 ` [PATCH 0/3] MX25 watchdog Wolfram Sang
  3 siblings, 0 replies; 14+ messages in thread
From: Baruch Siach @ 2010-06-09 11:07 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/mach-mx25/mach-mx25pdk.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx25/mach-mx25pdk.c b/arch/arm/mach-mx25/mach-mx25pdk.c
index 83d7410..9ef99f8 100644
--- a/arch/arm/mach-mx25/mach-mx25pdk.c
+++ b/arch/arm/mach-mx25/mach-mx25pdk.c
@@ -147,6 +147,7 @@ static void __init mx25pdk_init(void)
 	mxc_register_device(&mxc_nand_device, &mx25pdk_nand_board_info);
 	mxc_register_device(&mx25_rtc_device, NULL);
 	mxc_register_device(&mx25_fb_device, &mx25pdk_fb_pdata);
+	mxc_register_device(&mxc_wdt, NULL);
 
 	mx25pdk_fec_reset();
 	mxc_register_device(&mx25_fec_device, &mx25_fec_pdata);
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 3/3] imx2_wdt: fix section mismatch
  2010-06-09 11:06 [PATCH 0/3] MX25 watchdog Baruch Siach
  2010-06-09 11:07 ` [PATCH 1/3] mx25: add watchdog clock Baruch Siach
  2010-06-09 11:07 ` [PATCH 2/3] mx25pdk: register watchdog device Baruch Siach
@ 2010-06-09 11:07 ` Baruch Siach
  2010-06-09 19:17   ` Uwe Kleine-König
  2010-06-10 11:25   ` Wim Van Sebroeck
  2010-06-10  9:18 ` [PATCH 0/3] MX25 watchdog Wolfram Sang
  3 siblings, 2 replies; 14+ messages in thread
From: Baruch Siach @ 2010-06-09 11:07 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Cc: Wim Van Sebroeck <wim@iguana.be>
---
 drivers/watchdog/imx2_wdt.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index ea25885..2ee7dac 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -330,7 +330,6 @@ static void imx2_wdt_shutdown(struct platform_device *pdev)
 }
 
 static struct platform_driver imx2_wdt_driver = {
-	.probe		= imx2_wdt_probe,
 	.remove		= __exit_p(imx2_wdt_remove),
 	.shutdown	= imx2_wdt_shutdown,
 	.driver		= {
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 3/3] imx2_wdt: fix section mismatch
  2010-06-09 11:07 ` [PATCH 3/3] imx2_wdt: fix section mismatch Baruch Siach
@ 2010-06-09 19:17   ` Uwe Kleine-König
  2010-06-10 11:25   ` Wim Van Sebroeck
  1 sibling, 0 replies; 14+ messages in thread
From: Uwe Kleine-König @ 2010-06-09 19:17 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jun 09, 2010 at 02:07:02PM +0300, Baruch Siach wrote:
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> Cc: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-09 11:07 ` [PATCH 1/3] mx25: add watchdog clock Baruch Siach
@ 2010-06-10  8:10   ` Wolfram Sang
  2010-06-10  8:18     ` Baruch Siach
  2010-06-10  9:32     ` [PATCH] " Baruch Siach
  0 siblings, 2 replies; 14+ messages in thread
From: Wolfram Sang @ 2010-06-10  8:10 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Baruch,

On Wed, Jun 09, 2010 at 02:07:00PM +0300, Baruch Siach wrote:
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  arch/arm/mach-mx25/clock.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
> index 1550149..f9662d9 100644
> --- a/arch/arm/mach-mx25/clock.c
> +++ b/arch/arm/mach-mx25/clock.c
> @@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
>  DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
>  DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
>  DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
> +DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);

That is clk_gpt1 according to my RM (Rev 1)?

>  
>  #define _REGISTER_CLOCK(d, n, c)	\
>  	{				\
> @@ -225,6 +226,7 @@ static struct clk_lookup lookups[] = {
>  	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
>  	_REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
>  	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
> +	_REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
>  };
>  
>  int __init mx25_clocks_init(void)
> -- 
> 1.7.1
> 

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100610/869bbe0d/attachment.sig>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-10  8:10   ` Wolfram Sang
@ 2010-06-10  8:18     ` Baruch Siach
  2010-06-10  8:21       ` Wolfram Sang
  2010-06-10  9:32     ` [PATCH] " Baruch Siach
  1 sibling, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2010-06-10  8:18 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Wolfram,

On Thu, Jun 10, 2010 at 10:10:42AM +0200, Wolfram Sang wrote:
> On Wed, Jun 09, 2010 at 02:07:00PM +0300, Baruch Siach wrote:
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  arch/arm/mach-mx25/clock.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
> > index 1550149..f9662d9 100644
> > --- a/arch/arm/mach-mx25/clock.c
> > +++ b/arch/arm/mach-mx25/clock.c
> > @@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
> >  DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
> >  DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
> >  DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
> > +DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);
> 
> That is clk_gpt1 according to my RM (Rev 1)?

Right. It should be CCM_CGCR2. I'll fix this.

Note that this bit is marked "Reserved" in the RM. But a look at the Freescale 
supplied BSP reveals the following line in crm_regs.h:

#define MXC_CCM_CGCR2_WDOG_OFFSET        (51-32)

baruch

> >  
> >  #define _REGISTER_CLOCK(d, n, c)	\
> >  	{				\
> > @@ -225,6 +226,7 @@ static struct clk_lookup lookups[] = {
> >  	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
> >  	_REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
> >  	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
> > +	_REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
> >  };
> >  
> >  int __init mx25_clocks_init(void)
> > -- 
> > 1.7.1

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-10  8:18     ` Baruch Siach
@ 2010-06-10  8:21       ` Wolfram Sang
  2010-06-10  8:27         ` Baruch Siach
  0 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2010-06-10  8:21 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jun 10, 2010 at 11:18:06AM +0300, Baruch Siach wrote:
> Hi Wolfram,
> 
> On Thu, Jun 10, 2010 at 10:10:42AM +0200, Wolfram Sang wrote:
> > On Wed, Jun 09, 2010 at 02:07:00PM +0300, Baruch Siach wrote:
> > > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > > ---
> > >  arch/arm/mach-mx25/clock.c |    2 ++
> > >  1 files changed, 2 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
> > > index 1550149..f9662d9 100644
> > > --- a/arch/arm/mach-mx25/clock.c
> > > +++ b/arch/arm/mach-mx25/clock.c
> > > @@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
> > >  DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
> > >  DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
> > >  DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
> > > +DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);
> > 
> > That is clk_gpt1 according to my RM (Rev 1)?
> 
> Right. It should be CCM_CGCR2. I'll fix this.
> 
> Note that this bit is marked "Reserved" in the RM. But a look at the Freescale 
> supplied BSP reveals the following line in crm_regs.h:
> 
> #define MXC_CCM_CGCR2_WDOG_OFFSET        (51-32)

OK. Please add this information also in a short comment above the clock
definition.

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100610/819481d9/attachment.sig>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-10  8:21       ` Wolfram Sang
@ 2010-06-10  8:27         ` Baruch Siach
  2010-06-10  8:34           ` Wolfram Sang
  0 siblings, 1 reply; 14+ messages in thread
From: Baruch Siach @ 2010-06-10  8:27 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Wolfram,
On Thu, Jun 10, 2010 at 10:21:45AM +0200, Wolfram Sang wrote:
> On Thu, Jun 10, 2010 at 11:18:06AM +0300, Baruch Siach wrote:
> > On Thu, Jun 10, 2010 at 10:10:42AM +0200, Wolfram Sang wrote:
> > > On Wed, Jun 09, 2010 at 02:07:00PM +0300, Baruch Siach wrote:
> > > > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > > > ---
> > > >  arch/arm/mach-mx25/clock.c |    2 ++
> > > >  1 files changed, 2 insertions(+), 0 deletions(-)
> > > > 
> > > > diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
> > > > index 1550149..f9662d9 100644
> > > > --- a/arch/arm/mach-mx25/clock.c
> > > > +++ b/arch/arm/mach-mx25/clock.c
> > > > @@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
> > > >  DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
> > > >  DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
> > > >  DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
> > > > +DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);
> > > 
> > > That is clk_gpt1 according to my RM (Rev 1)?
> > 
> > Right. It should be CCM_CGCR2. I'll fix this.
> > 
> > Note that this bit is marked "Reserved" in the RM. But a look at the Freescale 
> > supplied BSP reveals the following line in crm_regs.h:
> > 
> > #define MXC_CCM_CGCR2_WDOG_OFFSET        (51-32)
> 
> OK. Please add this information also in a short comment above the clock
> definition.

There are 12 other IPG clock bit that are wrongly marked "Reserved" in the RM.  
Should we add a comment for each?

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-10  8:27         ` Baruch Siach
@ 2010-06-10  8:34           ` Wolfram Sang
  2010-06-10  8:45             ` Baruch Siach
  0 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2010-06-10  8:34 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jun 10, 2010 at 11:27:56AM +0300, Baruch Siach wrote:
> Hi Wolfram,
> On Thu, Jun 10, 2010 at 10:21:45AM +0200, Wolfram Sang wrote:
> > On Thu, Jun 10, 2010 at 11:18:06AM +0300, Baruch Siach wrote:
> > > On Thu, Jun 10, 2010 at 10:10:42AM +0200, Wolfram Sang wrote:
> > > > On Wed, Jun 09, 2010 at 02:07:00PM +0300, Baruch Siach wrote:
> > > > > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > > > > ---
> > > > >  arch/arm/mach-mx25/clock.c |    2 ++
> > > > >  1 files changed, 2 insertions(+), 0 deletions(-)
> > > > > 
> > > > > diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
> > > > > index 1550149..f9662d9 100644
> > > > > --- a/arch/arm/mach-mx25/clock.c
> > > > > +++ b/arch/arm/mach-mx25/clock.c
> > > > > @@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
> > > > >  DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
> > > > >  DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
> > > > >  DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
> > > > > +DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);
> > > > 
> > > > That is clk_gpt1 according to my RM (Rev 1)?
> > > 
> > > Right. It should be CCM_CGCR2. I'll fix this.
> > > 
> > > Note that this bit is marked "Reserved" in the RM. But a look at the Freescale 
> > > supplied BSP reveals the following line in crm_regs.h:
> > > 
> > > #define MXC_CCM_CGCR2_WDOG_OFFSET        (51-32)
> > 
> > OK. Please add this information also in a short comment above the clock
> > definition.
> 
> There are 12 other IPG clock bit that are wrongly marked "Reserved" in the RM.  
> Should we add a comment for each?

Hmm, an introductory "global" comment should do IMO. Like "Some bits are marked
reserved in the reference manual (v1), but have been used in the official
BSPs, so we copied that". What do you think?

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100610/1619f567/attachment.sig>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 1/3] mx25: add watchdog clock
  2010-06-10  8:34           ` Wolfram Sang
@ 2010-06-10  8:45             ` Baruch Siach
  0 siblings, 0 replies; 14+ messages in thread
From: Baruch Siach @ 2010-06-10  8:45 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jun 10, 2010 at 10:34:54AM +0200, Wolfram Sang wrote:
> On Thu, Jun 10, 2010 at 11:27:56AM +0300, Baruch Siach wrote:
> > Hi Wolfram,
> > On Thu, Jun 10, 2010 at 10:21:45AM +0200, Wolfram Sang wrote:
> > > On Thu, Jun 10, 2010 at 11:18:06AM +0300, Baruch Siach wrote:
> > > > On Thu, Jun 10, 2010 at 10:10:42AM +0200, Wolfram Sang wrote:
> > > > > On Wed, Jun 09, 2010 at 02:07:00PM +0300, Baruch Siach wrote:
> > > > > > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > > > > > ---
> > > > > >  arch/arm/mach-mx25/clock.c |    2 ++
> > > > > >  1 files changed, 2 insertions(+), 0 deletions(-)
> > > > > > 
> > > > > > diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
> > > > > > index 1550149..f9662d9 100644
> > > > > > --- a/arch/arm/mach-mx25/clock.c
> > > > > > +++ b/arch/arm/mach-mx25/clock.c
> > > > > > @@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
> > > > > >  DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
> > > > > >  DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
> > > > > >  DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
> > > > > > +DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR1, 19, get_rate_ipg, NULL,  NULL);
> > > > > 
> > > > > That is clk_gpt1 according to my RM (Rev 1)?
> > > > 
> > > > Right. It should be CCM_CGCR2. I'll fix this.
> > > > 
> > > > Note that this bit is marked "Reserved" in the RM. But a look at the Freescale 
> > > > supplied BSP reveals the following line in crm_regs.h:
> > > > 
> > > > #define MXC_CCM_CGCR2_WDOG_OFFSET        (51-32)
> > > 
> > > OK. Please add this information also in a short comment above the clock
> > > definition.
> > 
> > There are 12 other IPG clock bit that are wrongly marked "Reserved" in the RM.  
> > Should we add a comment for each?
> 
> Hmm, an introductory "global" comment should do IMO. Like "Some bits are marked
> reserved in the reference manual (v1), but have been used in the official
> BSPs, so we copied that". What do you think?

OK. But I think this should be in a separate patch, since this comment covers 
clocks already in use, and some others not yet in use.

I'll post a patch later today.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH 0/3] MX25 watchdog
  2010-06-09 11:06 [PATCH 0/3] MX25 watchdog Baruch Siach
                   ` (2 preceding siblings ...)
  2010-06-09 11:07 ` [PATCH 3/3] imx2_wdt: fix section mismatch Baruch Siach
@ 2010-06-10  9:18 ` Wolfram Sang
  3 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2010-06-10  9:18 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jun 09, 2010 at 02:06:59PM +0300, Baruch Siach wrote:
> This series adds support for the new watchdog driver on the i.MX25 PDK 
> platform. A little fix to the watchdog driver itself is also added.
> 
> Baruch Siach (3):
>   mx25: add watchdog clock
>   mx25pdk: register watchdog device
>   imx2_wdt: fix section mismatch
> 
>  arch/arm/mach-mx25/clock.c        |    2 ++
>  arch/arm/mach-mx25/mach-mx25pdk.c |    1 +
>  drivers/watchdog/imx2_wdt.c       |    1 -
>  3 files changed, 3 insertions(+), 1 deletions(-)

Assuming the fixed register in patch 1, whole series is:

Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100610/f335e6bc/attachment.sig>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH] mx25: add watchdog clock
  2010-06-10  8:10   ` Wolfram Sang
  2010-06-10  8:18     ` Baruch Siach
@ 2010-06-10  9:32     ` Baruch Siach
  1 sibling, 0 replies; 14+ messages in thread
From: Baruch Siach @ 2010-06-10  9:32 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/mach-mx25/clock.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
index 1550149..6342840 100644
--- a/arch/arm/mach-mx25/clock.c
+++ b/arch/arm/mach-mx25/clock.c
@@ -191,6 +191,7 @@ DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
 DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
 DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
 DEFINE_CLOCK(lcdc_clk,	 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk);
+DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR2, 19, get_rate_ipg, NULL,  NULL);
 
 #define _REGISTER_CLOCK(d, n, c)	\
 	{				\
@@ -225,6 +226,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
 	_REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
 	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
+	_REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
 };
 
 int __init mx25_clocks_init(void)
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 3/3] imx2_wdt: fix section mismatch
  2010-06-09 11:07 ` [PATCH 3/3] imx2_wdt: fix section mismatch Baruch Siach
  2010-06-09 19:17   ` Uwe Kleine-König
@ 2010-06-10 11:25   ` Wim Van Sebroeck
  1 sibling, 0 replies; 14+ messages in thread
From: Wim Van Sebroeck @ 2010-06-10 11:25 UTC (permalink / raw)
  To: linux-arm-kernel

> diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
> index ea25885..2ee7dac 100644
> --- a/drivers/watchdog/imx2_wdt.c
> +++ b/drivers/watchdog/imx2_wdt.c
> @@ -330,7 +330,6 @@ static void imx2_wdt_shutdown(struct platform_device *pdev)
>  }
>  
>  static struct platform_driver imx2_wdt_driver = {
> -	.probe		= imx2_wdt_probe,
>  	.remove		= __exit_p(imx2_wdt_remove),
>  	.shutdown	= imx2_wdt_shutdown,
>  	.driver		= {

Added to linux-2.6-watchdog-next.

Kind regards,
Wim.

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-06-10 11:25 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-09 11:06 [PATCH 0/3] MX25 watchdog Baruch Siach
2010-06-09 11:07 ` [PATCH 1/3] mx25: add watchdog clock Baruch Siach
2010-06-10  8:10   ` Wolfram Sang
2010-06-10  8:18     ` Baruch Siach
2010-06-10  8:21       ` Wolfram Sang
2010-06-10  8:27         ` Baruch Siach
2010-06-10  8:34           ` Wolfram Sang
2010-06-10  8:45             ` Baruch Siach
2010-06-10  9:32     ` [PATCH] " Baruch Siach
2010-06-09 11:07 ` [PATCH 2/3] mx25pdk: register watchdog device Baruch Siach
2010-06-09 11:07 ` [PATCH 3/3] imx2_wdt: fix section mismatch Baruch Siach
2010-06-09 19:17   ` Uwe Kleine-König
2010-06-10 11:25   ` Wim Van Sebroeck
2010-06-10  9:18 ` [PATCH 0/3] MX25 watchdog Wolfram Sang

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.