[PATCH 1/3] ARM: i.MX6: UDOO: rename watchdog function

Raphaël Poggi poggi.raph at gmail.com
Thu Feb 20 17:36:59 EST 2014


Rename the watchdog function to fit others functions names.

Signed-off-by: Raphael Poggi <poggi.raph at 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




More information about the barebox mailing list