From 624af2fa16989dc23bf71ecbe04670fc8f8bb141 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 19 Aug 2010 15:41:20 +0900 Subject: [PATCH] s5p: watchdog: use accessor function Signed-off-by: Minkyu Kang --- arch/arm/cpu/armv7/s5p-common/usb_downloader.c | 7 +------ arch/arm/include/asm/arch-s5pc1xx/cpu.h | 1 + arch/arm/include/asm/arch-s5pc2xx/cpu.h | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv7/s5p-common/usb_downloader.c b/arch/arm/cpu/armv7/s5p-common/usb_downloader.c index e747541..5392e86 100644 --- a/arch/arm/cpu/armv7/s5p-common/usb_downloader.c +++ b/arch/arm/cpu/armv7/s5p-common/usb_downloader.c @@ -49,12 +49,7 @@ extern void s5pc_fimd_window_off(unsigned int win_id); void s5pc1xx_wdt_reset(void) { - unsigned long wdt_base; - - if (cpu_is_s5pc110()) - wdt_base = S5PC110_WATCHDOG_BASE; - else - wdt_base = S5PC100_WATCHDOG_BASE; + unsigned long wdt_base = samsung_get_base_watchdog(); /* * WTCON diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h index 27d57a4..87c5059 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/cpu.h +++ b/arch/arm/include/asm/arch-s5pc1xx/cpu.h @@ -102,6 +102,7 @@ SAMSUNG_BASE(timer, PWMTIMER_BASE) SAMSUNG_BASE(uart, UART_BASE) SAMSUNG_BASE(usb_phy, USBPHY_BASE) SAMSUNG_BASE(usb_otg, USBOTG_BASE) +SAMSUNG_BASE(watchdog, WATCHDOG_BASE) extern unsigned int s5p_cpu_rev; diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-s5pc2xx/cpu.h index 57f2e47..47554bb 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/cpu.h +++ b/arch/arm/include/asm/arch-s5pc2xx/cpu.h @@ -77,6 +77,7 @@ SAMSUNG_BASE(timer, PWMTIMER_BASE) SAMSUNG_BASE(uart, UART_BASE) SAMSUNG_BASE(usb_phy, USBPHY_BASE) SAMSUNG_BASE(usb_otg, USBOTG_BASE) +SAMSUNG_BASE(watchdog, WATCHDOG_BASE) extern unsigned int s5p_cpu_rev; -- 2.7.4