Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1533133

[PATCH 4.4 20/21] mei: me: fix place for kaby point device ids.

Show all headers | View raw

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Tomas Winkler <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')
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/misc/mei/hw-me-regs.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- 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
  */

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.4 00/21] 4.4.36-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:30 +0100
  [PATCH 4.4 07/21] USB: serial: ftdi_sio: add support for TI CC3200 LaunchPad Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:30 +0100
  [PATCH 4.4 15/21] parisc: Fix race in pci-dma.c Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:40 +0100
  [PATCH 4.4 06/21] USB: serial: cp210x: add ID for the Zone DPMX Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:40 +0100
  [PATCH 4.4 21/21] mei: fix return value on disconnection Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:40 +0100
  [PATCH 4.4 17/21] mpi: Fix NULL ptr dereference in mpi_powm() [ver #3] Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:40 +0100
  [PATCH 4.4 20/21] mei: me: fix place for kaby point device ids. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:40 +0100
  [PATCH 4.4 05/21] usb: chipidea: move the lock initialization to core file Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:40 +0100
  [PATCH 4.4 19/21] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:00 +0100
  [PATCH 4.4 08/21] Fix USB CB/CBI storage devices with CONFIG_VMAP_STACK=y Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:00 +0100
  [PATCH 4.4 16/21] parisc: Also flush data TLB in flush_icache_page_asm Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:00 +0100
  [PATCH 4.4 12/21] apparmor: fix change_hat not finding hat after policy replacement Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:10 +0100
  [PATCH 4.4 09/21] scsi: mpt3sas: Fix secure erase premature termination Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:10 +0100
  [PATCH 4.4 10/21] tile: avoid using clocksource_cyc2ns with absolute cycle count Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:10 +0100
  [PATCH 4.4 14/21] parisc: Fix races in parisc_setup_cache_timing() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:10 +0100
  [PATCH 4.4 13/21] NFSv4.x: hide array-bounds warning Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:10 +0100
  [PATCH 4.4 11/21] cfg80211: limit scan results cache size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 11:10 +0100
  Re: [PATCH 4.4 00/21] 4.4.36-stable review Andre Noll <maan@tuebingen.mpg.de> - 2016-11-30 14:50 +0100
    Re: [PATCH 4.4 00/21] 4.4.36-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 15:00 +0100
      Re: [PATCH 4.4 00/21] 4.4.36-stable review Andre Noll <maan@tuebingen.mpg.de> - 2016-11-30 15:10 +0100
        Re: [PATCH 4.4 00/21] 4.4.36-stable review Eric Dumazet <edumazet@google.com> - 2016-11-30 15:30 +0100
          Re: [PATCH 4.4 00/21] 4.4.36-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 15:40 +0100
        Re: [PATCH 4.4 00/21] 4.4.36-stable review David Miller <davem@davemloft.net> - 2016-11-30 16:00 +0100
          Re: [PATCH 4.4 00/21] 4.4.36-stable review Andre Noll <maan@tuebingen.mpg.de> - 2016-11-30 16:20 +0100
      Re: [PATCH 4.4 00/21] 4.4.36-stable review David Miller <davem@davemloft.net> - 2016-11-30 16:00 +0100
        Re: [PATCH 4.4 00/21] 4.4.36-stable review Greg KH <gregkh@linuxfoundation.org> - 2016-11-30 16:40 +0100
  Re: [PATCH 4.4 00/21] 4.4.36-stable review Shuah Khan <shuah.kh@samsung.com> - 2016-11-30 17:10 +0100
  Re: [PATCH 4.4 00/21] 4.4.36-stable review Guenter Roeck <linux@roeck-us.net> - 2016-12-01 00:30 +0100

csiph-web