diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-20 20:51:33 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-20 20:51:33 +0100 |
commit | 4509209f8bfe158403a29d713bd3b2cb8fc2b534 (patch) | |
tree | 952962ad15753569bce64df01410217f900e06aa /drivers/misc/mei/hw-me-regs.h | |
parent | 35c0272502cca0a1b461d310c23aac94a503983d (diff) | |
parent | 32ea33a044842ae6c5fc7e33426e0a7bd50f8801 (diff) | |
download | linux-4509209f8bfe158403a29d713bd3b2cb8fc2b534.tar.bz2 |
Pull in char-misc-next from Greg
We need 32ea33a04484 ("mei: bus: export to_mei_cl_device for mei
client devices drivers") for the mei-hdcp patches.
References: https://lkml.org/lkml/2019/2/19/356
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/misc/mei/hw-me-regs.h')
-rw-r--r-- | drivers/misc/mei/hw-me-regs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 23739a60517f..bb1ee9834a02 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -139,6 +139,8 @@ #define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */ #define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */ +#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */ + /* * MEI HW Section */ |