diff options
| author | Mark Brown <broonie@kernel.org> | 2022-09-10 18:39:51 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-10 18:39:51 +0300 |
| commit | 824723ccf53fc53ecf896753c562b00a5d6307eb (patch) | |
| tree | c0ec150c4510eb161ba57a7fd39a1393f3b77cdd /include/linux/platform_data | |
| parent | 86432b7f8f92b784c2e4af5b02766fb44052abf7 (diff) | |
| parent | 7e18e42e4b280c85b76967a9106a13ca61c16179 (diff) | |
| download | linux-824723ccf53fc53ecf896753c562b00a5d6307eb.tar.xz | |
spi: Merge tag 'v6.0-rc4' into spi-6.1
Linux 6.0-rc4 so we can test on BeagleBone again.
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); |