GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

soc/intel/common/block/lpc: add acpi name

Browse source 
Add ACPI name for LPC device. The name matches with what is in
soc/intel/common/block/acpi/acpi/lpc.asl.

Since several Intel SOCs select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC,
remove duplicated acpi name assignments.

Signed-off-by: Jonathan Zhang <jonzhang@fb.com>
Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45590
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Jonathan Zhang 2020-09-21 17:09:50 -07:00 committed by Patrick Georgi
parent 339fa7389b
commit db202bad09
8 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/soc/intel/apollolake/chip.c
View file

@ -139,9 +139,6 @@ const char *soc_acpi_name(const struct device *dev)
/* DSDT: acpi/northbridge.asl */ /* DSDT: acpi/northbridge.asl */
case SA_DEVFN_ROOT: case SA_DEVFN_ROOT:
return "MCHC"; return "MCHC";
/* DSDT: acpi/lpc.asl */
case PCH_DEVFN_LPC:
return "LPCB";
/* DSDT: acpi/xhci.asl */ /* DSDT: acpi/xhci.asl */
case PCH_DEVFN_XHCI: case PCH_DEVFN_XHCI:
return "XHCI"; return "XHCI";

1
src/soc/intel/cannonlake/chip.c
View file

@ -127,7 +127,6 @@ const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_GSPI2: return "SPI2"; case PCH_DEVFN_GSPI2: return "SPI2";
case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_EMMC: return "EMMC";
case PCH_DEVFN_SDCARD: return "SDXC"; case PCH_DEVFN_SDCARD: return "SDXC";
case PCH_DEVFN_LPC: return "LPCB";
case PCH_DEVFN_P2SB: return "P2SB"; case PCH_DEVFN_P2SB: return "P2SB";
case PCH_DEVFN_PMC: return "PMC_"; case PCH_DEVFN_PMC: return "PMC_";
case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_HDA: return "HDAS";

8
src/soc/intel/common/block/lpc/lpc.c
View file

@ -95,6 +95,13 @@ static void pch_lpc_set_resources(struct device *dev)
pch_lpc_set_child_resources(dev); pch_lpc_set_child_resources(dev);
} }
#if CONFIG(HAVE_ACPI_TABLES)
static const char *lpc_acpi_name(const struct device *dev)
{
return "LPCB";
}
#endif
static struct device_operations device_ops = { static struct device_operations device_ops = {
.read_resources = pch_lpc_read_resources, .read_resources = pch_lpc_read_resources,
.set_resources = pch_lpc_set_resources, .set_resources = pch_lpc_set_resources,
@ -102,6 +109,7 @@ static struct device_operations device_ops = {
#if CONFIG(HAVE_ACPI_TABLES) #if CONFIG(HAVE_ACPI_TABLES)
.write_acpi_tables = southbridge_write_acpi_tables, .write_acpi_tables = southbridge_write_acpi_tables,
.acpi_inject_dsdt = southbridge_inject_dsdt, .acpi_inject_dsdt = southbridge_inject_dsdt,
.acpi_name = lpc_acpi_name,
#endif #endif
.init = lpc_soc_init, .init = lpc_soc_init,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,

2
src/soc/intel/elkhartlake/chip.c
View file

@ -95,8 +95,6 @@ const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_GSPI3: return "SPI3"; case PCH_DEVFN_GSPI3: return "SPI3";
case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_EMMC: return "EMMC";
case PCH_DEVFN_SDCARD: return "SDXC"; case PCH_DEVFN_SDCARD: return "SDXC";
/* Keeping ACPI device name coherent with ec.asl */
case PCH_DEVFN_ESPI: return "LPCB";
case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_HDA: return "HDAS";
case PCH_DEVFN_SMBUS: return "SBUS"; case PCH_DEVFN_SMBUS: return "SBUS";
case PCH_DEVFN_GBE: return "GLAN"; case PCH_DEVFN_GBE: return "GLAN";

2
src/soc/intel/icelake/chip.c
View file

@ -75,8 +75,6 @@ const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_GSPI2: return "SPI2"; case PCH_DEVFN_GSPI2: return "SPI2";
case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_EMMC: return "EMMC";
case PCH_DEVFN_SDCARD: return "SDXC"; case PCH_DEVFN_SDCARD: return "SDXC";
/* Keeping ACPI device name coherent with ec.asl */
case PCH_DEVFN_ESPI: return "LPCB";
case PCH_DEVFN_P2SB: return "P2SB"; case PCH_DEVFN_P2SB: return "P2SB";
case PCH_DEVFN_PMC: return "PMC_"; case PCH_DEVFN_PMC: return "PMC_";
case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_HDA: return "HDAS";

2
src/soc/intel/jasperlake/chip.c
View file

@ -95,8 +95,6 @@ const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_GSPI3: return "SPI3"; case PCH_DEVFN_GSPI3: return "SPI3";
case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_EMMC: return "EMMC";
case PCH_DEVFN_SDCARD: return "SDXC"; case PCH_DEVFN_SDCARD: return "SDXC";
/* Keeping ACPI device name coherent with ec.asl */
case PCH_DEVFN_ESPI: return "LPCB";
case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_HDA: return "HDAS";
case PCH_DEVFN_SMBUS: return "SBUS"; case PCH_DEVFN_SMBUS: return "SBUS";
case PCH_DEVFN_GBE: return "GLAN"; case PCH_DEVFN_GBE: return "GLAN";

1
src/soc/intel/skylake/acpi.c
View file

@ -688,7 +688,6 @@ const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_EMMC: return "EMMC"; case PCH_DEVFN_EMMC: return "EMMC";
case PCH_DEVFN_SDIO: return "SDIO"; case PCH_DEVFN_SDIO: return "SDIO";
case PCH_DEVFN_SDCARD: return "SDXC"; case PCH_DEVFN_SDCARD: return "SDXC";
case PCH_DEVFN_LPC: return "LPCB";
case PCH_DEVFN_P2SB: return "P2SB"; case PCH_DEVFN_P2SB: return "P2SB";
case PCH_DEVFN_PMC: return "PMC_"; case PCH_DEVFN_PMC: return "PMC_";
case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_HDA: return "HDAS";

2
src/soc/intel/tigerlake/chip.c
View file

@ -104,8 +104,6 @@ const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_GSPI1: return "SPI1"; case PCH_DEVFN_GSPI1: return "SPI1";
case PCH_DEVFN_GSPI2: return "SPI2"; case PCH_DEVFN_GSPI2: return "SPI2";
case PCH_DEVFN_GSPI3: return "SPI3"; case PCH_DEVFN_GSPI3: return "SPI3";
/* Keeping ACPI device name coherent with ec.asl */
case PCH_DEVFN_ESPI: return "LPCB";
case PCH_DEVFN_HDA: return "HDAS"; case PCH_DEVFN_HDA: return "HDAS";
case PCH_DEVFN_SMBUS: return "SBUS"; case PCH_DEVFN_SMBUS: return "SBUS";
case PCH_DEVFN_GBE: return "GLAN"; case PCH_DEVFN_GBE: return "GLAN";