diff options
| author |   Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
| commit | 4081b335592a46d506e9ab5725ba8d7cd8cea1d9 (patch) | |
| tree | 3aed3118e0e16349fdc2c7619046bf3854270c3c /drivers/acpi/device_pm.c | |
| parent | Merge tag 'renesas-dt-bindings-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt (diff) | |
| parent | ARM: dts: mmp3-dell-ariel: Enable the HSIC (diff) | |
| download | linux-dev-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.tar.xz linux-dev-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.zip | |
Merge branch 'mmp/hsic' into arm/dt
* mmp/hsic:
ARM: dts: mmp3-dell-ariel: Enable the HSIC
ARM: dts: mmp3: Add HSIC controllers
dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy
clk: mmp2: Add HSIC clocks
dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks
+ Linux 5.5-rc2
Diffstat (limited to 'drivers/acpi/device_pm.c')
| -rw-r--r-- | drivers/acpi/device_pm.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 08bb9f2f2d23..5e4a8860a9c0 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1314,9 +1314,19 @@ static void acpi_dev_pm_detach(struct device *dev, bool power_off) */ int acpi_dev_pm_attach(struct device *dev, bool power_on) { + /* + * Skip devices whose ACPI companions match the device IDs below, + * because they require special power management handling incompatible + * with the generic ACPI PM domain. + */ + static const struct acpi_device_id special_pm_ids[] = { + {"PNP0C0B", }, /* Generic ACPI fan */ + {"INT3404", }, /* Fan */ + {} + }; struct acpi_device *adev = ACPI_COMPANION(dev); - if (!adev) + if (!adev || !acpi_match_device_ids(adev, special_pm_ids)) return 0; /* |