mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tomas Winkler <tomas.winkler@intel.com>
To: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
	Alexander Usyskin <alexander.usyskin@intel.com>
Subject: [char-msic 2/3] mei: me: fix place for kaby point device ids.
Date: Tue, 29 Nov 2016 14:44:45 +0200	[thread overview]
Message-ID: <1480423486-32307-2-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1480423486-32307-1-git-send-email-tomas.winkler@intel.com>

This is fix of the backported patch only, it places
KBL DIDs on correct place to easy on backporting of
further DIDs.

Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')
Cc: <stable@vger.kernel.org> #4.4
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/hw-me-regs.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 4e8069866c85..a2661381ddfc 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -66,9 +66,6 @@
 #ifndef _MEI_HW_MEI_REGS_H_
 #define _MEI_HW_MEI_REGS_H_
 
-#define MEI_DEV_ID_KBP        0xA2BA  /* Kaby Point */
-#define MEI_DEV_ID_KBP_2      0xA2BB  /* Kaby Point 2 */
-
 /*
  * MEI device IDs
  */
@@ -124,6 +121,10 @@
 #define MEI_DEV_ID_SPT_2      0x9D3B  /* Sunrise Point 2 */
 #define MEI_DEV_ID_SPT_H      0xA13A  /* Sunrise Point H */
 #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
+
+#define MEI_DEV_ID_KBP        0xA2BA  /* Kaby Point */
+#define MEI_DEV_ID_KBP_2      0xA2BB  /* Kaby Point 2 */
+
 /*
  * MEI HW Section
  */
-- 
2.7.4

  reply	other threads:[~2016-11-29 11:48 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
2016-11-29 12:44 ` Tomas Winkler [this message]
2016-11-29 19:15   ` [char-msic 2/3] mei: me: fix place for kaby point device ids Greg Kroah-Hartman
2016-11-29 20:13     ` Winkler, Tomas
2016-11-29 20:24     ` Winkler, Tomas
2016-11-29 21:32       ` Greg Kroah-Hartman
2016-11-29 21:43         ` Winkler, Tomas
2016-11-29 12:44 ` [char-msic 3/3] mei: fix return value on disconnection Tomas Winkler
2016-11-29 19:15   ` Greg Kroah-Hartman
2016-11-29 20:15     ` Winkler, Tomas
2016-11-29 20:16     ` Winkler, Tomas
2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
2016-11-29 19:21   ` Winkler, Tomas
2016-11-29 21:31     ` Greg Kroah-Hartman
2016-11-29 21:41       ` Winkler, Tomas
2016-11-30  9:24         ` Greg Kroah-Hartman
2016-11-30  9:40           ` Winkler, Tomas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480423486-32307-2-git-send-email-tomas.winkler@intel.com \
    --to=tomas.winkler@intel.com \
    --cc=alexander.usyskin@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®