From 6258ec9f7019bfb644e1666fed17a2b302da39e3 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 27 May 2020 12:23:24 -0500 Subject: [PATCH] mb/purism/librem*: drop EC chip device CB:35086 exposed that the devicetree listed an EC chip for which there is no actual driver; the EC is entirely ACPI code (.asl) included by the board's ec.asl. Remove the unnecessary EC chip driver from both boards, as well as the unnecessary Kconfig selection for librem_bdw. Test: build/boot Librem 13v1, 13v4, verify battery info etc still correct. Signed-off-by: Matt DeVillier Change-Id: I5cb0b51881ab8f14e9ec693485f673f4284b5f14 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41788 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/purism/librem_bdw/Kconfig | 1 - src/mainboard/purism/librem_bdw/devicetree.cb | 6 +----- src/mainboard/purism/librem_skl/devicetree.cb | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig index dcfe78e752..202a35d79e 100644 --- a/src/mainboard/purism/librem_bdw/Kconfig +++ b/src/mainboard/purism/librem_bdw/Kconfig @@ -2,7 +2,6 @@ config BOARD_PURISM_BASEBOARD_LIBREM_BDW def_bool n select SYSTEM_TYPE_LAPTOP select BOARD_ROMSIZE_KB_8192 - select EC_PURISM_LIBREM select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select INTEL_GMA_HAVE_VBT diff --git a/src/mainboard/purism/librem_bdw/devicetree.cb b/src/mainboard/purism/librem_bdw/devicetree.cb index 13b9e5e729..0d44cd734f 100644 --- a/src/mainboard/purism/librem_bdw/devicetree.cb +++ b/src/mainboard/purism/librem_bdw/devicetree.cb @@ -52,11 +52,7 @@ chip soc/intel/broadwell device pci 1c.5 on end # PCIe Port #6 - M.2 NVMe device pci 1d.0 off end # USB2 EHCI device pci 1e.0 off end # PCI bridge - device pci 1f.0 on - chip ec/purism/librem - device pnp 0c09.0 on end - end - end # LPC bridge + device pci 1f.0 on end # LPC bridge device pci 1f.2 on end # SATA Controller device pci 1f.3 on end # SMBus device pci 1f.6 off end # Thermal diff --git a/src/mainboard/purism/librem_skl/devicetree.cb b/src/mainboard/purism/librem_skl/devicetree.cb index a439e02689..d44d2ada73 100644 --- a/src/mainboard/purism/librem_skl/devicetree.cb +++ b/src/mainboard/purism/librem_skl/devicetree.cb @@ -208,9 +208,6 @@ chip soc/intel/skylake device pci 1d.2 off end # PCI Express Port 11 device pci 1d.3 off end # PCI Express Port 12 device pci 1f.0 on - chip ec/purism/librem - device pnp 0c09.0 on end - end chip drivers/pc80/tpm device pnp 0c31.0 on end end