aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/acpi_lpss.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 552010288135..c4712395020c 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -724,13 +724,14 @@ static int acpi_lpss_resume_early(struct device *dev)
724#define LPSS_GPIODEF0_DMA1_D3 BIT(2) 724#define LPSS_GPIODEF0_DMA1_D3 BIT(2)
725#define LPSS_GPIODEF0_DMA2_D3 BIT(3) 725#define LPSS_GPIODEF0_DMA2_D3 BIT(3)
726#define LPSS_GPIODEF0_DMA_D3_MASK GENMASK(3, 2) 726#define LPSS_GPIODEF0_DMA_D3_MASK GENMASK(3, 2)
727#define LPSS_GPIODEF0_DMA_LLP BIT(13)
727 728
728static DEFINE_MUTEX(lpss_iosf_mutex); 729static DEFINE_MUTEX(lpss_iosf_mutex);
729 730
730static void lpss_iosf_enter_d3_state(void) 731static void lpss_iosf_enter_d3_state(void)
731{ 732{
732 u32 value1 = 0; 733 u32 value1 = 0;
733 u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK; 734 u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK | LPSS_GPIODEF0_DMA_LLP;
734 u32 value2 = LPSS_PMCSR_D3hot; 735 u32 value2 = LPSS_PMCSR_D3hot;
735 u32 mask2 = LPSS_PMCSR_Dx_MASK; 736 u32 mask2 = LPSS_PMCSR_Dx_MASK;
736 /* 737 /*
@@ -774,8 +775,9 @@ exit:
774 775
775static void lpss_iosf_exit_d3_state(void) 776static void lpss_iosf_exit_d3_state(void)
776{ 777{
777 u32 value1 = LPSS_GPIODEF0_DMA1_D3 | LPSS_GPIODEF0_DMA2_D3; 778 u32 value1 = LPSS_GPIODEF0_DMA1_D3 | LPSS_GPIODEF0_DMA2_D3 |
778 u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK; 779 LPSS_GPIODEF0_DMA_LLP;
780 u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK | LPSS_GPIODEF0_DMA_LLP;
779 u32 value2 = LPSS_PMCSR_D0; 781 u32 value2 = LPSS_PMCSR_D0;
780 u32 mask2 = LPSS_PMCSR_Dx_MASK; 782 u32 mask2 = LPSS_PMCSR_Dx_MASK;
781 783