From 2df5abc53bf670786a472c9c315adfc4e988cf2a Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Tue, 6 Nov 2018 17:07:01 +0530 Subject: mb/intel/icelake_rvp: Move CNVi ASL entry from static DSDT to dynamic SSDT generation This changes uses drivers/intel/wifi chip for CNVi device to ensure that: 1. Correct device name shows in ACPI name space 2. Correct wake up shows in cat /proc/acpi/wakeup 3. Remove cnvi.asl from soc/intel/icelake Change-Id: I21d3818ac9e384b0dbaa330d231022bdb8b8a547 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/29507 Tested-by: build bot (Jenkins) Reviewed-by: Shelley Chen Reviewed-by: Furquan Shaikh Reviewed-by: Aamir Bohra --- src/mainboard/intel/icelake_rvp/variants/icl_u/devicetree.cb | 5 ++++- src/mainboard/intel/icelake_rvp/variants/icl_y/devicetree.cb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_u/devicetree.cb b/src/mainboard/intel/icelake_rvp/variants/icl_u/devicetree.cb index 426436ed4b..fb39b60e8d 100644 --- a/src/mainboard/intel/icelake_rvp/variants/icl_u/devicetree.cb +++ b/src/mainboard/intel/icelake_rvp/variants/icl_u/devicetree.cb @@ -95,7 +95,10 @@ chip soc/intel/icelake device pci 12.6 off end # GSPI #2 device pci 14.0 on end # USB xHCI device pci 14.1 off end # USB xDCI (OTG) - device pci 14.3 on end # CNVi wifi + chip drivers/intel/wifi + register "wake" = "GPE0_PME_B0" + device pci 14.3 on end # CNVi wifi + end device pci 14.5 on end # SDCard device pci 15.0 on end # I2C #0 device pci 15.1 on end # I2C #1 diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_y/devicetree.cb b/src/mainboard/intel/icelake_rvp/variants/icl_y/devicetree.cb index 55b5aa34f1..b3a78269c6 100644 --- a/src/mainboard/intel/icelake_rvp/variants/icl_y/devicetree.cb +++ b/src/mainboard/intel/icelake_rvp/variants/icl_y/devicetree.cb @@ -79,7 +79,10 @@ chip soc/intel/icelake device pci 12.6 off end # GSPI #2 device pci 14.0 on end # USB xHCI device pci 14.1 off end # USB xDCI (OTG) - device pci 14.3 on end # CNVi wifi + chip drivers/intel/wifi + register "wake" = "GPE0_PME_B0" + device pci 14.3 on end # CNVi wifi + end device pci 14.5 on end # SDCard device pci 15.0 on end # I2C 0 device pci 15.1 on end # I2C #1 -- cgit v1.2.3