From d3f859d5e530d9fdd56e928247a14b09a256410d Mon Sep 17 00:00:00 2001
From: Kshitiz Godara <quic_kgodara@quicinc.com>
Date: Thu, 23 Jun 2022 17:18:24 +0530
Subject: soc/qualcomm/sc7180: Update hardware watchdog logging

Move watchdog functionality to common folder.

BUG=b:221393157
TEST=None

Signed-off-by: Kshitiz Godara <quic_kgodara@quicinc.com>
Change-Id: Ib2f7f21ce991fd8193329e7b8260e58e47bf39c4
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65358
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/soc/qualcomm/common/include/soc/watchdog.h |  8 ++++++++
 src/soc/qualcomm/common/watchdog.c             | 16 ++++++++++++++++
 src/soc/qualcomm/sc7180/Makefile.inc           |  2 +-
 src/soc/qualcomm/sc7180/include/soc/watchdog.h |  8 --------
 src/soc/qualcomm/sc7180/watchdog.c             | 16 ----------------
 5 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 src/soc/qualcomm/common/include/soc/watchdog.h
 create mode 100644 src/soc/qualcomm/common/watchdog.c
 delete mode 100644 src/soc/qualcomm/sc7180/include/soc/watchdog.h
 delete mode 100644 src/soc/qualcomm/sc7180/watchdog.c

(limited to 'src')

diff --git a/src/soc/qualcomm/common/include/soc/watchdog.h b/src/soc/qualcomm/common/include/soc/watchdog.h
new file mode 100644
index 0000000000..1995e62742
--- /dev/null
+++ b/src/soc/qualcomm/common/include/soc/watchdog.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _SOC_QUALCOMM_WDOG_COMMON_H__
+#define _SOC_QUALCOMM_WDOG_COMMON_H__
+
+void check_wdog(void);
+
+#endif  /* _SOC_QUALCOMM_WDOG_COMMON_H__ */
diff --git a/src/soc/qualcomm/common/watchdog.c b/src/soc/qualcomm/common/watchdog.c
new file mode 100644
index 0000000000..680d70b2d3
--- /dev/null
+++ b/src/soc/qualcomm/common/watchdog.c
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <soc/clock.h>
+#include <soc/watchdog.h>
+#include <device/mmio.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
+#define WDOG_RESET_BIT_MASK		1
+
+void check_wdog(void)
+{
+	uint32_t wdog_sta = read32(&aoss->aoss_cc_reset_status);
+
+	if (wdog_sta & WDOG_RESET_BIT_MASK)
+		mark_watchdog_tombstone();
+}
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index 262abfa392..956d80c207 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -25,8 +25,8 @@ verstage-$(CONFIG_DRIVERS_UART) += ../common/qupv3_uart.c
 
 ################################################################################
 romstage-y += cbmem.c
-romstage-y += watchdog.c
 romstage-y += ../common/qclib.c
+romstage-y += ../common/watchdog.c
 romstage-y += qclib.c
 romstage-y += ../common/mmu.c
 romstage-y += mmu.c
diff --git a/src/soc/qualcomm/sc7180/include/soc/watchdog.h b/src/soc/qualcomm/sc7180/include/soc/watchdog.h
deleted file mode 100644
index c5ddb55bba..0000000000
--- a/src/soc/qualcomm/sc7180/include/soc/watchdog.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_QUALCOMM_SC7180_WDOG_H__
-#define _SOC_QUALCOMM_SC7180_WDOG_H__
-
-void check_wdog(void);
-
-#endif  /* _SOC_QUALCOMM_SC7180_WDOG_H__ */
diff --git a/src/soc/qualcomm/sc7180/watchdog.c b/src/soc/qualcomm/sc7180/watchdog.c
deleted file mode 100644
index 680d70b2d3..0000000000
--- a/src/soc/qualcomm/sc7180/watchdog.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <soc/clock.h>
-#include <soc/watchdog.h>
-#include <device/mmio.h>
-#include <vendorcode/google/chromeos/chromeos.h>
-
-#define WDOG_RESET_BIT_MASK		1
-
-void check_wdog(void)
-{
-	uint32_t wdog_sta = read32(&aoss->aoss_cc_reset_status);
-
-	if (wdog_sta & WDOG_RESET_BIT_MASK)
-		mark_watchdog_tombstone();
-}
-- 
cgit v1.2.3