ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx

PATCH In review Kukjin Kim 1 participant 1 message Jul 27, 2015

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Kukjin Kim

author

2015-07-27 14:58 UTC #0 lore raw

PATCH 11/12 ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx

This patch moves watchdog-reset header file into mach-s3c64xx.

Cc Krzysztof Kozlowski <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/mach-s3c64xx/common.c                                        | 2 +-
 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c                               | 3 +--
 arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h (91%)

arch/arm/mach-s3c64xx/common.c +1 -1

index 316df5a..4a9621b 100644
@@ -50,10 +50,10 @@
 #include <plat/gpio-cfg.h>
 #include <plat/pwm-core.h>
 #include <plat/regs-irqtype.h>
-#include <plat/watchdog-reset.h>
 
 #include "common.h"
 #include "irq-uart.h"
+#include "watchdog-reset.h"
 
 /* External clock frequency */
 static unsigned long xtal_f = 12000000, xusbxti_f = 48000000;

arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +1 -2

index 2fddf38..ead3766 100644
@@ -15,11 +15,10 @@
 #include <asm/system_misc.h>
 
 #include <plat/cpu.h>
-#include <plat/watchdog-reset.h>
-
 #include <mach/map.h>
 
 #include "common.h"
+#include "watchdog-reset.h"
 
 /*
  * IO mapping for shared system controller IP.

arch/arm/mach-s3c64xx/watchdog-reset.h renamed from arch/arm/plat-samsung/include/plat/watchdog-reset.h +1 -2

similarity index 91%
rename from arch/arm/plat-samsung/include/plat/watchdog-reset.h
rename to arch/arm/mach-s3c64xx/watchdog-reset.h
index 0386b8f..42707df 100644
@@ -1,5 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/watchdog-reset.h
- *
+/*
  * Copyright (c) 2008 Simtec Electronics
  *	Ben Dooks <[email protected]>
  *

Signature · 1 line

2.0.0