Patchwork [U-Boot,07/10] dm: wdt: Move s5p watchdog timer to drivers/watchdog/

login
register
mail settings
Submitter Marek Vasut
Date July 21, 2012, 3:02 p.m.
Message ID <1342882947-9174-7-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/172439/
State Accepted
Delegated to: Minkyu Kang
Headers show

Comments

Marek Vasut - July 21, 2012, 3:02 p.m.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David Müller <d.mueller@elsoft.ch>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: U-Boot DM <u-boot-dm@lists.denx.de>
---
 arch/arm/cpu/armv7/s5p-common/Makefile                            |    1 -
 drivers/watchdog/Makefile                                         |    1 +
 arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c |    0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%)

diff --git a/arch/arm/cpu/armv7/s5p-common/wdt.c b/drivers/watchdog/s5p_wdt.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/wdt.c
rename to drivers/watchdog/s5p_wdt.c
Minkyu Kang - Oct. 26, 2012, 7:33 a.m.
Dear Marek,

On 22 July 2012 00:02, Marek Vasut <marex@denx.de> wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: David Müller <d.mueller@elsoft.ch>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: U-Boot DM <u-boot-dm@lists.denx.de>
> ---
>  arch/arm/cpu/armv7/s5p-common/Makefile                            |    1 -
>  drivers/watchdog/Makefile                                         |    1 +
>  arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c |    0
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%)
>

applied to u-boot-samsung.

Thanks.
Minkyu Kang.
Marek Vasut - Oct. 26, 2012, 10:23 a.m.
Dear Minkyu Kang,

> Dear Marek,
> 
> On 22 July 2012 00:02, Marek Vasut <marex@denx.de> wrote:
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: David Müller <d.mueller@elsoft.ch>
> > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > Cc: Wolfgang Denk <wd@denx.de>
> > Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> > Cc: U-Boot DM <u-boot-dm@lists.denx.de>
> > ---
> > 
> >  arch/arm/cpu/armv7/s5p-common/Makefile                            |    1
> >  - drivers/watchdog/Makefile                                         |  
> >   1 + arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c
> >  |    0 3 files changed, 1 insertion(+), 1 deletion(-)
> >  rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c
> >  (100%)
> 
> applied to u-boot-samsung.

Good, thanks! Please don't forget to clean up patchwork too (if you didn't 
already).

Best regards,
Marek Vasut

Patch

diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile
index f975f3f..1705399 100644
--- a/arch/arm/cpu/armv7/s5p-common/Makefile
+++ b/arch/arm/cpu/armv7/s5p-common/Makefile
@@ -28,7 +28,6 @@  LIB	= $(obj)libs5p-common.o
 COBJS-y		+= cpu_info.o
 COBJS-y		+= timer.o
 COBJS-y		+= sromc.o
-COBJS-y		+= wdt.o
 COBJS-$(CONFIG_PWM)	+= pwm.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 923acb9..bc09123 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -28,6 +28,7 @@  LIB	:= $(obj)libwatchdog.o
 COBJS-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
 COBJS-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
 COBJS-$(CONFIG_TNETV107X_WATCHDOG) += tnetv107x_wdt.o
+COBJS-$(CONFIG_S5P)               += s5p_wdt.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)