git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 4c7d849204341dea19be941a3c1eb4bdffac9cc4 Mon Sep 17 00:00:00 2001
   2 From: Seth Heasley <seth.heasley@intel.com>
   3 Date: Thu, 25 Mar 2010 16:14:41 -0700
   4 Subject: WATCHDOG: iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs
   5
   6 From: Seth Heasley <seth.heasley@intel.com>
   7
   8 commit 4c7d849204341dea19be941a3c1eb4bdffac9cc4 upstream.
   9
  10 This patch adds the Intel Cougar Point PCH LPC Controller DeviceIDs for iTCO Watchdog.
  11
  12 Signed-off-by: Seth Heasley <seth.heasley@intel.com>
  13 Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15
  16 ---
  17  drivers/watchdog/iTCO_wdt.c |   99 +++++++++++++++++++++++++++++++++++++++++---
  18  1 file changed, 93 insertions(+), 6 deletions(-)
  19
  20 --- a/drivers/watchdog/iTCO_wdt.c
  21 +++ b/drivers/watchdog/iTCO_wdt.c
  22 @@ -115,8 +115,37 @@ enum iTCO_chipsets {
  23         TCO_3420,       /* 3420 */
  24         TCO_3450,       /* 3450 */
  25         TCO_EP80579,    /* EP80579 */
  26 -       TCO_CPTD,       /* CPT Desktop */
  27 -       TCO_CPTM,       /* CPT Mobile */
  28 +       TCO_CPT1,       /* Cougar Point */
  29 +       TCO_CPT2,       /* Cougar Point Desktop */
  30 +       TCO_CPT3,       /* Cougar Point Mobile */
  31 +       TCO_CPT4,       /* Cougar Point */
  32 +       TCO_CPT5,       /* Cougar Point */
  33 +       TCO_CPT6,       /* Cougar Point */
  34 +       TCO_CPT7,       /* Cougar Point */
  35 +       TCO_CPT8,       /* Cougar Point */
  36 +       TCO_CPT9,       /* Cougar Point */
  37 +       TCO_CPT10,      /* Cougar Point */
  38 +       TCO_CPT11,      /* Cougar Point */
  39 +       TCO_CPT12,      /* Cougar Point */
  40 +       TCO_CPT13,      /* Cougar Point */
  41 +       TCO_CPT14,      /* Cougar Point */
  42 +       TCO_CPT15,      /* Cougar Point */
  43 +       TCO_CPT16,      /* Cougar Point */
  44 +       TCO_CPT17,      /* Cougar Point */
  45 +       TCO_CPT18,      /* Cougar Point */
  46 +       TCO_CPT19,      /* Cougar Point */
  47 +       TCO_CPT20,      /* Cougar Point */
  48 +       TCO_CPT21,      /* Cougar Point */
  49 +       TCO_CPT22,      /* Cougar Point */
  50 +       TCO_CPT23,      /* Cougar Point */
  51 +       TCO_CPT24,      /* Cougar Point */
  52 +       TCO_CPT25,      /* Cougar Point */
  53 +       TCO_CPT26,      /* Cougar Point */
  54 +       TCO_CPT27,      /* Cougar Point */
  55 +       TCO_CPT28,      /* Cougar Point */
  56 +       TCO_CPT29,      /* Cougar Point */
  57 +       TCO_CPT30,      /* Cougar Point */
  58 +       TCO_CPT31,      /* Cougar Point */
  59  };
  60
  61  static struct {
  62 @@ -173,8 +202,37 @@ static struct {
  63         {"3420", 2},
  64         {"3450", 2},
  65         {"EP80579", 2},
  66 -       {"CPT Desktop", 2},
  67 -       {"CPT Mobile", 2},
  68 +       {"Cougar Point", 2},
  69 +       {"Cougar Point", 2},
  70 +       {"Cougar Point", 2},
  71 +       {"Cougar Point", 2},
  72 +       {"Cougar Point", 2},
  73 +       {"Cougar Point", 2},
  74 +       {"Cougar Point", 2},
  75 +       {"Cougar Point", 2},
  76 +       {"Cougar Point", 2},
  77 +       {"Cougar Point", 2},
  78 +       {"Cougar Point", 2},
  79 +       {"Cougar Point", 2},
  80 +       {"Cougar Point", 2},
  81 +       {"Cougar Point", 2},
  82 +       {"Cougar Point", 2},
  83 +       {"Cougar Point", 2},
  84 +       {"Cougar Point", 2},
  85 +       {"Cougar Point", 2},
  86 +       {"Cougar Point", 2},
  87 +       {"Cougar Point", 2},
  88 +       {"Cougar Point", 2},
  89 +       {"Cougar Point", 2},
  90 +       {"Cougar Point", 2},
  91 +       {"Cougar Point", 2},
  92 +       {"Cougar Point", 2},
  93 +       {"Cougar Point", 2},
  94 +       {"Cougar Point", 2},
  95 +       {"Cougar Point", 2},
  96 +       {"Cougar Point", 2},
  97 +       {"Cougar Point", 2},
  98 +       {"Cougar Point", 2},
  99         {NULL, 0}
 100  };
 101
 102 @@ -259,8 +317,37 @@ static struct pci_device_id iTCO_wdt_pci
 103         { ITCO_PCI_DEVICE(0x3b14,                               TCO_3420)},
 104         { ITCO_PCI_DEVICE(0x3b16,                               TCO_3450)},
 105         { ITCO_PCI_DEVICE(0x5031,                               TCO_EP80579)},
 106 -       { ITCO_PCI_DEVICE(0x1c42,                               TCO_CPTD)},
 107 -       { ITCO_PCI_DEVICE(0x1c43,                               TCO_CPTM)},
 108 +       { ITCO_PCI_DEVICE(0x1c41,                               TCO_CPT1)},
 109 +       { ITCO_PCI_DEVICE(0x1c42,                               TCO_CPT2)},
 110 +       { ITCO_PCI_DEVICE(0x1c43,                               TCO_CPT3)},
 111 +       { ITCO_PCI_DEVICE(0x1c44,                               TCO_CPT4)},
 112 +       { ITCO_PCI_DEVICE(0x1c45,                               TCO_CPT5)},
 113 +       { ITCO_PCI_DEVICE(0x1c46,                               TCO_CPT6)},
 114 +       { ITCO_PCI_DEVICE(0x1c47,                               TCO_CPT7)},
 115 +       { ITCO_PCI_DEVICE(0x1c48,                               TCO_CPT8)},
 116 +       { ITCO_PCI_DEVICE(0x1c49,                               TCO_CPT9)},
 117 +       { ITCO_PCI_DEVICE(0x1c4a,                               TCO_CPT10)},
 118 +       { ITCO_PCI_DEVICE(0x1c4b,                               TCO_CPT11)},
 119 +       { ITCO_PCI_DEVICE(0x1c4c,                               TCO_CPT12)},
 120 +       { ITCO_PCI_DEVICE(0x1c4d,                               TCO_CPT13)},
 121 +       { ITCO_PCI_DEVICE(0x1c4e,                               TCO_CPT14)},
 122 +       { ITCO_PCI_DEVICE(0x1c4f,                               TCO_CPT15)},
 123 +       { ITCO_PCI_DEVICE(0x1c50,                               TCO_CPT16)},
 124 +       { ITCO_PCI_DEVICE(0x1c51,                               TCO_CPT17)},
 125 +       { ITCO_PCI_DEVICE(0x1c52,                               TCO_CPT18)},
 126 +       { ITCO_PCI_DEVICE(0x1c53,                               TCO_CPT19)},
 127 +       { ITCO_PCI_DEVICE(0x1c54,                               TCO_CPT20)},
 128 +       { ITCO_PCI_DEVICE(0x1c55,                               TCO_CPT21)},
 129 +       { ITCO_PCI_DEVICE(0x1c56,                               TCO_CPT22)},
 130 +       { ITCO_PCI_DEVICE(0x1c57,                               TCO_CPT23)},
 131 +       { ITCO_PCI_DEVICE(0x1c58,                               TCO_CPT24)},
 132 +       { ITCO_PCI_DEVICE(0x1c59,                               TCO_CPT25)},
 133 +       { ITCO_PCI_DEVICE(0x1c5a,                               TCO_CPT26)},
 134 +       { ITCO_PCI_DEVICE(0x1c5b,                               TCO_CPT27)},
 135 +       { ITCO_PCI_DEVICE(0x1c5c,                               TCO_CPT28)},
 136 +       { ITCO_PCI_DEVICE(0x1c5d,                               TCO_CPT29)},
 137 +       { ITCO_PCI_DEVICE(0x1c5e,                               TCO_CPT30)},
 138 +       { ITCO_PCI_DEVICE(0x1c5f,                               TCO_CPT31)},
 139         { 0, },                 /* End of list */
 140  };
 141  MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);