UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'acpi-pci' 

* acpi-pci:
  drivers: thermal: int340x_thermal: Make PCI dependency explicit
  x86/intel/lpss: Make PCI dependency explicit
  platform/x86: apple-gmux: Make PCI dependency explicit
  platform/x86: intel_pmc: Make PCI dependency explicit
  platform/x86: intel_ips: make PCI dependency explicit
  vga-switcheroo: make PCI dependency explicit
  ata: pata_acpi: Make PCI dependency explicit
  ACPI / LPSS: Make PCI dependency explicit
This commit is contained in:
Rafael J. Wysocki 2019-01-18 11:17:16 +01:00
parent b1c0330823 6f9b5e70df
commit 11ee2a3808
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/Kconfig
View File

@ -617,7 +617,7 @@ config X86_INTEL_QUARK
config X86_INTEL_LPSS config X86_INTEL_LPSS
bool "Intel Low Power Subsystem Support" bool "Intel Low Power Subsystem Support"
depends on X86 && ACPI depends on X86 && ACPI && PCI
select COMMON_CLK select COMMON_CLK
select PINCTRL select PINCTRL
select IOSF_MBI select IOSF_MBI

3
drivers/acpi/Makefile
View File

@ -41,7 +41,8 @@ acpi-y += ec.o
acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-$(CONFIG_ACPI_DOCK) += dock.o
acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o
obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o
acpi-y += acpi_lpss.o acpi_apd.o acpi-$(CONFIG_PCI) += acpi_lpss.o
acpi-y += acpi_apd.o
acpi-y += acpi_platform.o acpi-y += acpi_platform.o
acpi-y += acpi_pnp.o acpi-y += acpi_pnp.o
acpi-$(CONFIG_ARM_AMBA) += acpi_amba.o acpi-$(CONFIG_ARM_AMBA) += acpi_amba.o

4
drivers/acpi/internal.h
View File

@ -81,7 +81,11 @@ void acpi_debugfs_init(void);
#else #else
static inline void acpi_debugfs_init(void) { return; } static inline void acpi_debugfs_init(void) { return; }
#endif #endif
#ifdef CONFIG_PCI
void acpi_lpss_init(void); void acpi_lpss_init(void);
#else
static inline void acpi_lpss_init(void) {}
#endif
void acpi_apd_init(void); void acpi_apd_init(void);

2
drivers/ata/Kconfig
View File

@ -1091,7 +1091,7 @@ comment "Generic fallback / legacy drivers"
config PATA_ACPI config PATA_ACPI
tristate "ACPI firmware driver for PATA" tristate "ACPI firmware driver for PATA"
depends on ATA_ACPI && ATA_BMDMA depends on ATA_ACPI && ATA_BMDMA && PCI
help help
This option enables an ACPI method driver which drives This option enables an ACPI method driver which drives
motherboard PATA controller interfaces through the ACPI motherboard PATA controller interfaces through the ACPI

1
drivers/gpu/vga/Kconfig
View File

@ -21,6 +21,7 @@ config VGA_SWITCHEROO
bool "Laptop Hybrid Graphics - GPU switching support" bool "Laptop Hybrid Graphics - GPU switching support"
depends on X86 depends on X86
depends on ACPI depends on ACPI
depends on PCI
select VGA_ARB select VGA_ARB
help help
Many laptops released in 2008/9/10 have two GPUs with a multiplexer Many laptops released in 2008/9/10 have two GPUs with a multiplexer

6
drivers/platform/x86/Kconfig
View File

@ -1009,7 +1009,7 @@ config INTEL_MFLD_THERMAL
config INTEL_IPS config INTEL_IPS
tristate "Intel Intelligent Power Sharing" tristate "Intel Intelligent Power Sharing"
depends on ACPI depends on ACPI && PCI
---help--- ---help---
Intel Calpella platforms support dynamic power sharing between the Intel Calpella platforms support dynamic power sharing between the
CPU and GPU, maximizing performance in a given TDP. This driver, CPU and GPU, maximizing performance in a given TDP. This driver,
@ -1135,7 +1135,7 @@ config SAMSUNG_Q10
config APPLE_GMUX config APPLE_GMUX
tristate "Apple Gmux Driver" tristate "Apple Gmux Driver"
depends on ACPI depends on ACPI && PCI
depends on PNP depends on PNP
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on BACKLIGHT_APPLE=n || BACKLIGHT_APPLE depends on BACKLIGHT_APPLE=n || BACKLIGHT_APPLE
@ -1174,7 +1174,7 @@ config INTEL_SMARTCONNECT
config INTEL_PMC_IPC config INTEL_PMC_IPC
tristate "Intel PMC IPC Driver" tristate "Intel PMC IPC Driver"
depends on ACPI depends on ACPI && PCI
---help--- ---help---
This driver provides support for PMC control on some Intel platforms. This driver provides support for PMC control on some Intel platforms.
The PMC is an ARC processor which defines IPC commands for communication The PMC is an ARC processor which defines IPC commands for communication

2
drivers/thermal/intel/int340x_thermal/Kconfig
View File

@ -4,7 +4,7 @@
config INT340X_THERMAL config INT340X_THERMAL
tristate "ACPI INT340X thermal drivers" tristate "ACPI INT340X thermal drivers"
depends on X86 && ACPI depends on X86 && ACPI && PCI
select THERMAL_GOV_USER_SPACE select THERMAL_GOV_USER_SPACE
select ACPI_THERMAL_REL select ACPI_THERMAL_REL
select ACPI_FAN select ACPI_FAN