From: "Raphaël Poggi" <poggi.raph@gmail.com>
To: barebox@lists.infradead.org
Cc: "Raphaël Poggi" <poggi.raph@gmail.com>
Subject: [PATCH 1/3] ARM: i.MX6: UDOO: rename watchdog function
Date: Thu, 20 Feb 2014 14:36:59 -0800 [thread overview]
Message-ID: <1392935821-14783-1-git-send-email-poggi.raph@gmail.com> (raw)
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);
}
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
next reply other threads:[~2014-02-20 22:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 22:36 Raphaël Poggi [this message]
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 ` [PATCH 1/3] ARM: i.MX6: UDOO: rename watchdog function Sascha Hauer
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=1392935821-14783-1-git-send-email-poggi.raph@gmail.com \
--to=poggi.raph@gmail.com \
--cc=barebox@lists.infradead.org \
/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