diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-09-22 14:47:09 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-09-22 14:47:09 +0300 |
| commit | cbdac8bc2cbf91b42a92869dc938b809054d4fae (patch) | |
| tree | 06118f3dc9ea6dab868ebc89aad68e19cd4c7800 /include/linux/platform_data | |
| parent | 79764ec772bc1346441ae1c4b1f3bd1991d634e8 (diff) | |
| parent | 0a0342ede303fc420f3a388e1ae82da3ae8ff6bd (diff) | |
| download | linux-cbdac8bc2cbf91b42a92869dc938b809054d4fae.tar.xz | |
Merge tag 'asoc-fix-v6.0-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.0
A few device specific fixes, nothing too large, and a new device
ID for a Dell laptop.
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/x86/pmc_atom.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/platform_data/x86/pmc_atom.h b/include/linux/platform_data/x86/pmc_atom.h index 3edfb6d4e67a..dd81f510e4cf 100644 --- a/include/linux/platform_data/x86/pmc_atom.h +++ b/include/linux/platform_data/x86/pmc_atom.h @@ -7,6 +7,8 @@ #ifndef PMC_ATOM_H #define PMC_ATOM_H +#include <linux/bits.h> + /* ValleyView Power Control Unit PCI Device ID */ #define PCI_DEVICE_ID_VLV_PMC 0x0F1C /* CherryTrail Power Control Unit PCI Device ID */ @@ -139,9 +141,9 @@ #define ACPI_MMIO_REG_LEN 0x100 #define PM1_CNT 0x4 -#define SLEEP_TYPE_MASK 0xFFFFECFF +#define SLEEP_TYPE_MASK GENMASK(12, 10) #define SLEEP_TYPE_S5 0x1C00 -#define SLEEP_ENABLE 0x2000 +#define SLEEP_ENABLE BIT(13) extern int pmc_atom_read(int offset, u32 *value); |