mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Raphaël Poggi" <poggi.raph@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] ARM: i.MX6: UDOO: rename watchdog function
Date: Mon, 24 Feb 2014 09:08:17 +0100	[thread overview]
Message-ID: <20140224080817.GP17250@pengutronix.de> (raw)
In-Reply-To: <1392935821-14783-1-git-send-email-poggi.raph@gmail.com>

Hi Raphaël,

On Thu, Feb 20, 2014 at 02:36:59PM -0800, Raphaël Poggi wrote:
> Rename the watchdog function to fit others functions names.
> 
> Signed-off-by: Raphael Poggi <poggi.raph@gmail.com>
> ---
>  arch/arm/boards/udoo/board.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/boards/udoo/board.c b/arch/arm/boards/udoo/board.c
> index 9027eb1..0a056fb 100644
> --- a/arch/arm/boards/udoo/board.c
> +++ b/arch/arm/boards/udoo/board.c
> @@ -147,7 +147,7 @@ static iomux_v3_cfg_t const wdog_pads[] = {
>  
>  #define WDT_EN      IMX_GPIO_NR(5, 4)
>  #define WDT_TRG     IMX_GPIO_NR(3, 19)
> -static void setup_iomux_wdog(void)
> +static void udoo_wdog_init(void)
>  {
>  	mxc_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
>  	gpio_direction_output(WDT_TRG, 0);
> @@ -157,11 +157,10 @@ static void setup_iomux_wdog(void)
>  
>  static void udoo_epit_init(void)
>  {
> -
> -	writel(0x0000000, 0x20D0000);
> -	writel(0x142000F, 0x20D0000);
> -	writel(0x10000, 0x20D0008);
> -	writel(0x0, 0x20D000C);
> +	writel(0x0000000, MX6_EPIT1_BASE_ADDR);
> +	writel(0x142000F, MX6_EPIT1_BASE_ADDR);
> +	writel(0x30000, MX6_EPIT1_BASE_ADDR + 0x8);
> +	writel(0x0, MX6_EPIT1_BASE_ADDR + 0xC);
>  }

This is an unrelated change which shouldn't be in this patch. I squashed
this series in the original commit adding udoo support anyway. so it
doesn't matter in this case.
BTW what does this EPIT initialization do and what do you need it for?
It's quite unusual to initialize the EPIT since it's not used by
barebox.

Sascha

>  
>  static int udoo_devices_init(void)
> @@ -169,7 +168,7 @@ static int udoo_devices_init(void)
>  	if (!of_machine_is_compatible("udoo,imx6qdl-udoo"))
>  		return 0;
>  
> -	setup_iomux_wdog();
> +	udoo_wdog_init();
>  	udoo_ehci_init();
>  	udoo_epit_init();
>  
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2014-02-24  8:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-20 22:36 Raphaël Poggi
2014-02-20 22:37 ` [PATCH 2/3] ARM: i.MX6: UDOO: Add support of ethernet Raphaël Poggi
2014-02-20 22:37 ` [PATCH 3/3] ARM: i.MX6: UDOO: rename UDOO image file Raphaël Poggi
2014-02-24  8:08 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140224080817.GP17250@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=poggi.raph@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox