Revert "Skyrim: Enable SoC OCP and thermal interrupts"

This reverts commit f5dfa5378ab30df20ccc40d1a30d3bf635432d48.

Reason for revert: 15W SKUs are pulling OCP, need to understand and debug.  This is causing 15W SKUs not to boot

Original change's description:
> Skyrim: Enable SoC OCP and thermal interrupts
>
> Enable interrupts for SoC OCP and thermal warnings, and shutdown on each
> with a console print to log the scenario.
>
> BRANCH=None
> BUG=b:231996265
> TEST=on skyrim, run a normal boot/shutdown sequence and verify neither
> interrupt is erroneously detected
>
> Signed-off-by: Diana Z <dzigterman@chromium.org>
> Change-Id: Ic5af489965a6a2e88e5eba23e35d13bdfb1bdb8b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3712024
> Reviewed-by: Robert Zieba <robertzieba@google.com>
> Commit-Queue: Robert Zieba <robertzieba@google.com>

Bug: b:231996265
Change-Id: If3128e5b1d8aeec1ec58ee39be745f39c87d17b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3735637
Commit-Queue: Diana Z <dzigterman@chromium.org>
Tested-by: Jonathon Murphy <jpmurphy@google.com>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Auto-Submit: Jonathon Murphy <jpmurphy@google.com>

3 files changed, 4 insertions, 41 deletions

diff --git a/zephyr/projects/skyrim/interrupts.dts b/zephyr/projects/skyrim/interrupts.dts
index c72e468b58..14a01c8402 100644
--- a/zephyr/projects/skyrim/interrupts.dts
+++ b/zephyr/projects/skyrim/interrupts.dts
@@ -42,16 +42,6 @@
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_set_en_pwr_pcore";
 		};
-		int_soc_pcore_ocp: soc_pcore_ocp {
-			irq-pin = <&gpio_pcore_ocp_r_l>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "baseboard_soc_pcore_ocp";
-		};
-		int_soc_thermtrip: soc_thermtrip {
-			irq-pin = <&gpio_soc_thermtrip_odl>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "baseboard_soc_thermtrip";
-		};
 		int_volume_up: volume_up {
 			irq-pin = <&gpio_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
diff --git a/zephyr/projects/skyrim/power_signals.c b/zephyr/projects/skyrim/power_signals.c
index 3b226eb0f9..16847ba608 100644
--- a/zephyr/projects/skyrim/power_signals.c
+++ b/zephyr/projects/skyrim/power_signals.c
@@ -76,26 +76,9 @@ static void baseboard_init(void)
 	gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_pg_groupc_s0));
 	gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_pg_lpddr_s0));
 	gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_pg_lpddr_s3));
-
-	/* Enable thermtrip interrupt */
-	gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_soc_thermtrip));
 }
 DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_POST_I2C);
 
-static void baseboard_resume(void)
-{
-	/* Enable Pcore OCP interrupt, which is powered in S0 */
-	gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_soc_pcore_ocp));
-}
-DECLARE_HOOK(HOOK_CHIPSET_RESUME, baseboard_resume, HOOK_PRIO_DEFAULT);
-
-static void baseboard_suspend(void)
-{
-	/* Disable Pcore OCP interrupt */
-	gpio_disable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_soc_pcore_ocp));
-}
-DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, baseboard_suspend, HOOK_PRIO_DEFAULT);
-
 /**
  * b/227296844: On G3->S5, wait for RSMRST_L to be deasserted before asserting
  * PCH_PWRBTN_L.  This can be as long as ~65ms after cold boot.  Then wait an
@@ -209,15 +192,3 @@ void baseboard_set_en_pwr_s3(enum gpio_signal signal)
 	/* Chain off the normal power signal interrupt handler */
 	power_signal_interrupt(signal);
 }
-
-void baseboard_soc_thermtrip(enum gpio_signal signal)
-{
-	ccprints("SoC thermtrip reported, shutting down");
-	chipset_force_shutdown(CHIPSET_SHUTDOWN_THERMAL);
-}
-
-void baseboard_soc_pcore_ocp(enum gpio_signal signal)
-{
-	ccprints("SoC Pcore OCP reported, shutting down");
-	chipset_force_shutdown(CHIPSET_SHUTDOWN_BOARD_CUSTOM);
-}
diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts
index 5fc8b52907..ebccda5eb9 100644
--- a/zephyr/projects/skyrim/skyrim.dts
+++ b/zephyr/projects/skyrim/skyrim.dts
@@ -24,7 +24,8 @@
 		gpio_ec_i2c_usbc_pd_int: ec_i2c_usbc_pd_int {
 			gpios = <&gpioa 3 GPIO_INPUT>;
 		};
-		gpio_soc_thermtrip_odl: soc_thermtrip_odl {
+		/* TODO: Add interrupt handler */
+		soc_thermtrip_odl {
 			gpios = <&gpio9 5 GPIO_INPUT>;
 		};
 		gpio_hub_rst: hub_rst {
@@ -37,7 +38,8 @@
 		gpio_ec_soc_pwr_good: ec_soc_pwr_good {
 			gpios = <&gpiod 3 GPIO_OUTPUT_LOW>;
 		};
-		gpio_pcore_ocp_r_l: pcore_ocp_r_l {
+		/* TODO: Add interrupt handler to shut down */
+		pcore_ocp_r_l {
 			gpios = <&gpioa 5 GPIO_INPUT>;
 		};
 		gpio_usb_hub_fault_q_odl: usb_hub_fault_q_odl {