[9610] samsung: exynos-reboot: fix configuration for reboot

Change-Id: Ia65a09b1beeb5081ef552db6055d41e5928a5751
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/drivers/soc/samsung/exynos-reboot.c b/drivers/soc/samsung/exynos-reboot.c
index 7093681be41e3efaeab172c940d9304b8ee845eb..1bfec6aa25088b09055517ba1f1411ce6edad9ba 100644 (file)
--- a/drivers/soc/samsung/exynos-reboot.c
+++ b/drivers/soc/samsung/exynos-reboot.c
@@ -61,60 +61,59 @@ int soc_has_big(void)
 
 #define CPU_RESET_DISABLE_FROM_SOFTRESET       (0x041C)
 #define CPU_RESET_DISABLE_FROM_WDTRESET        (0x0414)
-       #ifdef CONFIG_SOC_EXYNOS9810
-#define BIG_CPU0_RESET                 (0x3C0C)
-#define BIG_NONCPU_ETC_RESET           (0x3C8C)
-#define        PMU_CPU_OFFSET                  (0x10)
-       #else
 #define BIG_CPU0_RESET                 (0x220C)
 #define BIG_NONCPU_ETC_RESET           (0x242C)
 #define        PMU_CPU_OFFSET                  (0x80)
-       #endif
 #define SWRESET                                (0x0400)
 #define RESET_SEQUENCER_CONFIGURATION  (0x0500)
 #define PS_HOLD_CONTROL                        (0x330C)
 
 /* defines for BIG reset */
-#define PEND_BIG                               (1 << 1)
-#define PEND_LITTLE                            (1 << 0)
+#define PEND_BIG                               (1 << 0)
+#define PEND_LITTLE                            (1 << 1)
 #define DEFAULT_VAL_CPU_RESET_DISABLE          (0xFFFFFFFC)
 #define RESET_DISABLE_GPR_CPUPORESET           (1 << 15)
-#define RESET_DISABLE_WDT_CORERESET            (1 << 13)
 #define RESET_DISABLE_WDT_CPUPORESET           (1 << 12)
 #define RESET_DISABLE_CORERESET                        (1 << 9)
 #define RESET_DISABLE_CPUPORESET               (1 << 8)
+
+#define RESET_DISABLE_WDT_L2RESET              (1 << 31)
 #define RESET_DISABLE_WDT_PRESET_DBG           (1 << 25)
 #define RESET_DISABLE_PRESET_DBG               (1 << 18)
-#define DFD_EDPCSR_DUMP_EN                     (1 << 0)
 #define RESET_DISABLE_L2RESET                  (1 << 16)
-#define RESET_DISABLE_WDT_L2RESET              (1 << 31)
 
 #define DFD_EDPCSR_DUMP_EN                     (1 << 0)
-#define DFD_L2RSTDISABLE_BIG_EN                (1 << 11)
+
+#define DFD_L2RSTDISABLE_BIG_EN                        (1 << 11)
 #define DFD_DBGL1RSTDISABLE_BIG_EN             (1 << 10)
 #define DFD_L2RSTDISABLE_LITTLE_EN             (1 << 9)
-#define DFD_DBGL1RSTDISABLE_LITTLE_EN          (0xF << 24)
+#define DFD_DBGL1RSTDISABLE_LITTLE_EN          (1 << 8)
+
 #define DFD_CLEAR_L2RSTDISABLE_BIG             (1 << 7)
 #define DFD_CLEAR_DBGL1RSTDISABLE_BIG          (1 << 6)
 #define DFD_CLEAR_L2RSTDISABLE_LITTLE          (1 << 5)
-#define DFD_CLEAR_DBGL1RSTDISABLE_LITTLE       (0xF << 20)
+#define DFD_CLEAR_DBGL1RSTDISABLE_LITTLE       (1 << 4)
 
 #define DFD_L2RSTDISABLE               (DFD_L2RSTDISABLE_BIG_EN        \
                                        | DFD_DBGL1RSTDISABLE_BIG_EN    \
                                        | DFD_L2RSTDISABLE_LITTLE_EN    \
                                        | DFD_DBGL1RSTDISABLE_LITTLE_EN)
+
 #define DFD_CLEAR_L2RSTDISABLE         (DFD_CLEAR_L2RSTDISABLE_BIG     \
                                        | DFD_CLEAR_DBGL1RSTDISABLE_BIG \
                                        | DFD_CLEAR_L2RSTDISABLE_LITTLE \
                                        | DFD_CLEAR_DBGL1RSTDISABLE_LITTLE)
+
 #define DFD_RESET_PEND                 (PEND_BIG | PEND_LITTLE)
-#define DFD_DISABLE_RESET              (RESET_DISABLE_WDT_CORERESET    \
-                                       | RESET_DISABLE_WDT_CPUPORESET  \
+
+#define DFD_DISABLE_RESET              (RESET_DISABLE_WDT_CPUPORESET   \
                                        | RESET_DISABLE_CORERESET       \
                                        | RESET_DISABLE_CPUPORESET)
-#define        DFD_BIG_NONCPU_ETC_RESET        (RESET_DISABLE_WDT_PRESET_DBG   \
+
+#define        DFD_BIG_NONCPU_ETC_RESET        (RESET_DISABLE_WDT_L2RESET      \
+                                       | RESET_DISABLE_WDT_PRESET_DBG  \
                                        | RESET_DISABLE_PRESET_DBG      \
-                                       | RESET_DISABLE_WDT_L2RESET)
+                                       | RESET_DISABLE_L2RESET)
 
 static void dfd_set_dump_gpr(int en)
 {