Received: by 10.223.185.116 with SMTP id b49csp1060207wrg; Fri, 23 Feb 2018 11:11:02 -0800 (PST) X-Google-Smtp-Source: AH8x227TA9R/eF3WGJJVJafRxN8IA5JGIk20YsbcO5NQAe3cdIQs7KCfA9vMCJ2XuDFKkXauZu5N X-Received: by 2002:a17:902:3084:: with SMTP id v4-v6mr2667064plb.131.1519413062558; Fri, 23 Feb 2018 11:11:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413062; cv=none; d=google.com; s=arc-20160816; b=QD0Cw/ERV/3Tmxlg0MCxvjoW+p7m+WrcU5xQrTICnNx8vJe4Mg3CduQtJQJBLonKBp cmaohqrYawoDHvu96aSSmSNfoPC5YzHoB/zxBMRYtL+xp/7WbasfUGgfFz3SP+TeRq+3 FKedliPMumsLpEkC+Xj5obtVfl/Nrkw6fvgZHmkDv/NB7pAG+TQTgc1ZIRWp8ldNy5eE lj2+Y3kpizsd/hK80XzF1KBq1nTdh28cPoXesKa5Q29s9jZIBtGZPC6twnThjA8CdEuM 1FftYKbIOr1LmWWigXmMu3hrlQbHCzNIvRFcV7UfipkLgSPmWi2mXtLpyK1bsL+WWuWI vzRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=uCN609/TSxyoVm5ZVOejaQ7vJfLLdY7MyAZSPRZjEAA=; b=uBQY7meIzfuwKeYFUd0Q4B2U53o5V3K78gQWNQj19+KkejjxYN+6JE24vbPrIDL3Ui 4mAgV+SeGp/GywtbJGsjoemdQQS9XBE0uDTXbzweiY+dDuHnG1Ap1aRjeadU53w3MgWE qh7+ihc6vTj6aft/JdW2urA/4QJbCEKAKQt3WK2BjSZnx+afZc3EnHvOxTHXvbAGiF94 hEBQwaExbNBz7dtjTS2MrUty0PrPyBsyX02fSBDa3sFX2bX28t2IdSWQVnz7PBsader4 2mvcPCp9mYJDNJQKKlzkFHpNRQ7G5qVoRC87nfNKLrpBeAQhfLqr7/85AakYvh1c0oWw bEKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q4-v6si2163550plr.39.2018.02.23.11.10.47; Fri, 23 Feb 2018 11:11:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965317AbeBWS5F (ORCPT + 99 others); Fri, 23 Feb 2018 13:57:05 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:49642 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965303AbeBWS5C (ORCPT ); Fri, 23 Feb 2018 13:57:02 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 59DC9AD9; Fri, 23 Feb 2018 18:56:57 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomas Winkler Subject: [PATCH 4.14 158/159] mei: me: add cannon point device ids for 4th device Date: Fri, 23 Feb 2018 19:27:46 +0100 Message-Id: <20180223170802.069106803@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tomas Winkler commit 2a4ac172c2f257d28c47b90c9e381bec31edcc44 upstream. Add cannon point device ids for 4th (itouch) device. Cc: 4.14+ 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 @@ -133,7 +133,9 @@ #define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */ #define MEI_DEV_ID_CNP_LP 0x9DE0 /* Cannon Point LP */ +#define MEI_DEV_ID_CNP_LP_4 0x9DE4 /* Cannon Point LP 4 (iTouch) */ #define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */ +#define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */ /* * MEI HW Section --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -99,7 +99,9 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP_4, MEI_ME_PCH8_CFG)}, {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)}, /* required last entry */ {0, }