From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD383C282CE for ; Wed, 13 Feb 2019 18:46:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9725120835 for ; Wed, 13 Feb 2019 18:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083562; bh=/7u8QmPFFv2Q8NpKxzIPD5rOj3Bfzu2QpC/IuTnXpPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=soveqlcqKgwTFRVtCkQML2a7lX5X//DbqAR8jZgrDU9JLDT+hS1TEnW1Ns5+OjyrR 8zl4CXcaxxjoyZKCglOg+mTy3ey8bdI0Hs/EZTnazmnTOZYVGsBDTjLHqCIh3+zdvE Yql2U3uZ9+bYHkCRLlaDjBKdOCcu07BeawnUq3EE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406357AbfBMSqB (ORCPT ); Wed, 13 Feb 2019 13:46:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:44594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730855AbfBMSp7 (ORCPT ); Wed, 13 Feb 2019 13:45:59 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3DB3420811; Wed, 13 Feb 2019 18:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083558; bh=/7u8QmPFFv2Q8NpKxzIPD5rOj3Bfzu2QpC/IuTnXpPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mChuLfiyn5FOmCq8GWRd/A8O03CRx2ecOKoq2y6khbdQd75jDrVOVbSiWCFRJRWqv Xh5xGjxE7HwrO8u40D3gLssvJQ03REERaEWOLxt2Gp0Hj6C/j8Mi/wB5ZAZWVgKJma NaShU6P5CqG9vt9nXxs6mpsFOQ/cV8x470+TZtKw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomas Winkler Subject: [PATCH 4.20 15/50] mei: me: add ice lake point device id. Date: Wed, 13 Feb 2019 19:38:20 +0100 Message-Id: <20190213183657.036908950@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213183655.747168774@linuxfoundation.org> References: <20190213183655.747168774@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tomas Winkler commit efe814e90b98aed6d655b5a4092b9114b8b26e42 upstream. Add icelake mei device id. Cc: Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+) --- 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 */ --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -105,6 +105,8 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, + /* required last entry */ {0, } };