Merge pull request #726 from FrameworkComputer/lotus.modified_panel_sequence

Lotus: modified panel sequence

Author: kiram9

include/espi.h

@@ -101,4 +101,8 @@ int espi_signal_is_vw(int signal);
 void espi_wait_vw_not_dirty(enum espi_vw_signal signal,
 			    unsigned int timeout_us);
 
+#ifdef CONFIG_CUSTOMIZED_DESIGN
+__override_proto void platform_reset_handler(int plt_rst_status);
+#endif
+
 #endif /* __CROS_EC_ESPI_H */

zephyr/program/lotus/azalea/src/power_sequence.c

@@ -18,6 +18,7 @@
 #include "keyboard_protocol.h"
 #include "lpc.h"
 #include "power.h"
+#include "port80.h"
 #include "power_sequence.h"
 #include "task.h"
 #include "util.h"
@@ -560,7 +561,6 @@ enum power_state power_handle_state(enum power_state state)
 	return state;
 }
 
-/* Peripheral power control */
 static void peripheral_power_startup(void)
 {
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_wlan_en), 1);

zephyr/program/lotus/lotus/gpio.dtsi

@@ -236,7 +236,7 @@
 		gpio_f_beam_open_l: f_beam_open_l {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 		};
-		enbkl_apu {
+		gpio_enblk_apu: enbkl_apu {
 			gpios = <&gpioe 0 GPIO_INPUT>;		/* monitor APU EDP BKL */
 		};
 		dgpu_pwr_en {

zephyr/program/lotus/lotus/interrupts.dtsi

@@ -77,5 +77,10 @@
 			flags = <GPIO_INT_EDGE_RISING>;
 			handler = "dp_hot_plug_interrupt";
 		};
+		int_enblk_apu_interrupt: enable_apu_interrupt {
+			irq-pin = <&gpio_enblk_apu>;
+			flags = <GPIO_INT_EDGE_BOTH>;
+			handler = "panel_interrupt_handler";
+		};
 	};
 };

zephyr/program/lotus/lotus/src/power_sequence.c

@@ -18,7 +18,9 @@
 #include "lpc.h"
 #include "power.h"
 #include "power_sequence.h"
+#include "port80.h"
 #include "task.h"
+#include "timer.h"
 #include "util.h"
 #include "gpu.h"
 
@@ -535,7 +537,28 @@ enum power_state power_handle_state(enum power_state state)
 	return state;
 }
 
+static void panel_power_control(void)
+{
+	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_sm_panel_bken_ec), 1);
+}
+DECLARE_DEFERRED(panel_power_control);
+
 /* Peripheral power control */
+void panel_interrupt_handler(enum gpio_signal signal)
+{
+	int panel_status = gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_enblk_apu));
+
+	if (panel_status == 0)
+		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_sm_panel_bken_ec), 0);
+	else
+		hook_call_deferred(&panel_power_control_data, 50 * MSEC);
+}
+
+void platform_reset_handler(int plt_rst_status)
+{
+	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ec_edp_reset), plt_rst_status);
+}
+
 static void peripheral_power_startup(void)
 {
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_wlan_en), 1);
@@ -548,10 +571,8 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, peripheral_power_startup, HOOK_PRIO_DEFAULT);
 static void peripheral_power_resume(void)
 {
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ec_mute_l), 1);
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ec_edp_reset), 1);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_en_invpwr), 1);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_sleep_l), 1);
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_sm_panel_bken_ec), 1);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ssd2_pwr_en), 1);
 }
 DECLARE_HOOK(HOOK_CHIPSET_RESUME, peripheral_power_resume, HOOK_PRIO_DEFAULT);
@@ -569,10 +590,8 @@ DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, peripheral_power_shutdown, HOOK_PRIO_DEFAULT
 static void peripheral_power_suspend(void)
 {
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ec_mute_l), 0);
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ec_edp_reset), 0);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_en_invpwr), 0);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_sleep_l), 0);
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_sm_panel_bken_ec), 0);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_ssd2_pwr_en), 0);
 }
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, peripheral_power_suspend, HOOK_PRIO_DEFAULT);

zephyr/shim/src/espi.c

@@ -169,6 +169,12 @@ static void espi_chipset_reset(void)
 DECLARE_DEFERRED(espi_chipset_reset);
 #endif /* CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK */
 
+#ifdef CONFIG_PLATFORM_EC_CUSTOMIZED_DESIGN
+__overridable void platform_reset_handler(int plt_rst_status)
+{
+}
+#endif
+
 /*
  * Callback for vwire received.
  * PLTRST (platform reset) is handled specially by
@@ -192,9 +198,15 @@ static void espi_vwire_handler(const struct device *dev,
 	if (event.evt_details == ESPI_VWIRE_SIGNAL_PLTRST &&
 	    event.evt_data == 0) {
 		hook_call_deferred(&espi_chipset_reset_data, MSEC);
+#ifdef CONFIG_PLATFORM_EC_CUSTOMIZED_DESIGN
+		platform_reset_handler(0);
+#endif
 		update_ap_boot_time(PLTRST_LOW);
 	} else if (event.evt_details == ESPI_VWIRE_SIGNAL_PLTRST &&
 		   event.evt_data == 1) {
+#ifdef CONFIG_PLATFORM_EC_CUSTOMIZED_DESIGN
+		platform_reset_handler(1);
+#endif
 		update_ap_boot_time(PLTRST_HIGH);
 	}
 #endif